Browse Source

1.优化代码

王鹏鹏 1 year ago
parent
commit
b393a3df95

+ 1 - 1
baselib/src/main/java/com/yingyangfly/baselib/base/BaseActivity.kt

@@ -294,7 +294,7 @@ abstract class BaseActivity<DB : ViewDataBinding> : AppCompatActivity(),
         //展示任务弹窗
         LiveEventBusUtil.observer<MessageBean>(this, RxBusCodes.SHOWTASKDIALOG) { bean ->
             val taskFragment = TaskFragment()
-            taskFragment.setTaskDesn(bean.data, "")
+            taskFragment.setTaskDesn(bean.getMessageData(), "")
             taskFragment.onDialogClickListener = {
                 if (TextUtils.isEmpty(bean.ext).not()) {
                     if (TextUtils.equals("C", bean.businessID)) {

+ 1 - 1
baselib/src/main/java/com/yingyangfly/baselib/base/BaseFragmentActivity.kt

@@ -305,7 +305,7 @@ abstract class BaseFragmentActivity<DB : ViewDataBinding> : FragmentActivity(),
         //展示任务弹窗
         LiveEventBusUtil.observer<MessageBean>(this, RxBusCodes.SHOWTASKDIALOG) { bean ->
             val taskFragment = TaskFragment()
-            taskFragment.setTaskDesn(bean.data, "")
+            taskFragment.setTaskDesn(bean.getMessageData(), "")
             taskFragment.onDialogClickListener = {
                 if (TextUtils.isEmpty(bean.ext).not()) {
                     if (TextUtils.equals("C", bean.businessID)) {

+ 11 - 1
baselib/src/main/java/com/yingyangfly/baselib/bean/MessageBean.kt

@@ -1,5 +1,7 @@
 package com.yingyangfly.baselib.bean
 
+import android.text.TextUtils
+
 /**
  * IM自定义消息关键字
  */
@@ -7,4 +9,12 @@ data class MessageBean(
     val businessID: String,
     val data: String,
     val ext: String
-)
+) {
+    fun getMessageData(): String {
+        return if (TextUtils.isEmpty(data)) {
+            ""
+        } else {
+            data
+        }
+    }
+}