1.修改推送消息的处理逻辑，收到推送消息后再请求接口然后再执行。

app/src/main/java/com/xhly/manageapp/bean/log/LogPushBean.kt

@@ -1,11 +1,11 @@
 package com.xhly.manageapp.bean.log
 
 /**
- * 处理推送事件后的回调
+ * 接收到推送事件，后调用接口
  */
 class LogPushBean {
     /** app不处理1
-     * 1发送消息2解除锁定3锁定4更新策略5重启设备6恢复出厂7解除管控
+     * 1发送消息2解除锁定3锁定4更新策略5重启设备6恢复出厂7解除管控,8注销登录
      */
     var pushType = 0
 

app/src/main/java/com/xhly/manageapp/bean/log/LogPushResultBean.kt

@@ -0,0 +1,14 @@
+package com.xhly.manageapp.bean.log
+
+/**
+ * 处理推送事件的接口调用的结果
+ */
+class LogPushResultBean {
+    /** app不处理1
+     * 1发送消息2解除锁定3锁定4更新策略5重启设备6恢复出厂7解除管控,8注销登录
+     */
+    var pushType = 0
+
+    //是否调用
+    var enableFlag = false
+}

app/src/main/java/com/xhly/manageapp/network/log/LogService.kt

@@ -41,5 +41,5 @@ interface LogService {
      * 设备--推送事件接口
      */
     @POST(UriAdress.LOGPUSH_RECEIVED)
-    suspend fun postLogPushAdd(@Body logPushBean: LogPushBean)
+    suspend fun postLogPushAdd(@Body logPushBean: LogPushBean):ResponseData<Any>
 }

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

@@ -129,6 +129,30 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
                 showSettingDialog()
             }
         }
+        viewModel.logResultData.observe(this){
+            if (it.enableFlag){
+                when(it.pushType){
+                    2->{
+                        spUtils.setParam(Const.DISABLEPAD, false)
+                        useTimeStrategy()
+                    }
+                    3->{
+                        spUtils.setParam(Const.DISABLEPAD, true)
+                        useTimeStrategy()
+                    }
+                    5->{
+                        ManageApplication.rebootDevice()
+                    }
+                    6->{
+                        ManageApplication.launchFactoryReset()
+                    }
+                    7->{
+                        currentSpUtils.setParam(Const.EXIT_CONTROL,true)
+                        StrategyUtils.releaseControl(this)
+                    }
+                }
+            }
+        }
         onBackPressedDispatcher.addCallback {
             //屏蔽返回
         }
@@ -256,31 +280,23 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
 
             Const.CODE2002.toString() -> {
                 postLogPush(3)
-                spUtils.setParam(Const.DISABLEPAD, true)
-                useTimeStrategy()
             }
 
             Const.CODE2003.toString() -> {
                 postLogPush(2)
-                spUtils.setParam(Const.DISABLEPAD, false)
-                useTimeStrategy()
             }
 
 
             Const.CODE2005.toString() -> {
                 postLogPush(5)
-                ManageApplication.rebootDevice()
             }
 
             Const.CODE2006.toString() -> {
                 postLogPush(6)
-                ManageApplication.launchFactoryReset()
             }
 
             Const.CODE2007.toString() -> {
                 postLogPush(7)
-                currentSpUtils.setParam(Const.EXIT_CONTROL,true)
-                StrategyUtils.releaseControl(this)
             }
 
             Const.SDINSTALL -> {

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

@@ -260,6 +260,39 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                 ManageApplication.launchFactoryReset()
             }
         }
