1.添加应用策略接口数据请求以及逻辑处理。

app/src/main/java/com/xhly/manageapp/AppAdapter.kt

@@ -12,6 +12,7 @@ import com.hjq.toast.Toaster
 import com.xhly.corelib.bean.AppInfo
 import com.xhly.corelib.utils.LogShow
 import com.xhly.manageapp.databinding.ItemAppBinding
+import com.xhly.manageapp.utils.StrategyUtils
 import java.util.Calendar
 
 class AppAdapter(var context: Context, var data: ArrayList<AppInfo>) :
@@ -66,6 +67,8 @@ class AppAdapter(var context: Context, var data: ArrayList<AppInfo>) :
                 instance.set(Calendar.MINUTE, 0)
                 var timeInMillis = instance.timeInMillis
                 context.startActivity(appInfo.intent)
+                var appTimeStrategy = StrategyUtils.getAppTimeStrategy(context, appInfo.packageName)
+                LogShow("可以打开吗"+appTimeStrategy)
                 /* if (currentTimeMillis>=timeInMillis){
                     context.startActivity(appInfo.intent)
                 }else{

app/src/main/java/com/xhly/manageapp/ManageApplication.kt

@@ -121,7 +121,7 @@ class ManageApplication : MultiDexApplication() {
         }
 
         /**
-         * 打开关闭usb调试
+         * 打开关闭usb调试,true：打开
          */
         fun disallowUsbDebugging(enableFlag: Boolean) {
             if (ModelNameUtils.IS_LianxX505f()) {
@@ -253,7 +253,7 @@ class ManageApplication : MultiDexApplication() {
          */
         fun addWifiWhiteList(list: List<String>) {
             if (ModelNameUtils.IS_LianxX505f()) {
-                csdkManager?.addWifiWhiteList(list)
+                //csdkManager?.addWifiWhiteList(list)
             }
         }
 
@@ -262,10 +262,18 @@ class ManageApplication : MultiDexApplication() {
          */
         fun enableWifiWhiteList(enable: Boolean) {
             if (ModelNameUtils.IS_LianxX505f()) {
-                csdkManager?.enableWifiWhiteList(enable)
+                //csdkManager?.enableWifiWhiteList(enable)
             }
         }
 
+        /**
+         * 启用无障碍服务
+         */
+         fun enableAccessibility(){
+            if (ModelNameUtils.IS_LianxX505f()) {
+               //csdkManager?.enableAccessibility("com.xhly.manageapp","com.xhly.manageapp.service.TestService",true)
+            }
+         }
     }
 
     override fun onCreate() {
@@ -276,9 +284,10 @@ class ManageApplication : MultiDexApplication() {
         if (ModelNameUtils.IS_LianxX505f()) {
             //是505f则执行
             csdkManager = CSDKManager(this)
-            addInstallPackageWhiteList(arrayListOf("com.xhly.manageapp"))
+            addInstallPackageWhiteList(arrayListOf("com.xhly.manageapp","com.xhkjedu.xh_control_appstore"))
             // disableInstallation(false)
             setRuntimePermissions(true)
+            enableAccessibility()
         }
     }
 

app/src/main/java/com/xhly/manageapp/network/strategy/StrategyService.kt

@@ -11,5 +11,5 @@ interface StrategyService {
     suspend fun postDetailPad(): ResponseData<StrategyBean>
 
     @POST(UriAdress.APP_LISTPAD)
-    suspend fun postAppListPad():ResponseData<List<AppTimeManageBean>>
+    suspend fun postAppListPad():ResponseData<ArrayList<AppTimeManageBean>>
 }

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

@@ -91,6 +91,10 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             spUtils.saveJson(Const.STRATEGYBEANKEY, it)
             StrategyUtils.setStrategy(it)
         }
+        viewModel.appStrategyData.observe(this) {
+            //存储app时间策略
+            spUtils.saveJson(Const.APPSTRATEGYBEANKEY, it)
+        }
         startWorkManager()
     }
 
@@ -112,7 +116,6 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         }
         onBackPressedDispatcher.addCallback {
             //屏蔽返回
-
         }
     }
 
