1.优化代码

home/src/main/java/com/yingyangfly/home/activity/HomeActivity.kt

@@ -233,7 +233,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
                 showLayout(false)
                 it!![0].let {
                     binding.task = it
-                    if (it.details.isEmpty().not()) {
+                    if (it.details.isNullOrEmpty().not()) {
                         val index = it.currentTaskNum - 1
                         currentTaskRecord = it.details[index]
                         taskList.addAll(it.details)
@@ -672,45 +672,47 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
         override fun onRecvNewMessage(msg: V2TIMMessage) {
             super.onRecvNewMessage(msg)
             runOnUiThread {
-                Log.e("wpp", GsonUtil.GsonString(msg))
-                if (msg.elemType == V2TIMMessage.V2TIM_ELEM_TYPE_CUSTOM) {
-                    val customElem = msg.customElem
-                    if (customElem != null && customElem.data != null) {
-                        val data = String(customElem.data)
-                        val messageBean = GsonUtil.GsonToBean(data, MessageBean::class.java)
-                        if (messageBean != null) {
-                            if (TextUtils.equals("A", messageBean.businessID)) {
-                                //缴费通知
-                                if (TextUtils.equals("购买成功，等待医生接诊。", messageBean.data)) {
-                                    LiveEventBusUtil.send(
-                                        RxBusCodes.SuccessfulPurchase,
-                                        messageBean.data
-                                    )
-                                    binding.imageSetting.postDelayed({
+                if (msg.isRead.not()) {
+                    Log.e("wpp", GsonUtil.GsonString(msg))
+                    if (msg.elemType == V2TIMMessage.V2TIM_ELEM_TYPE_CUSTOM) {
+                        val customElem = msg.customElem
+                        if (customElem != null && customElem.data != null) {
+                            val data = String(customElem.data)
+                            val messageBean = GsonUtil.GsonToBean(data, MessageBean::class.java)
+                            if (messageBean != null) {
+                                if (TextUtils.equals("A", messageBean.businessID)) {
+                                    //缴费通知
+                                    if (TextUtils.equals("购买成功，等待医生接诊。", messageBean.data)) {
+                                        LiveEventBusUtil.send(
+                                            RxBusCodes.SuccessfulPurchase,
+                                            messageBean.data
+                                        )
+                                        binding.imageSetting.postDelayed({
+                                            LiveEventBusUtil.send(
+                                                RxBusCodes.SHOWTASKDIALOG,
+                                                messageBean
+                                            )
+                                        }, 800)
+                                    } else {
                                         LiveEventBusUtil.send(
                                             RxBusCodes.SHOWTASKDIALOG,
                                             messageBean
                                         )
-                                    }, 800)
-                                } else {
-                                    LiveEventBusUtil.send(
-                                        RxBusCodes.SHOWTASKDIALOG,
-                                        messageBean
-                                    )
+                                    }
+                                } else if (TextUtils.equals("B", messageBean.businessID)) {
+                                    //系统通知
+                                    LiveEventBusUtil.send(RxBusCodes.SHOWTASKDIALOG, messageBean)
+                                } else if (TextUtils.equals("C", messageBean.businessID)) {
+                                    //报告通知
+                                    LiveEventBusUtil.send(RxBusCodes.SHOWTASKDIALOG, messageBean)
+                                } else if (TextUtils.equals("D", messageBean.businessID)) {
+                                    //理疗通知
+                                    LiveEventBusUtil.send(RxBusCodes.SHOWTASKDIALOG, messageBean)
                                 }
-                            } else if (TextUtils.equals("B", messageBean.businessID)) {
-                                //系统通知
-                                LiveEventBusUtil.send(RxBusCodes.SHOWTASKDIALOG, messageBean)
-                            } else if (TextUtils.equals("C", messageBean.businessID)) {
-                                //报告通知
-                                LiveEventBusUtil.send(RxBusCodes.SHOWTASKDIALOG, messageBean)
-                            } else if (TextUtils.equals("D", messageBean.businessID)) {
-                                //理疗通知
-                                LiveEventBusUtil.send(RxBusCodes.SHOWTASKDIALOG, messageBean)
                             }
+                        } else {
+                            Log.e("wpp", "自定义消息--------------------------解析失败")
                         }
-                    } else {
-                        Log.e("wpp", "自定义消息--------------------------解析失败")
                     }
                 }
             }