Merge remote-tracking branch 'origin/release' into feat/diamond_category_zl

# Conflicts:
#	config.gradle

config.gradle

@@ -164,7 +164,7 @@ ext {
             "systembartint"                : "com.readystatesoftware.systembartint:systembartint:1.0.3",
             "cube"                         : "in.srain.cube:cube-sdk:1.0.44@aar",
             "support-multidex"             : 'androidx.multidex:multidex:2.0.0',
-            "ydl-ijkplayer-jjdxm"          : "com.ydl:jjdxm-ijkplayer:0.0.33",
+            "ydl-ijkplayer-jjdxm"          : "com.ydl:jjdxm-ijkplayer:0.0.35",
             "walle"                        : "com.meituan.android.walle:library:1.1.5",
             "jpush"                        : "cn.jiguang.sdk:jpush:3.3.6",
             "jcore"                        : "cn.jiguang.sdk:jcore:2.1.4",

m-consultant/src/main/java/com/yidianling/consultant/ui/view/topView/BigShotOneView.kt

@@ -55,8 +55,8 @@ class BigShotOneView : LinearLayout {
             val h5Params = H5Params(bean.specialTopicUrl, null)
             NewH5Activity.start(context, h5Params)
             ActionCountUtils.count(
-                ConsultBIConstants.PART_ID_CONSULT_FILTER_PAGE + "|" + ConsultBIConstants.POSITION_CONSULT_COUNSELOR_LIST_BANNER_CLICK,
-                bean.specialTopicTitle
+                ConsultBIConstants.PART_ID_CONSULT_COUNSELOR_LIST_PAGE + "|" + ConsultBIConstants.POSITION_CONSULT_COUNSELOR_LIST_BANNER_CLICK,
+                bean.specialTopicName
             )
         }
     }

m-consultant/src/main/java/com/yidianling/consultant/ui/view/topView/BigShotThreeView.kt

@@ -59,8 +59,8 @@ class BigShotThreeView : LinearLayout {
             val h5Params = H5Params(bean1.specialTopicUrl, null)
             NewH5Activity.start(context, h5Params)
             ActionCountUtils.count(
-                ConsultBIConstants.PART_ID_CONSULT_FILTER_PAGE + "|" + ConsultBIConstants.POSITION_CONSULT_COUNSELOR_LIST_BANNER_CLICK,
-                bean1.specialTopicTitle
+                ConsultBIConstants.PART_ID_CONSULT_COUNSELOR_LIST_PAGE + "|" + ConsultBIConstants.POSITION_CONSULT_COUNSELOR_LIST_BANNER_CLICK,
+                bean1.specialTopicName
             )
 
         }
@@ -69,8 +69,8 @@ class BigShotThreeView : LinearLayout {
             val h5Params = H5Params(bean2.specialTopicUrl, null)
             NewH5Activity.start(context, h5Params)
             ActionCountUtils.count(
-                ConsultBIConstants.PART_ID_CONSULT_FILTER_PAGE + "|" + ConsultBIConstants.POSITION_CONSULT_COUNSELOR_LIST_BANNER_CLICK,
-                bean2.specialTopicTitle
+                ConsultBIConstants.PART_ID_CONSULT_COUNSELOR_LIST_PAGE + "|" + ConsultBIConstants.POSITION_CONSULT_COUNSELOR_LIST_BANNER_CLICK,
+                bean2.specialTopicName
             )
 
         }
@@ -79,8 +79,8 @@ class BigShotThreeView : LinearLayout {
             val h5Params = H5Params(bean3.specialTopicUrl, null)
             NewH5Activity.start(context, h5Params)
             ActionCountUtils.count(
-                ConsultBIConstants.PART_ID_CONSULT_FILTER_PAGE + "|" + ConsultBIConstants.POSITION_CONSULT_COUNSELOR_LIST_BANNER_CLICK,
-                bean3.specialTopicTitle
+                ConsultBIConstants.PART_ID_CONSULT_COUNSELOR_LIST_PAGE + "|" + ConsultBIConstants.POSITION_CONSULT_COUNSELOR_LIST_BANNER_CLICK,
+                bean3.specialTopicName
             )
 
         }

m-consultant/src/main/java/com/yidianling/consultant/ui/view/topView/BigShotTwoView.kt