+        viewModel.logResultData.observe(this){
+            if (it.enableFlag){
+                when(it.pushType){
+                    2->{
+                        spUtils.setParam(Const.DISABLEPAD, false)
+                        useTimeStrategy()
+                    }
+                    3->{
+                        val appList = AppUtils.GetAppList(this)
+                        StrategyUtils.clearMemory(this, appList)
+                        spUtils.setParam(Const.DISABLEPAD, true)
+                        startIntentActivity(MainActivity().javaClass)
+                    }
+                    4->{
+                        //请求接口更新策略
+                        updateAllStrategy()
+                    }
+                    5->{
+                        ManageApplication.rebootDevice()
+                    }
+                    6->{
+                        ManageApplication.launchFactoryReset()
+                    }
+                    7->{
+                        currentSpUtils.setParam(Const.EXIT_CONTROL,true)
+                        StrategyUtils.releaseControl(this)
+                    }
+                    8->{
+                        loginOut()
+                    }
+                }
+            }
+        }
         startWorkManager()
         updateAllStrategy()
     }
@@ -665,41 +698,26 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             Const.CODE2002.toString() -> {
                 //杀掉其他app之保留自己
                 postLogPush(3)
-                val appList = AppUtils.GetAppList(this)
-                StrategyUtils.clearMemory(this, appList)
-                spUtils.setParam(Const.DISABLEPAD, true)
-                //useTimeStrategy()
-                startIntentActivity(MainActivity().javaClass)
             }
 
             Const.CODE2003.toString() -> {
                 postLogPush(2)
-                spUtils.setParam(Const.DISABLEPAD, false)
-                useTimeStrategy()
             }
 
             Const.CODE2004.toString() -> {
                 postLogPush(4)
-                //请求接口更新策略
-                /*viewModel.uploadAppStrategy()
-                viewModel.updateStrategy()*/
-                updateAllStrategy()
             }
 
             Const.CODE2005.toString() -> {
                 postLogPush(5)
-                ManageApplication.rebootDevice()
             }
 
             Const.CODE2006.toString() -> {
                 postLogPush(6)
-                ManageApplication.launchFactoryReset()
             }
 
             Const.CODE2007.toString() -> {
                 postLogPush(7)
-                currentSpUtils.setParam(Const.EXIT_CONTROL,true)
-                StrategyUtils.releaseControl(this)
             }
 
             Const.CODE2008.toString() -> {

app/src/main/java/com/xhly/manageapp/viewmodel/BaseViewModel.kt

@@ -6,6 +6,7 @@ import com.xhly.corelib.base.viewmodel.CommonBaseViewModel
 import com.xhly.corelib.network.RetrofitService
 import com.xhly.corelib.utils.MD5Utils
 import com.xhly.manageapp.bean.log.LogPushBean
+import com.xhly.manageapp.bean.log.LogPushResultBean
 import com.xhly.manageapp.bean.log.LogdOperateBean
 import com.xhly.manageapp.network.log.LogService
 import com.xhly.manageapp.ui.login.netservice.LoginService
@@ -23,6 +24,8 @@ open class BaseViewModel : CommonBaseViewModel() {
     val lockResultData: LiveData<Boolean> = lockResult
     private val resetResult = MutableLiveData<Boolean>()
     val resetlResultData: LiveData<Boolean> = resetResult
+    private val logResult=MutableLiveData<LogPushResultBean>()
+    val logResultData:LiveData<LogPushResultBean> =logResult
 
     /**
      * 解除当前锁屏
@@ -67,11 +70,18 @@ open class BaseViewModel : CommonBaseViewModel() {
     }
 
     /**
-     * 发送事件推送日志
+     * 发送事件推送日志,再接口回调后再调用功能实现
      */
     fun postLogPushAdd(logPushBean: LogPushBean) {
         launchUI {
-            logService.postLogPushAdd(logPushBean)
+            val postLogPushAdd = logService.postLogPushAdd(logPushBean)
+            if (postLogPushAdd.code==0){
+                //为true则后续执行
+                val logPushResultBean=LogPushResultBean()
+                logPushResultBean.pushType=logPushBean.pushType
+                logPushResultBean.enableFlag=true
+                logResult.value=logPushResultBean
+            }
         }
     }
     /**