1.移除onResume中的自动拉起，只有更新策略时才拉起。

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

@@ -180,6 +180,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
     private var isDestroyFlag=false
     //执行了自启请求
     private var netAutoAppFlag=false
+    //表示请求了策略更新
+    private var netStrategyDataFlag=false
 
     override fun getBinding() = ActivityMainBinding.inflate(layoutInflater)
 
@@ -287,6 +289,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
 
         viewModel.lockResultData.observe(this) {
             if (it) {
+                //获得违规状态后，锁定桌面
                 spUtils.setParam(Const.DISABLEPAD, true)
                 startIntentActivity(MainActivity().javaClass)
                 val appList = AppUtils.GetAppList(this)
@@ -438,15 +441,20 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
 
         viewModel.viewModelScope.launch {
             viewModel.strategyData.collect {
-                it?.let {
-                    spUtils.saveJson(Const.STRATEGYBEANKEY, it)
-                    StrategyUtils.setStrategy(it)
-                    useTimeStrategy()
-                    /* updateStrategyFlag = true
-                     if (updateTimeFlag) {
-                         showSucessToast()
-                     }*/
-                    showSucessToast()
+                //netStrategyDataFlag表示接口请求了，才可以接收数据
+                if (netStrategyDataFlag){
+                    netStrategyDataFlag=false
+                    it?.let {
+                        spUtils.saveJson(Const.STRATEGYBEANKEY, it)
+                        StrategyUtils.setStrategy(it)
+                        //更新策略时执行
+                        useTimeStrategy(1)
+                        /* updateStrategyFlag = true
+                         if (updateTimeFlag) {
+                             showSucessToast()
+                         }*/
+                        showSucessToast()
+                    }
                 }
             }
         }
@@ -530,10 +538,12 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
                         when (it.pushType) {
                             2 -> {
                                 spUtils.setParam(Const.DISABLEPAD, false)
-                                useTimeStrategy()
+                                //远程socket解除锁定时执行
+                                useTimeStrategy(2)
                             }
 
                             3 -> {
+                                //远程socket消息后，回调执行锁定
                                 val appList = AppUtils.GetAppList(this@MainActivity)
                                 StrategyUtils.clearMemory(this@MainActivity, appList)
                                 spUtils.setParam(Const.DISABLEPAD, true)
@@ -677,6 +687,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
         try {
             StrategyUtils.initMainResume()
             try {
+                canClickFlag=true
                 val am = getSystemService(ACTIVITY_SERVICE) as ActivityManager
                 /*val runningTasks = am.getRunningTasks(1)
                 if (!runningTasks.isNullOrEmpty()){
@@ -794,7 +805,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
     //解锁屏幕
     private fun unBindBlock() {
         spUtils.setParam(Const.DISABLEPAD, false)
-        useTimeStrategy()
+        //输入密码解锁屏幕时执行，因为要判断锁定原因是因为不在使用时间还是违规。
+        useTimeStrategy(3)
         if (mBinding.mainLlayout.visibility == View.GONE) {
             Toast(getString(R.string.padtimestoptips))
         }
@@ -971,7 +983,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
         }
         if (!screenFlag) {
             if (!NetworkUtils.isAvailable(this)) {
-                useTimeStrategy()
+                //在onresume中时使用，如果未联网执行
+                useTimeStrategy(4)
                 hasNetFlag = false
                 lifecycleScope.launch {
                     withContext(Dispatchers.IO){
@@ -996,7 +1009,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
             updateAllStrategy()
         } else {
             if (!isCreatFlag) {
-                useTimeStrategy()
+               //!isCreatFlag表示不是第一次启动时使用useTimeStrategy
+               useTimeStrategy(5)
             }
             isCreatFlag = false
         }
@@ -1017,6 +1031,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
             }
             mBinding.userschoolTv.text = name.toString()
         }
+        netStrategyDataFlag=true
         viewModel.postWallpaperPad()
         viewModel.updateStrategy()
         viewModel.uploadAppStrategy()
@@ -1246,8 +1261,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
         locationClient?.start()
     }
 
-    private fun useTimeStrategy() {
-        LogShow("开始执行了吧哈哈")
+    private fun useTimeStrategy(type:Int) {
+        LogShow("开始获得时间策略$type")
         //获得sputils中的平板锁定策略
         try {
             //如果存储的是锁定则锁定
@@ -1294,10 +1309,12 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
         LogShow("锁定了吧" + mainLockFlag + "|||" + autoAppFlag)
         //自动退出时优先退出而不是拉起app
         if (autoAppFlag&&!loginoutFlag) {
-            //只有网络请求之后两秒延迟后才执行
-            userBean?.let {
-                netAutoAppFlag=true
-                viewModel.postAutoAppDetail(it.regionid)
+            //因为对于学生端app退出登录的处理，所以类型为5（这时认为执行的时机是学生主动退出了登录，所以不拉起）时不执行拉起
+            if (type!=5){
+                userBean?.let {
+                    netAutoAppFlag=true
+                    viewModel.postAutoAppDetail(it.regionid)
+                }
             }
         }
     }