1.将socket消息处理放在主页中。

app/src/main/java/com/xhly/manageapp/service/websocket/AppSocket.kt

@@ -40,7 +40,6 @@ import java.util.UUID
 class AppSocket : SocketClient() {
     var logService = RetrofitService.create<LogService>()
     private val serviceScope = CoroutineScope(MainScope().coroutineContext)
-    private var appList = arrayListOf<AppInfo>()
 
 
     val spUtils by lazy { SharedPreferencesUtils.getInstance(context) }
@@ -51,11 +50,9 @@ class AppSocket : SocketClient() {
     }
 
     override fun startSocket(context: Context?) {
-        EventBus.getDefault().register(this)
         connectUrl = Const.WSURL
         /* startNotification()*/
         LogShow("已经创建")
-        appList = AppUtils.GetAppList(context) as ArrayList<AppInfo>
         //downLoadFile("")
         super.startSocket(context)
     }
@@ -85,67 +82,10 @@ class AppSocket : SocketClient() {
         WebSocketHelper.getInstance().sendSocketString(GsonUtils.parseClassToJson(webData))
     }
 
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    fun onUiEvent(uiEvent: UIEvent) {
-        when (uiEvent.event) {
-            Const.CODE2001.toString() -> {
-                Toast.makeText(context, "这就是新消息", Toast.LENGTH_LONG).show()
-            }
-
-            Const.CODE2002.toString() -> {
-                Toast.makeText(context, "限制使用", Toast.LENGTH_LONG).show()
-                spUtils.setParam(Const.DISABLEPAD, true)
-                goMainActivity()
-            }
-
-            Const.CODE2003.toString() -> {
-                Toast.makeText(context, "解除限制", Toast.LENGTH_LONG).show()
-                spUtils.setParam(Const.DISABLEPAD, false)
-                goMainActivity()
-            }
-
-            Const.CODE2004.toString() -> {
-               //请求接口更新策略
-            }
-
-            Const.CODE2005.toString() -> {
-                ManageApplication.rebootDevice()
-            }
-
-            Const.CODE2006.toString() -> {
-                ManageApplication.launchFactoryReset()
-            }
-
-        }
-    }
-
-    private fun goMainActivity() {
-        try {
-            // 为应用程序的启动Activity 准备Intent
-            val launchIntent = Intent()
-            launchIntent.setComponent(
-                ComponentName(
-                    "com.xhly.manageapp",
-                    "com.xhly.manageapp.ui.MainActivity"
-                )
-            )
-            launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            context.startActivity(launchIntent)
-        } catch (e: Exception) {
-            LogShow("跳转失败$e")
-        }
-    }
 
-    //用来发送事件日志
-    private fun eventLog(operateBean: LogdOperateBean) {
-        serviceScope.launch {
-            logService.postLogdoperateAdd(operateBean)
-        }
-    }
 
     override fun onDestroy() {
         super.onDestroy()
-        EventBus.getDefault().unregister(this)
         serviceScope.cancel()
         /* stopForeground(Service.STOP_FOREGROUND_REMOVE)*/
         val intent = Intent()

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

@@ -93,6 +93,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         viewModel.strategyData.observe(this) {
             spUtils.saveJson(Const.STRATEGYBEANKEY, it)
             StrategyUtils.setStrategy(it)
+            useTimeStrategy()
         }
         viewModel.appStrategyData.observe(this) {
             //存储app时间策略
@@ -306,6 +307,34 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                 }
             }
 
+            Const.CODE2001.toString() -> {
+
+            }
+
+            Const.CODE2002.toString() -> {
+                spUtils.setParam(Const.DISABLEPAD, true)
+                useTimeStrategy()
+            }
+
+            Const.CODE2003.toString() -> {
+                spUtils.setParam(Const.DISABLEPAD, false)
+                useTimeStrategy()
+            }
+
+            Const.CODE2004.toString() -> {
+                //请求接口更新策略
+                viewModel.uploadAppStrategy()
+                viewModel.updateStrategy()
+            }
+
+            Const.CODE2005.toString() -> {
+                ManageApplication.rebootDevice()
+            }
+
+            Const.CODE2006.toString() -> {
+                ManageApplication.launchFactoryReset()
+            }
+
             Const.LOGAPPSTART -> {
                 val message = uiEvent.message
                 if (AppSocket.lastPkgName == message) {