Browse Source

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

master
wangwanlei 1 year ago
parent
commit
4c642ae31d

+ 7
- 8
app/src/main/java/com/xhly/manageapp/ui/main/activity/MainActivity.kt View File

42
 import com.xhly.manageapp.databinding.ActivityMainBinding
42
 import com.xhly.manageapp.databinding.ActivityMainBinding
43
 import com.xhly.manageapp.service.ManageAccessibilityService
43
 import com.xhly.manageapp.service.ManageAccessibilityService
44
 import com.xhly.manageapp.service.websocket.AppSocket
44
 import com.xhly.manageapp.service.websocket.AppSocket
45
-import com.xhly.manageapp.service.websocket.AppSocketService
46
 import com.xhly.manageapp.ui.ManageActivity
45
 import com.xhly.manageapp.ui.ManageActivity
47
 import com.xhly.manageapp.ui.login.activity.LoginActivity
46
 import com.xhly.manageapp.ui.login.activity.LoginActivity
48
 import com.xhly.manageapp.ui.main.viewmodel.MainViewModel
47
 import com.xhly.manageapp.ui.main.viewmodel.MainViewModel
63
 
62
 
64
     override fun initData() {
63
     override fun initData() {
65
         val json = spUtils.getFromJson(Const.USERINFO, UserBean().javaClass)
64
         val json = spUtils.getFromJson(Const.USERINFO, UserBean().javaClass)
66
-        if (json==null){
65
+        if (json == null) {
67
             loginOut()
66
             loginOut()
68
             return
67
             return
69
-        }else{
68
+        } else {
70
             userBean = json as UserBean
69
             userBean = json as UserBean
71
         }
70
         }
72
         val getAppList1 = AppUtils.GetAppList(this)
71
         val getAppList1 = AppUtils.GetAppList(this)
122
 
121
 
123
     override fun initView() {
122
     override fun initView() {
124
         userBean?.let {
123
         userBean?.let {
125
-          mBinding.usernameTv.text=it.username
124
+            mBinding.usernameTv.text = it.username
126
 
125
 
127
         }
126
         }
128
         mBinding.loginoutIv.setOnClickListener {
127
         mBinding.loginoutIv.setOnClickListener {
308
             }
307
             }
309
 
308
 
310
             Const.CODE2001.toString() -> {
309
             Const.CODE2001.toString() -> {
311
-
310
+                val message = uiEvent.message
311
+                showNoticeDialog(message)
312
             }
312
             }
313
 
313
 
314
             Const.CODE2002.toString() -> {
314
             Const.CODE2002.toString() -> {
497
                     }
497
                     }
498
                     cancelTv.setOnClickListener {
498
                     cancelTv.setOnClickListener {
499
                         dialog.dismiss()
499
                         dialog.dismiss()
500
-                        showNoticeDialog()
501
                     }
500
                     }
502
                 }
501
                 }
503
             }).setCancelable(false).setMaskColor(Color.parseColor("#66000000"))
502
             }).setCancelable(false).setMaskColor(Color.parseColor("#66000000"))
504
             .setAlign(CustomDialog.ALIGN.CENTER).show()
503
             .setAlign(CustomDialog.ALIGN.CENTER).show()
505
     }
504
     }
506
 
505
 
507
-    private fun showNoticeDialog() {
506
+    private fun showNoticeDialog(msg: String) {
508
         CustomDialog.build()
507
         CustomDialog.build()
509
             .setCustomView(object : OnBindView<CustomDialog>(R.layout.layout_notice_dialog) {
508
             .setCustomView(object : OnBindView<CustomDialog>(R.layout.layout_notice_dialog) {
510
                 override fun onBind(dialog: CustomDialog, v: View) {
509
                 override fun onBind(dialog: CustomDialog, v: View) {
511
-                    var closeBtn = v.findViewById<Button>(R.id.dialog_close_btn)
510
+                    val closeBtn = v.findViewById<Button>(R.id.dialog_close_btn)
512
                     closeBtn.setOnClickListener {
511
                     closeBtn.setOnClickListener {
513
                         dialog.dismiss()
512
                         dialog.dismiss()
514
 
513
 

+ 6
- 2
websocket/src/main/java/com/xhly/websocket/utils/SocketPushUtils.kt View File

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

Loading…
Cancel
Save