Merge remote-tracking branch 'origin/4.1.67' into 4.1.67

# Conflicts:
#	config.gradle

config.gradle

@@ -10,8 +10,8 @@ ext {
             "m-fm"            : "0.0.30.01",
             "m-user"          : "0.0.61.04",
             "m-home"          : "0.0.22.53",
-            "m-im"            : "0.0.18.34",
-            "m-dynamic"       : "0.0.7.16",
+            "m-im"            : "0.0.18.35",
+            "m-dynamic"       : "0.0.7.15",
             "m-article"       : "0.0.0.6",
 
             "m-muse"          : "0.0.28.20",

m-im/src/main/java/com/yidianling/im/bridge/P2PCustomActionHandlerImpl.java

@@ -96,10 +96,10 @@ public class P2PCustomActionHandlerImpl implements IP2PCustomActionHandler {
 
     public P2PCustomActionHandlerImpl(String toChatUsername,
                                       IMExpertBuild expert) {
-        setExpertInfo(toChatUsername,expert);
+        setExpertInfo(toChatUsername, expert);
     }
-    
-    public void setExpertInfo(String toChatUsername,IMExpertBuild expert) {
+
+    public void setExpertInfo(String toChatUsername, IMExpertBuild expert) {
         blackStatus = Integer.valueOf(expert.shareData.blackStatus);
         this.toChatUsername = toChatUsername;
 
@@ -199,7 +199,7 @@ public class P2PCustomActionHandlerImpl implements IP2PCustomActionHandler {
 //        Bundle bundle = new Bundle();
 //        bundle.putString("to_uid",toChatUsername);
 //        ImIn.INSTANCE.SendRedPacketActivity(activity,bundle,44);
-        ImIn.INSTANCE.sendRedPacketIntent(activity, toChatUsername,44);
+        ImIn.INSTANCE.sendRedPacketIntent(activity, toChatUsername, 44);
     }
 
     //判定是否是今天第一次发送提醒上线通知，不是的话则不发消息通知|普通消息
@@ -257,7 +257,7 @@ public class P2PCustomActionHandlerImpl implements IP2PCustomActionHandler {
         String share_title = name + "咨询工作室";
         String share_head = cover;
         String share_context = "";
-        String share_url = ImIn.INSTANCE.getShareExpertHost()+ doctorId;
+        String share_url = ImIn.INSTANCE.getShareExpertHost() + doctorId;
 
         H5Params h5Params = new H5Params(junmpurl, null);
         if (!TextUtils.isEmpty(share_url)) {
@@ -501,9 +501,6 @@ public class P2PCustomActionHandlerImpl implements IP2PCustomActionHandler {
         builder1.create().show();
     }
 
-    private List<String> list = new ArrayList<>();
-//    ChooseListDialogFragment chooseListDialogFragment_ = ChooseListDialogFragment_.builder().build();
-
 
     @Override
     public DocInfo getInfo() {
@@ -581,13 +578,12 @@ public class P2PCustomActionHandlerImpl implements IP2PCustomActionHandler {
 
     @Override
     public void clickMoreIcon() {
-
-        if (mActivity == null || mActivity.isFinishing()) return;
-
-        list.clear();
+        if (mActivity == null || mActivity.isFinishing()) {
+            return;
+        }
+        List<String> list = new ArrayList<>();
         if (ImConstants.KEFUXIAOYI.equals(toChatUsername) || "4108805".equals(toChatUsername)) {
             list.add("历史聊天记录");
-//            list.add("返回首页");
             list.add("客服热线");
         } else {
             list.add("投诉反馈");
@@ -596,7 +592,6 @@ public class P2PCustomActionHandlerImpl implements IP2PCustomActionHandler {
             } else if (blackStatus == 2) {
                 list.add("取消拉黑");
             }
-//            list.add("返回首页");
             if (userType == 1) {
                 list.add("ta的主页");
             }
@@ -605,56 +600,49 @@ public class P2PCustomActionHandlerImpl implements IP2PCustomActionHandler {
             list.add("历史聊天记录");
             list.add("删除聊天记录");
         }
-        ListDialog.Builder builderm = new ListDialog.Builder(mActivity, list, 0);
-        builderm.SetLastStr("取消");
-        builderm.SetLastButton("取消", new DialogInterface.OnClickListener() {
+        ListDialog.Builder dialog = new ListDialog.Builder(mActivity, list, 0);
+        dialog.SetLastStr("取消");
+        dialog.create().show();
+        dialog.SetLastButton("取消", new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
                 dialog.dismiss();
             }
         });
-        builderm.SetOnItemClickLister(new ListDialog.Builder.OnItemClickLister() {
+        dialog.SetOnItemClickLister(new ListDialog.Builder.OnItemClickLister() {
             @Override
             public void onItemClick(Dialog dialog, View view, int position) {
                 LogHelper.Companion.getInstance().writeLogSync(String.format("聊天界面：%s", list.get(position)));
                 switch (list.get(position)) {
                     case "投诉反馈":
                         startFeedback(mActivity);
-                        dialog.dismiss();
                         break;
                     case "返回首页":
                         ImIn.INSTANCE.mainIntent(mActivity, 0);
-                        dialog.dismiss();
                         break;
                     case "客服热线":
                         showCallDialog();
-                        dialog.dismiss();
                         break;
                     case "访问专家主页":
                         skip2ExpertHome();
-                        dialog.dismiss();
                         break;
                     case "历史聊天记录":
                         historyMsg();
-                        dialog.dismiss();
                         break;
                     case "拉黑":
                         setBlack();
-                        dialog.dismiss();
                         break;
                     case "取消拉黑":
                         rmBlack();
-                        dialog.dismiss();
                         break;
                     case "删除聊天记录":
                         deleteChatHistory();
-                        dialog.dismiss();
                         break;
                     case "ta的主页":
                         showUserHome();
-                        dialog.dismiss();
                         break;
                 }
+                dialog.dismiss();
             }
 
             @Override
@@ -662,9 +650,6 @@ public class P2PCustomActionHandlerImpl implements IP2PCustomActionHandler {
 
             }
         });
-        builderm.create().show();
-
-
     }
 
     //删除聊天记录
@@ -737,7 +722,7 @@ public class P2PCustomActionHandlerImpl implements IP2PCustomActionHandler {
 //    }
     private void skip2ExpertHome() {//跳转到专家主页
         // 跳转到专家主页
-        String junmpurl = ImIn.INSTANCE.getExpertHost()+ docInfo.doctorId;
+        String junmpurl = ImIn.INSTANCE.getExpertHost() + docInfo.doctorId;
         String share_title = docInfo.name + "咨询工作室";
         String share_head = docInfo.cover;
         String share_context = "";
@@ -922,12 +907,12 @@ public class P2PCustomActionHandlerImpl implements IP2PCustomActionHandler {
 
     private void showCallDialog() {
         try {
-            final String tel = PlatformDataManager.INSTANCE.getRam().getGlobalInfo() == null ? "400-765-1010" : PlatformDataManager.INSTANCE.getRam().getGlobalInfo() .info.tel;
+            final String tel = PlatformDataManager.INSTANCE.getRam().getGlobalInfo() == null ? "400-765-1010" : PlatformDataManager.INSTANCE.getRam().getGlobalInfo().info.tel;
 
             String con = "\n400-765-1010\n早8:30-凌晨2:00";
 
-            if (PlatformDataManager.INSTANCE.getRam().getGlobalInfo()  != null && PlatformDataManager.INSTANCE.getRam().getGlobalInfo() .info != null) {
-                con = PlatformDataManager.INSTANCE.getRam().getGlobalInfo() .info.tel + "\n" + PlatformDataManager.INSTANCE.getRam().getGlobalInfo() .info.work_time;
+            if (PlatformDataManager.INSTANCE.getRam().getGlobalInfo() != null && PlatformDataManager.INSTANCE.getRam().getGlobalInfo().info != null) {
+                con = PlatformDataManager.INSTANCE.getRam().getGlobalInfo().info.tel + "\n" + PlatformDataManager.INSTANCE.getRam().getGlobalInfo().info.work_time;
             }
 
             new CommonDialog(mActivity)
@@ -956,7 +941,7 @@ public class P2PCustomActionHandlerImpl implements IP2PCustomActionHandler {
 
     @Override
     public void startHelp(Context context) {
-        
+
         H5Params params = new H5Params(HttpConfig.Companion.getH5_URL() + "help/", "");
         params.setShowMenu(true);
         NewH5Activity.start(context, params);