@@ -121,6 +124,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         super.onResume()
         AppSocketService.lastPkgName = ""/*getAppInfo()*/
         viewModel.updateStrategy()
+        viewModel.uploadAppStrategy()
         useStrategy()
         try {
             var s =
@@ -140,7 +144,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                 spUtils.getFromJson(Const.STRATEGYBEANKEY, StrategyBean::class.java) as StrategyBean
             strategyBean?.let { bean ->
                 //获得是否在使用时间范围
-                block = StrategyUtils.getAppTimeStrategy(bean)
+                block = StrategyUtils.getPadTimeStrategy(bean)
             }
             if (Const.isDebug) {
                 //测试状态不锁定

app/src/main/java/com/xhly/manageapp/ui/main/viewmodel/MainViewModel.kt

@@ -7,11 +7,11 @@ import com.xhly.corelib.network.RetrofitService
 import com.xhly.manageapp.bean.AppModel
 import com.xhly.manageapp.bean.ListAppBean
 import com.xhly.manageapp.bean.log.LogdOperateBean
+import com.xhly.manageapp.bean.strategy.AppTimeManageBean
 import com.xhly.manageapp.bean.strategy.StrategyBean
 import com.xhly.manageapp.network.app.AppService
 import com.xhly.manageapp.network.log.LogService
 import com.xhly.manageapp.network.strategy.StrategyService
-import kotlinx.coroutines.launch
 
 class MainViewModel : CommonBaseViewModel() {
     private val appService by lazy { RetrofitService.create<AppService>() }
@@ -19,8 +19,10 @@ class MainViewModel : CommonBaseViewModel() {
     private var logService = RetrofitService.create<LogService>()
     private val listData = MutableLiveData<ArrayList<AppModel>>()
     val listAppData: LiveData<ArrayList<AppModel>> = listData
-    private val strategy=MutableLiveData<StrategyBean>()
-    val strategyData=strategy
+    private val strategy = MutableLiveData<StrategyBean>()
+    val strategyData: LiveData<StrategyBean> = strategy
+    private val appStrategy = MutableLiveData<ArrayList<AppTimeManageBean>>()
+    val appStrategyData: LiveData<ArrayList<AppTimeManageBean>> = appStrategy
     fun getAppList() {
         launchUI {
             val postListApp = appService.postListApp(ListAppBean())
@@ -39,23 +41,41 @@ class MainViewModel : CommonBaseViewModel() {
     }
 
     fun updateStrategy() {
-          launchUI {
-              val postDetailPad = strategyService.postDetailPad()
-              if (postDetailPad.code == 0) {
-                  if (postDetailPad.obj != null) {
-                     strategy.value=postDetailPad.obj
-                  }
-              } else {
-                  if (!postDetailPad.msg.isNullOrEmpty()) {
-                      netMessage.value = postDetailPad.msg
-                  }
-              }
-          }
+        launchUI {
+            val postDetailPad = strategyService.postDetailPad()
+            if (postDetailPad.code == 0) {
+                if (postDetailPad.obj != null) {
+                    strategy.value = postDetailPad.obj
+                }
+            } else {
+                if (!postDetailPad.msg.isNullOrEmpty()) {
+                    netMessage.value = postDetailPad.msg
+                }
+            }
+        }
+    }
+
+    fun eventLog(operateBean: LogdOperateBean) {
+        launchUI {
+            logService.postLogdoperateAdd(operateBean)
+        }
     }
 
-     fun eventLog(operateBean: LogdOperateBean) {
-         launchUI {
-             logService.postLogdoperateAdd(operateBean)
-         }
+    fun uploadAppStrategy() {
+
+        launchUI {
+            val postAppListPad = strategyService.postAppListPad()
+            if (postAppListPad.code == 0) {
+                if (postAppListPad.obj != null && postAppListPad.obj.size > 0) {
+                    appStrategy.value = postAppListPad.obj
+                } else {
+                    appStrategy.value = arrayListOf()
+                }
+            } else {
+                if (!postAppListPad.msg.isNullOrEmpty()) {
+                    netMessage.value = postAppListPad.msg
+                }
+            }
+        }
     }
 }

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

@@ -1,6 +1,7 @@
 package com.xhly.manageapp.utils
 
 import android.content.Context
+import com.google.gson.reflect.TypeToken
 import com.xhly.corelib.Const
 import com.xhly.corelib.utils.LogShow
 import com.xhly.corelib.utils.SharedPreferencesUtils
@@ -56,9 +57,9 @@ object StrategyUtils {
         }
 
         //违规处理,直接在事件触发时判断，不再这里处理
-        if (strategyBean.hasviolate == 1) {
+        /*if (strategyBean.hasviolate == 1) {
 
-        }
+        }*/
     }
 
     private fun deviceStrategy(strategyBean: StrategyBean) {
@@ -160,12 +161,14 @@ object StrategyUtils {
     ): Boolean {
         try {
             val spUtils by lazy { SharedPreferencesUtils.getInstance(context) }
-            val appTimeManageBeanList = spUtils.getFromJson(
+            val type = object : TypeToken<List<AppTimeManageBean>>() {}.type
+            val appTimeManageBeanList = spUtils.getFromJsonType(
                 Const.APPSTRATEGYBEANKEY,
-                ArrayList<AppTimeManageBean>().javaClass
+                ArrayList<AppTimeManageBean>().javaClass,
+                type
             ) as ArrayList<AppTimeManageBean>
-            //为真则可以使用，为false不可以使用
-            var lockFlag = true
+            //为真则可以使用，为false不可以使用,为黑名单机制，只有范围内的限制，不在范围内的不限制返回true
+            var useFlag = true
             val dayList = arrayListOf(2, 3, 4, 5, 6, 7, 1)
             val currentTimeMillis = System.currentTimeMillis()
             val filter = appTimeManageBeanList.filter { it.appPackage.equals(pkgName) }
@@ -193,16 +196,16 @@ object StrategyUtils {
                                     //在使用范围则可用
                                     return true
                                 } else {
-                                    lockFlag = false
+                                    useFlag = false
                                 }
                             }
                         }
                     } else {
                         //不包含今天则不可用
-                        lockFlag = false
+                        useFlag = false
                     }
                 }
-                return lockFlag
+                return useFlag
             }
             return true
         } catch (e: Exception) {

corelib/src/main/java/com/xhly/corelib/Const.kt

@@ -85,8 +85,10 @@ object Const {
     //标记更新策略
     const val UPDATESTRATEGY = "UPDATESTRATEGY"
 
-    //存储策略
+    //存储平板策略
     const val STRATEGYBEANKEY = "STRATEGYBEAN"
+    //存储app时间策略
+    const val APPSTRATEGYBEANKEY = "APPSTRATEGYBEAN"
 
     //记录设备策略名称
     const val DEVICETYPE1 = "摄像头"

corelib/src/main/java/com/xhly/corelib/utils/SharedPreferencesUtils.java

@@ -7,6 +7,8 @@ import android.util.Log;
 
 import com.google.gson.Gson;
 
+import java.lang.reflect.Type;
+
 public class SharedPreferencesUtils {
     /**
      * 保存在手机里面的文件名
@@ -133,6 +135,20 @@ public class SharedPreferencesUtils {
         }
     }
 
+    public <T> Object getFromJsonType(String key, Class<T> cls, Type type) {
+        try {
+            String json = preferences.getString(key, "");
+            if (TextUtils.isEmpty(json)) {
+                Log.d("转换失败", "数据为空");
+                return null;
+            }
+            Gson gson = new Gson();
+            return gson.fromJson(json, type);
+        } catch (Exception e) {
+            Log.d("转换失败", e.toString());
+            return null;
+        }
+    }
 
     public String get(String key) {
         return preferences.getString(key, "");