feat:4.3.92版本最终合并版

config.gradle

@@ -6,11 +6,11 @@ ext {
             // -------------- 业务模块 --------------
             //第三步 若干
             "m-confide"       : "0.0.49.74",
-            "m-consultant"    : "0.0.60.23",
+            "m-consultant"    : "0.0.60.24",
             "m-fm"            : "0.0.30.08",
-            "m-user"          : "0.0.62.08",
+            "m-user"          : "0.0.62.09",
             "m-home"          : "0.0.23.48",
-            "m-im"            : "0.0.21.42",
+            "m-im"            : "0.0.21.44",
             "m-dynamic"       : "0.0.7.72",
             "m-article"       : "0.0.0.10",
 
@@ -91,11 +91,11 @@ ext {
             //第三步 若干
 
             "m-confide"       : "0.0.49.74",
-            "m-consultant"    : "0.0.60.23",
+            "m-consultant"    : "0.0.60.24",
             "m-fm"            : "0.0.30.08",
-            "m-user"          : "0.0.62.08",
+            "m-user"          : "0.0.62.09",
             "m-home"          : "0.0.23.48",
-            "m-im"            : "0.0.21.42",
+            "m-im"            : "0.0.21.44",
             "m-dynamic"       : "0.0.7.72",
             "m-article"       : "0.0.0.8",
 

m-im/src/main/java/com/yidianling/im/config/provider/CustomUserInfoProvider.kt

@@ -32,8 +32,4 @@ class CustomUserInfoProvider(context:Context) : NimUserInfoProvider(context) {
     override fun getDisplayNameForMessageNotifier(account: String?, sessionId: String?, sessionType: SessionTypeEnum?): String {
         return UserInfoCache.getInstance().getUser(account).nickName
     }
-
-    override fun getDisplayTitleForMessageNotifier(p0: IMMessage?): String {
-        return ""
-    }
 }

m-im/src/main/java/com/yidianling/im/session/viewholder/MsgViewHolderOrderAlreadyDone.java

@@ -126,16 +126,10 @@ public class MsgViewHolderOrderAlreadyDone extends MsgViewHolderBase {
                         .subscribe(it -> {
                                     //确认完成，按钮置灰，更新本地消息
                                     updateLocalMsg();
-                                }, throwable ->{
-                                    if(throwable.getMessage().contains("非已服务待确认")){
-                                        updateLocalMsg();
-                                        onItemClick();
-                                    }else {
-                                        ToastUtil.toastShort(throwable.getMessage());
-                                    }
-                        }
+                                }, throwable -> {
+                                    ToastUtil.toastShort(throwable.getMessage());
+                                }
                         );
-
             });
         }