@@ -56,8 +56,8 @@ class BigShotTwoView : LinearLayout {
             val h5Params = H5Params(bean1.specialTopicUrl, null)
             NewH5Activity.start(context, h5Params)
             ActionCountUtils.count(
-                ConsultBIConstants.PART_ID_CONSULT_FILTER_PAGE + "|" + ConsultBIConstants.POSITION_CONSULT_COUNSELOR_LIST_BANNER_CLICK,
-                bean1.specialTopicTitle
+                ConsultBIConstants.PART_ID_CONSULT_COUNSELOR_LIST_PAGE + "|" + ConsultBIConstants.POSITION_CONSULT_COUNSELOR_LIST_BANNER_CLICK,
+                bean1.specialTopicName
             )
 
         }
@@ -67,8 +67,8 @@ class BigShotTwoView : LinearLayout {
             val h5Params = H5Params(bean2.specialTopicUrl, null)
             NewH5Activity.start(context, h5Params)
             ActionCountUtils.count(
-                ConsultBIConstants.PART_ID_CONSULT_FILTER_PAGE + "|" + ConsultBIConstants.POSITION_CONSULT_COUNSELOR_LIST_BANNER_CLICK,
-                bean2.specialTopicTitle
+                ConsultBIConstants.PART_ID_CONSULT_COUNSELOR_LIST_PAGE + "|" + ConsultBIConstants.POSITION_CONSULT_COUNSELOR_LIST_BANNER_CLICK,
+                bean2.specialTopicName
             )
 
         }

m-consultant/src/main/java/com/yidianling/consultant/ui/view/topView/RecommendItemView.kt

@@ -70,8 +70,8 @@ class RecommendItemView : LinearLayout {
             val h5Params = H5Params(bean.specialTopicUrl, null)
             NewH5Activity.start(context, h5Params)
             ActionCountUtils.count(
-                ConsultBIConstants.PART_ID_CONSULT_FILTER_PAGE + "|" + ConsultBIConstants.POSITION_CONSULT_COUNSELOR_LIST_BANNER_CLICK,
-                bean.specialTopicTitle
+                ConsultBIConstants.PART_ID_CONSULT_COUNSELOR_LIST_PAGE + "|" + ConsultBIConstants.POSITION_CONSULT_COUNSELOR_LIST_BANNER_CLICK,
+                bean.specialTopicName
             )
 
         }

m-im/src/main/AndroidManifest.xml

@@ -117,7 +117,6 @@
 
         <activity
             android:name="com.yidianling.avchatkit.activity.AVChatActivity"
-            android:launchMode="singleInstance"
             android:screenOrientation="portrait"
             android:theme="@style/FullScreenTheme"
             android:windowSoftInputMode="stateAlwaysHidden" />

m-im/src/main/java/com/yidianling/avchatkit/AVChatProfile.java

@@ -72,7 +72,6 @@ public class AVChatProfile {
                 } else {
                     launchActivityTimeout();
                     AVChatActivity.incomingCall(AVChatKit.getContext(), data, displayName, source);
-                    AVChatActivity.incomingCall(AVChatKit.getContext(), data, displayName, source);
                 }
             }
         };

m-im/src/main/java/com/yidianling/avchatkit/activity/AVChatActivity.java

@@ -28,6 +28,7 @@ import com.netease.nimlib.sdk.avchat.model.AVChatData;
 import com.netease.nimlib.sdk.avchat.model.AVChatOnlineAckEvent;
 import com.netease.nimlib.sdk.avchat.model.AVChatVideoFrame;
 import com.tbruyelle.rxpermissions2.RxPermissions;
+import com.ydl.ydlcommon.utils.ActivityManager;
 import com.ydl.ydlcommon.utils.log.AliYunLogConfig;
 import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper;
 import com.yidianling.avchatkit.AVChatKit;
@@ -147,7 +148,7 @@ public class AVChatActivity extends AVChatBaseUI implements AVChatVideoUI.TouchZ
             finish();
             return;
         }
-
+        ActivityManager.Companion.getInstance().addStack(this);
         // 启动成功，取消timeout处理
         AVChatProfile.getInstance().activityLaunched();
 
@@ -202,6 +203,7 @@ public class AVChatActivity extends AVChatBaseUI implements AVChatVideoUI.TouchZ
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        ActivityManager.Companion.getInstance().removeStack(this);
 
         //界面销毁时强制尝试挂断，防止出现红米Note 4X等手机在切后台点击杀死程序时，实际没有杀死的情况
         try {