1.修改消息跳转

baselib/src/main/java/com/yingyangfly/baselib/base/BaseActivity.kt

@@ -5,6 +5,7 @@ import android.app.AlertDialog
 import android.content.Context
 import android.content.pm.ActivityInfo
 import android.os.Bundle
+import android.text.TextUtils
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
@@ -25,6 +26,7 @@ import com.yingyangfly.baselib.dialog.LoadingDialog
 import com.yingyangfly.baselib.dialog.TaskFragment
 import com.yingyangfly.baselib.ext.getDbClass
 import com.yingyangfly.baselib.ext.initBar
+import com.yingyangfly.baselib.router.RouterUrlCommon
 import com.yingyangfly.baselib.utils.*
 import gorden.rxbus2.RxBus
 
@@ -283,11 +285,25 @@ abstract class BaseActivity<DB : ViewDataBinding> : AppCompatActivity(),
 
     private fun initLiveEventBusUtil() {
         //展示任务弹窗
-        LiveEventBusUtil.observer<MessageBean>(this, RxBusCodes.SHOWTASKDIALOG) {
+        LiveEventBusUtil.observer<MessageBean>(this, RxBusCodes.SHOWTASKDIALOG) { bean ->
             val taskFragment = TaskFragment()
-            taskFragment.setTaskDesn(it.data, "")
+            taskFragment.setTaskDesn(bean.data, "")
             taskFragment.onDialogClickListener = {
-
+                if (TextUtils.isEmpty(bean.ext).not()) {
+                    if (TextUtils.equals("C", bean.businessID)) {
+                        JumpUtil.jumpActivityWithUrl(
+                            RouterUrlCommon.load_web_view,
+                            bean.ext,
+                            mContext
+                        )
+                    } else if (TextUtils.equals("D", bean.businessID)) {
+                        JumpUtil.jumpActivityWithUrl(
+                            RouterUrlCommon.trainContentDetails,
+                            bean.ext,
+                            mContext
+                        )
+                    }
+                }
             }
             taskFragment.show(supportFragmentManager, "taskFragment")
         }

baselib/src/main/java/com/yingyangfly/baselib/base/BaseFragmentActivity.kt

@@ -7,6 +7,7 @@ import android.content.pm.ActivityInfo
 import android.content.res.Configuration
 import android.content.res.Resources
 import android.os.Bundle
+import android.text.TextUtils
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
@@ -26,6 +27,7 @@ import com.yingyangfly.baselib.dialog.LoadingDialog
 import com.yingyangfly.baselib.dialog.TaskFragment
 import com.yingyangfly.baselib.ext.getDbClass
 import com.yingyangfly.baselib.ext.initBar
+import com.yingyangfly.baselib.router.RouterUrlCommon
 import com.yingyangfly.baselib.utils.*
 import gorden.rxbus2.RxBus
 
@@ -301,11 +303,25 @@ abstract class BaseFragmentActivity<DB : ViewDataBinding> : FragmentActivity(),
 
     private fun initLiveEventBusUtil() {
         //展示任务弹窗
-        LiveEventBusUtil.observer<MessageBean>(this, RxBusCodes.SHOWTASKDIALOG) {
+        LiveEventBusUtil.observer<MessageBean>(this, RxBusCodes.SHOWTASKDIALOG) { bean ->
             val taskFragment = TaskFragment()
-            taskFragment.setTaskDesn(it.data, "")
+            taskFragment.setTaskDesn(bean.data, "")
             taskFragment.onDialogClickListener = {
-
+                if (TextUtils.isEmpty(bean.ext).not()) {
+                    if (TextUtils.equals("C", bean.businessID)) {
+                        JumpUtil.jumpActivityWithUrl(
+                            RouterUrlCommon.load_web_view,
+                            bean.ext,
+                            mContext
+                        )
+                    } else if (TextUtils.equals("D", bean.businessID)) {
+                        JumpUtil.jumpActivityWithUrl(
+                            RouterUrlCommon.trainContentDetails,
+                            bean.ext,
+                            mContext
+                        )
+                    }
+                }
             }
             taskFragment.show(supportFragmentManager, "taskFragment")
         }