1.添加锁定布局逻辑以及素材

app/src/main/java/com/xhly/manageapp/ui/main/activity/MainActivity.kt

@@ -33,6 +33,7 @@ import com.xhly.corelib.utils.PhoneInfoUtils
 import com.xhly.corelib.utils.toFormat
 import com.xhly.manageapp.AppAdapter
 import com.xhly.manageapp.R
+import com.xhly.manageapp.bean.strategy.StrategyBean
 import com.xhly.manageapp.broadcastreceiver.AppInstallReceiver
 import com.xhly.manageapp.databinding.ActivityMainBinding
 import com.xhly.manageapp.service.ManageAccessibilityService
@@ -97,12 +98,17 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         mBinding.loginoutIv.setOnClickListener {
             showEditDialog()
         }
-        mBinding.stoptv.setOnClickListener {
+        mBinding.codeenterCv.setOnClickListener {
+            //如果密码一致,则解锁
             spUtils.setParam(Const.DISABLEPAD, false)
+            useStrategy()
+            if (mBinding.mainLlayout.visibility == View.GONE){
+                Toast("当前不在可用时间。")
+            }
         }
         onBackPressedDispatcher.addCallback {
             //屏蔽返回
-            getAppInfo()
+
         }
     }
 
@@ -110,6 +116,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
     override fun onResume() {
         super.onResume()
         AppSocketService.lastPkgName = ""/*getAppInfo()*/
+        viewModel.updateStrategy()
         useStrategy()
         try {
             var s =
@@ -123,16 +130,32 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
     private fun useStrategy() {
         //获得sputils中的数据设置状态,以及策略
         try {
-            var param = spUtils.getParam(Const.DISABLEPAD, false)
-            if (param as Boolean) {
-                mBinding.stoptv.visibility = View.VISIBLE
+            //如果存储的是锁定则锁定
+            var block = false
+            val strategyBean =
+                spUtils.getFromJson(Const.STRATEGYBEANKEY, StrategyBean::class.java) as StrategyBean
+            strategyBean?.let { bean ->
+                //获得是否在使用时间范围
+                block = StrategyUtils.getAppTimeStrategy(bean)
+            }
+            val param = spUtils.getParam(Const.DISABLEPAD, false) as Boolean
+            if (param || block) {
+                mBinding.mainLlayout.visibility = View.GONE
+                mBinding.lockLlayout.visibility = View.VISIBLE
             } else {
-                mBinding.stoptv.visibility = View.GONE
+                mBinding.mainLlayout.visibility = View.VISIBLE
+                mBinding.lockLlayout.visibility = View.GONE
             }
             changeWhiteList()
-            viewModel.updateStrategy()
         } catch (e: Exception) {
-
+            val param = spUtils.getParam(Const.DISABLEPAD, false) as Boolean
+            if (param) {
+                mBinding.mainLlayout.visibility = View.GONE
+                mBinding.lockLlayout.visibility = View.VISIBLE
+            } else {
+                mBinding.mainLlayout.visibility = View.VISIBLE
+                mBinding.lockLlayout.visibility = View.GONE
+            }
         }
     }
 
@@ -186,83 +209,6 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         }
     }
 
-    private fun getAppInfo() {
-        //统计使用时长
-        var instance = Calendar.getInstance()/*  instance.set(Calendar.HOUR_OF_DAY, 0)
-          instance.set(Calendar.MINUTE, 0)
-          instance.set(Calendar.SECOND, 1)*/
-        var timeInMillis = instance.timeInMillis - 1000 * 60 * 10
-        val usageManager = getSystemService(USAGE_STATS_SERVICE) as UsageStatsManager
-        if (usageManager != null) {
-            val intervalType = UsageStatsManager.INTERVAL_DAILY
-            val endTime = System.currentTimeMillis()
-            val startTime = timeInMillis
-            //queryUsageStats查询使用时长，时间范围设置后，返回的数据时间范围不一定和设置的时间范围一致。
-            /*   val applicationList = usageManager.queryUsageStats(intervalType, startTime, endTime)
-               for (usageStats in applicationList) {
-                   dataList.filter { it.packageName.equals(usageStats.packageName) }.forEach {
-                       LogShow("应用时长统计"+it.name+"使用时间"+millisecondsToHMS(usageStats.totalTimeInForeground))
-                   }
-                   if (usageStats.packageName.equals("com.xhly.manageapp")){
-                       LogShow("应用时长统计XhlyManageApp"+"使用时间"+millisecondsToHMS(usageStats.totalTimeInForeground))
-                   }
-               }*/
-
-            //queryEvents查询使用时长，时间范围设置后，返回的数据时间范围和设置的一致，但需要自己判断时长
-            var queryEvents = usageManager.queryEvents(startTime, endTime)
-            var event = UsageEvents.Event()
-
-            var totalTime = 0L
-            var totalStartTime = 0L
-            while (queryEvents.hasNextEvent()) {
-                queryEvents.getNextEvent(event)
-                when (event.eventType) {
-                    UsageEvents.Event.ACTIVITY_RESUMED -> {
-                        var first =
-                            dataList.firstOrNull { event.packageName.equals(it.packageName) }
-                        first?.let {
-                            it.startTime = event.timeStamp
-                        }
-                        if (event.packageName.equals("com.xhly.manageapp")) {
-                            totalStartTime = event.timeStamp
-                        }
-
-                        if (event.packageName.equals("mark.via")) {
-                            LogShow("打开时间" + event.timeStamp.toFormat())
-
-                        }
-                    }
-
-                    UsageEvents.Event.ACTIVITY_PAUSED -> {
-                        var first =
-                            dataList.firstOrNull { event.packageName.equals(it.packageName) }
-                        first?.let {
-                            if (it.startTime == 0L) {
-                                it.startTime = instance.timeInMillis
-                            }
-                            it.foregroundTime += (event.timeStamp - it.startTime)
-                        }
-                        if (event.packageName.equals("mark.via")) {
-                            LogShow("关闭时间" + event.timeStamp.toFormat())
-                        }
-                        if (event.packageName.equals("com.xhly.manageapp")) {
-                            totalTime += (event.timeStamp - totalStartTime)
-                        }
-                    }
-                }
-            }
-
-            dataList.filter { it.foregroundTime > 0L }.forEach {
-                // LogShow("events应用时长统计" + it.name + "使用时间" + millisecondsToHMS(it.foregroundTime))
-            }
-            if (totalTime > 0L) {
-                // LogShow("events应用时长统计com.xhly.manageapp使用时间" + millisecondsToHMS(totalTime))
-            } else {
-                // LogShow("events应用时长统计com.xhly.manageapp使用时间无法获取")
-            }
-        }
-    }
-
     fun checkAccessibility(context: Context): Boolean {
         // 判断辅助功能是否开启
         if (!isServiceON(this, ManageAccessibilityService::class.java.name)) {
@@ -384,21 +330,6 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         })
     }
 
