1.增加2002通知消息处理。

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

@@ -42,7 +42,6 @@ import com.xhly.manageapp.broadcastreceiver.AppInstallReceiver
 import com.xhly.manageapp.databinding.ActivityMainBinding
 import com.xhly.manageapp.service.ManageAccessibilityService
 import com.xhly.manageapp.service.websocket.AppSocket
-import com.xhly.manageapp.service.websocket.AppSocketService
 import com.xhly.manageapp.ui.ManageActivity
 import com.xhly.manageapp.ui.login.activity.LoginActivity
 import com.xhly.manageapp.ui.main.viewmodel.MainViewModel
@@ -63,10 +62,10 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
 
     override fun initData() {
         val json = spUtils.getFromJson(Const.USERINFO, UserBean().javaClass)
-        if (json==null){
+        if (json == null) {
             loginOut()
             return
-        }else{
+        } else {
             userBean = json as UserBean
         }
         val getAppList1 = AppUtils.GetAppList(this)
@@ -122,7 +121,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
 
     override fun initView() {
         userBean?.let {
-          mBinding.usernameTv.text=it.username
+            mBinding.usernameTv.text = it.username
 
         }
         mBinding.loginoutIv.setOnClickListener {
@@ -308,7 +307,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             }
 
             Const.CODE2001.toString() -> {
-
+                val message = uiEvent.message
+                showNoticeDialog(message)
             }
 
             Const.CODE2002.toString() -> {
@@ -497,18 +497,17 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                     }
                     cancelTv.setOnClickListener {
                         dialog.dismiss()
-                        showNoticeDialog()
                     }
                 }
             }).setCancelable(false).setMaskColor(Color.parseColor("#66000000"))
             .setAlign(CustomDialog.ALIGN.CENTER).show()
     }
 
-    private fun showNoticeDialog() {
+    private fun showNoticeDialog(msg: String) {
         CustomDialog.build()
             .setCustomView(object : OnBindView<CustomDialog>(R.layout.layout_notice_dialog) {
                 override fun onBind(dialog: CustomDialog, v: View) {
-                    var closeBtn = v.findViewById<Button>(R.id.dialog_close_btn)
+                    val closeBtn = v.findViewById<Button>(R.id.dialog_close_btn)
                     closeBtn.setOnClickListener {
                         dialog.dismiss()
 

websocket/src/main/java/com/xhly/websocket/utils/SocketPushUtils.kt

@@ -10,7 +10,7 @@ object SocketPushUtils {
     fun dealPushMessage(content: String) {
         try {
             //没用泛型是因为如果带有泛型的类型，可能会遇到解析异常的问题。需要使用TypeToken
-            var socketData = GsonUtils.parseJsonWithGson(content, WebSocketData::class.java)
+            val socketData = GsonUtils.parseJsonWithGson(content, WebSocketData::class.java)
             LogShow("数据$content")
             socketData.code.let { code ->
                 when (code) {
@@ -20,7 +20,11 @@ object SocketPushUtils {
 
                     Const.CODE2001 -> {
                         //发送消息 body{userid,username,msg}
-                        UIEvent(Const.CODE2001.toString()).post()
+                        var msg=""
+                        if (socketData.body!=null){
+                            msg=socketData.body.toString()
+                        }
+                        UIEvent(Const.CODE2001.toString()).setMessage(msg).post()
                     }
 
                     Const.CODE2002 -> {