1.添加锁定和自启app的逻辑处理，当锁定时不能启动app.

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

@@ -113,6 +113,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
     private var updateStrategyFlag = false
     //标记当前是否锁定
     private var mainLockFlag=false
+    private var autoAppFlag=true
 
     private var accountDialog:CustomDialog?=null
     //创建应用卸载集合，方便获得应用信息
@@ -125,6 +126,11 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
 
     //上次提醒时长，用来设置是否重新设置提醒任务
     private var lastTipsTimeLong=0
+    //判断是否从oncreat执行，防止时间策略多次执行
+    private var isCreatFlag=false
+
+
+
     override fun getBinding() = ActivityMainBinding.inflate(layoutInflater)
 
     @SuppressLint("CheckResult")
@@ -399,25 +405,35 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
         }
         viewModel.autoAppData.observe(this){
             //连接不为空，并且应用已安装则跳转应用
-            if (it.authUrl!=null&&AppUtils.isAppInstalled(this,it.appPackage)){
-                spUtils.saveJson(Const.AUTOAPPKEY,it)
-                startAutoApp(it)
+            it.authUrl="com.xhkjedu.xh_control_browser.MainActivity"
+            it.appPackage="com.xhkjedu.xh_control_browser"
+            LogShow("锁定了吧"+mainLockFlag)
+            if (!mainLockFlag){
+                if (it.authUrl!=null&&AppUtils.isAppInstalled(this,it.appPackage)){
+                    spUtils.saveJson(Const.AUTOAPPKEY,it)
+                    startAutoApp(it)
+                }else{
+                    try {
+                        val autoAppBean = spUtils.getFromJson(Const.AUTOAPPKEY, AutoAppBean().javaClass) as AutoAppBean
+                        if (autoAppBean.authUrl!=null&&AppUtils.isAppInstalled(this,autoAppBean.appPackage)&&!it.netSucessFlag){
+                            startAutoApp(autoAppBean)
+                        }else{
+                            canClickFlag=true
+                        }
+                    }catch (e:Exception){
+                        canClickFlag=true
+                    }
+                }
             }else{
-               try {
-                   val autoAppBean = spUtils.getFromJson(Const.AUTOAPPKEY, AutoAppBean().javaClass) as AutoAppBean
-                   if (autoAppBean.authUrl!=null&&AppUtils.isAppInstalled(this,autoAppBean.appPackage)){
-                    startAutoApp(autoAppBean)
-                   }else{
-                       canClickFlag=true
-                   }
-               }catch (e:Exception){
-                   canClickFlag=true
-               }
+                autoAppFlag=false
+                startIntentActivity(MainActivity().javaClass)
             }
         }
+
         getLocation()
         startWorkManager()
         lastTimeLong=System.currentTimeMillis()
+        isCreatFlag=true
         updateAllStrategy()
     }
 
@@ -605,6 +621,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
 
     override fun onResume() {
         super.onResume()
+
         lifecycleScope.launch(Dispatchers.IO){
             try {
                 val json = spUtils.getFromJson(Const.USERINFO, UserBean().javaClass)
@@ -618,9 +635,6 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
             }
         }
         Const.backNum++
-        userBean?.let {
-            viewModel.postAutoAppDetail(it.regionid)
-        }
         if (mainLockFlag&&lastTimeLong+10*60*1000<System.currentTimeMillis()){
             //如果时锁定状态进入这个页面则请求一次策略,限制为10分钟
             lastTimeLong=System.currentTimeMillis()
@@ -631,8 +645,14 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
             Const.backNum = 0
             updateAllStrategy()
         }else{
-            useTimeStrategy()
+            if (!isCreatFlag){
+                useTimeStrategy()
+            }
+            isCreatFlag=false
         }
+     /*   userBean?.let {
+            viewModel.postAutoAppDetail(it.regionid)
+        }*/
         updatePadInfo()
         updateMcApp()
         val appVersionCode = SystemUtil.getAppVersionCode(this, packageName)
@@ -641,6 +661,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
     }
 
     private fun updateAllStrategy() {
+        LogShow("请求策略锁定了吧")
         userBean?.let {
             Const.USERID = it.userid
             Const.USERNAME = it.username.toString()
@@ -657,10 +678,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
         viewModel.postWallpaperPad()
         viewModel.updateStrategy()
         viewModel.uploadAppStrategy()
-        //直接在请求学校设置时使用这个请求
-       /* viewModel.getAppList()*/
         viewModel.postAppNetWhiteList()
-        useTimeStrategy()
         updatePadInfo()
     }
 
@@ -864,7 +882,6 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
     private fun useTimeStrategy() {
         //获得sputils中的平板锁定策略
         try {
-            mainLockFlag=false
             //如果存储的是锁定则锁定
             var block = false
             val strategyBean =
@@ -885,6 +902,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
                 accountDialog?.dismiss()
                 mainLockFlag=true
             } else {
+                mainLockFlag=false
+                autoAppFlag=true
                 mBinding.mainLlayout.visibility = View.VISIBLE
                 mBinding.lockLlayout.visibility = View.GONE
                 hiddenSoft(mBinding.lockEt)
@@ -899,10 +918,17 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
             }
             mBinding.lockEt.setText("")
         } catch (e: Exception) {
+            mainLockFlag=false
             //默认不锁定
             mBinding.mainLlayout.visibility = View.VISIBLE
             mBinding.lockLlayout.visibility = View.GONE
         }
+        LogShow("锁定了吧"+mainLockFlag+"|||"+autoAppFlag)
+        if (autoAppFlag){
+            userBean?.let {
+                viewModel.postAutoAppDetail(it.regionid)
+            }
+        }
     }
 
     private fun initSchoolSet(schoolDeviceSetBean: SchoolDeviceSetBean? = null) {