-    private fun test() {
-        /* val appInfo = filter[0]
-         serviceScope.launch {
-             val logStartBean = LogAppStartBean()
-             ManageApplication.getDeviceInfo()?.let {
-                 logStartBean.sn = it
-             }
-             logStartBean.appName = appInfo.name
-             logStartBean.appPackage = appInfo.packageName
-             logStartBean.versionName = appInfo.versionName
-             logStartBean.versionNum = appInfo.versionNum
-             LogShow("当前应用" + logStartBean.appName + "|||" + logStartBean.versionName + "|||" + logStartBean.versionNum)
-             logService.postLogAppStartAdd(logStartBean)
-         }*/
-    }
 
     private fun startWorkManager() {
         WorkManager.getInstance(this).cancelAllWork()

app/src/main/java/com/xhly/manageapp/utils/StrategyUtils.kt

@@ -1,8 +1,10 @@
 package com.xhly.manageapp.utils
 
 import com.xhly.corelib.Const
+import com.xhly.corelib.utils.hourToCurrentDateLong
 import com.xhly.manageapp.ManageApplication
 import com.xhly.manageapp.bean.strategy.StrategyBean
+import java.util.Calendar
 
 object StrategyUtils {
     public fun setStrategy(strategyBean: StrategyBean) {
@@ -36,13 +38,9 @@ object StrategyUtils {
             val installPackageWhiteList = ManageApplication.getInstallPackageWhiteList()
             ManageApplication.removeInstallPackageWhiteList(installPackageWhiteList)
         }
-        //是否开启时间策略
-        if (strategyBean.hastime == 1) {
-            var currentTimeMillis = System.currentTimeMillis()
 
-        } else {
+        //是否开启时间策略，这个策略在生命周期中调用getAppTimeStrategy(strategyBean)
 
-        }
 
         //是否设备策略
         if (strategyBean.hasdevice == 1) {
@@ -54,11 +52,9 @@ object StrategyUtils {
         }
 
         //违规处理,直接在事件触发时判断，不再这里处理
-        if (strategyBean.hasviolate==1){
+        if (strategyBean.hasviolate == 1) {
 
         }
-
-
     }
 
     private fun deviceStrategy(strategyBean: StrategyBean) {
@@ -108,6 +104,48 @@ object StrategyUtils {
         }
     }
 
+    /**
+     * 时间策略处理，返回为真则锁定
+     */
+    public fun getAppTimeStrategy(strategyBean: StrategyBean): Boolean {
+        //是否开启时间策略，返回为真则锁定
+        var lockFlag = false
+        val dayList = arrayListOf(2, 3, 4, 5, 6, 7, 1)
+        val currentTimeMillis = System.currentTimeMillis()
+        if (strategyBean.hastime == 1) {
+            val calendar = Calendar.getInstance()
+            //返回值 1 周日 2周一 3周二 4周三 5周四 6周五 7周六
+            val dayWeek = calendar.get(Calendar.DAY_OF_WEEK)
+            val padTimes = strategyBean.padTimes
+            if (padTimes == null || padTimes.size == 0) {
+                //开启策略，但不返回时间则表示锁定
+                return true
+            }
+            padTimes?.forEach { appTimeManageBean ->
+                val day = dayList[appTimeManageBean.week - 1]
+                if (day == dayWeek) {
+                    val starttime = appTimeManageBean.starttime
+                    val stoptime = appTimeManageBean.stoptime
+                    starttime?.let {
+                        val start = starttime.hourToCurrentDateLong()
+                        stoptime?.let {
+                            val end = stoptime.hourToCurrentDateLong()
+                            //只有有一个时段符合即为可用
+                            if (currentTimeMillis > start && currentTimeMillis < end) {
+                                //在使用范围不锁定
+                                return false
+                            } else {
+                                lockFlag = true
+                            }
+                        }
+                    }
+                }
+            }
+            return lockFlag
+        }
+        return false
+    }
+
     public fun getAppTimeStrategy() {
 
     }

app/src/main/res/drawable/icon_etenter.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:pathData="M330.5,17.9l450,450.6c24.1,24.1 24.1,63 0,86.5l-450.2,450.8a61.4,61.4 0,0 1,-87 0,61.4 61.4,0 0,1 0,-87.1l406.8,-406.9L243.3,105A61.4,61.4 0,0 1,286.7 0a63.1,63.1 0,0 1,43.8 17.9z"
+      android:fillColor="#339DFF"/>
+</vector>

app/src/main/res/layout/activity_main.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/main_bg"
@@ -10,6 +11,7 @@
         android:layout_height="match_parent">
 
         <LinearLayout
+            android:id="@+id/main_llayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical"
@@ -69,24 +71,61 @@
                 android:overScrollMode="never" />
         </LinearLayout>
 
-        <TextView
-            android:id="@+id/timestoptv"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/white"
-            android:gravity="center"
-            android:text="@string/timestoptips"
-            android:textColor="@color/black"
-            android:textSize="20sp" />
-
-        <TextView
-            android:id="@+id/stoptv"
+        <LinearLayout
+            android:id="@+id/lock_llayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/white"
-            android:gravity="center"
-            android:text="@string/stoptips"
-            android:textColor="@color/black"
-            android:textSize="20sp" />
+            android:gravity="center_horizontal"
+            android:background="@drawable/main_bg"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="157dp"
+                android:layout_height="151dp"
+                android:layout_marginTop="104dp"
+                android:src="@drawable/icon_lock" />
+
+            <FrameLayout
+                android:layout_width="wrap_content"
+                android:layout_height="53dp"
+                android:layout_marginTop="26dp">
+
+                <EditText
+                    android:id="@+id/lock_et"
+                    android:layout_width="357dp"
+                    android:layout_height="53dp"
+                    android:background="@drawable/shape_shadow_bg"
+                    android:hint="@string/passcode"
+                    android:paddingLeft="28dp"
+                    android:paddingRight="28dp"
+                    android:singleLine="true"
+                    android:textColor="@color/codetipscolor"
+                    android:textColorHint="@color/codehintcolor"
+                    android:textSize="16sp" />
+
+                <androidx.cardview.widget.CardView
+                    android:id="@+id/codeenter_cv"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_gravity="center_vertical|right"
+                    android:layout_marginRight="18dp"
+                    app:cardBackgroundColor="@color/white">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="11dp"
+                        android:layout_gravity="center"
+                        android:src="@drawable/icon_etenter" />
+                </androidx.cardview.widget.CardView>
+            </FrameLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="18dp"
+                android:text="@string/locktips"
+                android:textColor="@color/codetipscolor"
+                android:textSize="17sp" />
+        </LinearLayout>
     </FrameLayout>
 </LinearLayout>

app/src/main/res/values/colors.xml

@@ -7,4 +7,6 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="codetipscolor">#253A70</color>
+    <color name="codehintcolor">#B8C2D9</color>
 </resources>

app/src/main/res/values/strings.xml

@@ -13,8 +13,10 @@
     <string name="loginnow">立即登录</string>
     <string name="accountnoempty">账号不能为空</string>
     <string name="codenoempty">密码不能为空</string>
+    <string name="passcode">密码</string>
     <string name="exit">退出</string>
     <string name="close">关闭</string>
     <string name="clear">清除缓存</string>
     <string name="speed">一键加速</string>
+    <string name="locktips">您的设备已违规或者被管理员限制使用，请联系管理员</string>
 </resources>