1.修改消息跳转

baselib/build.gradle

@@ -142,7 +142,6 @@ dependencies {
     api(rootProject.ext.dependencies.fastjson)
     api(rootProject.ext.dependencies.Luban)
     api(rootProject.ext.dependencies.xxPermission)
-    debugApi(rootProject.ext.dependencies.leakcanary)
     api(rootProject.ext.dependencies.tbssdk)
     api(rootProject.ext.dependencies.chuckerteam_chucker)
     api(rootProject.ext.dependencies.lifecycle)

config.gradle

@@ -14,7 +14,7 @@ ext {
             minSdkVersion    : 19,
             targetSdkVersion : 30,
             versionCode      : 4,
-            versionName      : "1.0.4.1",
+            versionName      : "1.0.0",
     ]
     //androidx配置
     androidx = [
@@ -104,7 +104,6 @@ ext {
 
             "utilcode"                 : 'com.blankj:utilcode:1.30.7',
             "gson"                     : 'com.google.code.gson:gson:2.8.5',
-            "leakcanary"               : 'com.squareup.leakcanary:leakcanary-android:2.10',
             "LiteAVSDK_Player"         : 'com.tencent.liteav:LiteAVSDK_Player:latest.release',
             "rxbus"                    : 'lib.gorden.rxbus2:rxbus:2.0.1',
             "Zxing"                    : 'com.github.open-android:Zxing:v1.0.3',

push/src/main/java/com/yingyang/push/activity/MessgeListActivity.kt

@@ -62,10 +62,30 @@ class MessgeListActivity : BaseMVVMActivity<ActivityMessgeListBinding, PushViewM
             pushListAdapter.onPushClickListener = { bean, position ->
                 when (bean.msgType) {
                     "D" -> {
-
+                        if (TextUtils.isEmpty(bean.ext)) {
+                            val messageDialog = MessageDialog()
+                            messageDialog.setContent(bean.id, bean.msgDesn, bean.msgTitle)
+                            messageDialog.show(supportFragmentManager, "messageDialog")
+                        } else {
+                            JumpUtil.jumpActivityWithUrl(
+                                RouterUrlCommon.trainContentDetails,
+                                bean.ext,
+                                mContext
+                            )
+                        }
                     }
                     "C" -> {
-
+                        if (TextUtils.isEmpty(bean.ext)) {
+                            val messageDialog = MessageDialog()
+                            messageDialog.setContent(bean.id, bean.msgDesn, bean.msgTitle)
+                            messageDialog.show(supportFragmentManager, "messageDialog")
+                        } else {
+                            JumpUtil.jumpActivityWithUrl(
+                                RouterUrlCommon.load_web_view,
+                                bean.ext,
+                                mContext
+                            )
+                        }
                     }
                     else -> {
                         val messageDialog = MessageDialog()

push/src/main/java/com/yingyang/push/entity/PushMessageBean.kt

@@ -13,5 +13,6 @@ data class PushMessageBean(
     var orgName: String,
     var status: String,
     var updateTime: String,
-    var msgDesn: String
+    var msgDesn: String,
+    var ext: String
 )