Merge branch 'feat/lp/lp_4.4.01' into 'd/v4.4.01'

feat: 前置信息收集卡，通过服务端控制是否展示

See merge request app_android_lib/YDL-Component!234

m-im/src/main/java/com/yidianling/im/bean/SystemConfigByKeywordBean.java

@@ -17,5 +17,9 @@ public class SystemConfigByKeywordBean {
      * value3 :
      */
 
-    public String value1;
+    public Long value1;
+    /**
+     * 0:不弹信息卡，1:弹信息卡
+     * */
+    public Long value2;
 }

m-im/src/main/java/com/yidianling/im/helper/IMChatUtil.kt

@@ -63,6 +63,8 @@ object IMChatUtil {
     private const val USER_TYPE_EXPERT = 2//专家
     private const val USER_TYPE_ASSISTANT = 3//助理
     private const val USER_TYPE_USER = 1//用户
+    //展示信息收集卡
+    private const val SHOW_EMS_POP = 1L
     lateinit var doctorId: String
 
     /**
@@ -97,8 +99,10 @@ object IMChatUtil {
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe {
-                val skipTime = it.value1.toLong()
-                if (isJumpToIm(skipTime)) {
+                val skipTime = it.value1
+                //0:不弹信息卡，1:弹信息卡
+                val isPopCms = it.value2
+                if (SHOW_EMS_POP != isPopCms || isJumpToIm(skipTime)) {
                     // 请求接口获取咨询助理的uid
                     getImJavaApi().getConsultAssistantUidRequest(location, ffrom2)
                         .subscribeOn(Schedulers.io())
@@ -190,8 +194,11 @@ object IMChatUtil {
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe {
                 //请求接口获取 前置信息收集间隔时间
-                val skipTime = it.value1.toLong()
-                if (isJumpToIm(skipTime)) {
+                val skipTime = it.value1
+                //0:不弹信息卡，1:弹信息卡
+                val isPopCms = it.value2
+
+                if (SHOW_EMS_POP != isPopCms  || isJumpToIm(skipTime)) {
                     //时间内已收集过信息，直接跳转到聊天页
                     startChat(context, toUid, isFromQingShu)
                 } else {