测评后置接口补充

app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java

@@ -20,8 +20,8 @@ import java.util.List;
 public final class DemoGlobalConfig implements IConfigModule {
     String APP_DOMAIN = "https://api.github.com/";
     //        public static String appEnv = YDLConstants.ENV_AUTO_TEST;
-    public static String appEnv = YDLConstants.ENV_TEST;
-//    public static String appEnv = YDLConstants.ENV_PROD;
+//    public static String appEnv = YDLConstants.ENV_TEST;
+    public static String appEnv = YDLConstants.ENV_PROD;
 
     @Override
     public void injectAppLifecycle(@NotNull Context context, @NotNull List<IAppLifecycles> lifecycles) {

m-im/src/main/java/com/yidianling/im/modular/service/IMServiceImpl.kt

@@ -27,7 +27,7 @@ import com.yidianling.im.api.listener.ApiStringResponseCallback
 import com.yidianling.im.api.service.IImService
 import com.yidianling.im.bridge.P2PCustomActionHandlerImpl
 import com.yidianling.im.config.NimApplication
-import com.yidianling.im.helper.IMUtil
+import com.yidianling.im.helper.IMChatUtil
 import com.yidianling.im.helper.LogoutHelper
 import com.yidianling.im.helper.MsgReceiveHelper
 import com.yidianling.im.http.ImRetrofitApi
@@ -60,7 +60,7 @@ class IMServiceImpl : IImService {
     }
 
     override fun startP2PSession(context: Activity, toUid: String) {
-        IMUtil.startChat(context as AppCompatActivity, toUid, IMUtil.FLAG_SAVE or IMUtil.FLAG_USE_UM, 0, null)
+        IMChatUtil.startChat(context as AppCompatActivity, toUid, 0)
     }
 
     override fun startP2PXiaoYi(context: Context) {
@@ -210,12 +210,12 @@ class IMServiceImpl : IImService {
      */
     override fun startChat(context: Activity, toUid: String, flag: Int, canTalk: Int) {
         //这里虽然是倾述流程进入私聊，但不需要发送自定义消息
-        IMUtil.startChat(context as AppCompatActivity, toUid, 0x001, canTalk, null, 0, false)
+        IMChatUtil.startChat(context as AppCompatActivity, toUid,0)
     }
 
     override fun startChat(context: Activity, toUid: String, flag: Int, canTalk: Int, isFramQingsu: Int, isFromMessageList: Boolean) {
         //这里虽然是倾述流程进入私聊，但不需要发送自定义消息
-        IMUtil.startChat(context as AppCompatActivity, toUid, 0x001, canTalk, null, isFramQingsu, isFromMessageList)
+        IMChatUtil.startChat(context as AppCompatActivity, toUid,isFramQingsu)
     }
 
     override fun getUnReadByUid(uid: String): Int {
@@ -268,7 +268,7 @@ class IMServiceImpl : IImService {
     }
 
     override fun startKefuChat(context: Context, toUid: String, flag: Int, canTalk: Int) {
-        IMUtil.startKefuChat(context as AppCompatActivity, toUid, flag, canTalk, null)
+        IMChatUtil.startKefuChat(context as AppCompatActivity)
     }
 
     override fun startP2PSession(mContext: Context, userType: Int, account: String, toChatUsername: String, toName: String, head: String) {

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

@@ -4,8 +4,7 @@ import android.support.v7.app.AppCompatActivity;
 import android.widget.LinearLayout;
 
 import com.yidianling.im.R;
-import com.yidianling.im.helper.IMUtil;
-import com.yidianling.im.session.SessionHelper;
+import com.yidianling.im.helper.IMChatUtil;
 import com.yidianling.nimbase.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter;
 import com.yidianling.uikit.business.session.viewholder.MsgViewHolderBase;
 
@@ -45,7 +44,6 @@ public class MsgViewHolderCustomerServiceCard extends MsgViewHolderBase {
     @Override
     protected void onItemClick() {
         super.onItemClick();
-        IMUtil.startKefuChat((AppCompatActivity) context, "14", IMUtil.FLAG_SAVE | IMUtil.FLAG_USE_UM, 0, null);
-
+        IMChatUtil.INSTANCE.startKefuChat((AppCompatActivity) context);
     }
 }

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

@@ -7,6 +7,7 @@ import android.widget.TextView;
 import com.ydl.ydl_image.module.GlideApp;
 import com.ydl.ydlcommon.base.BaseApp;
 import com.yidianling.im.R;
+import com.yidianling.im.helper.IMChatUtil;
 import com.yidianling.im.helper.IMUtil;
 import com.yidianling.im.session.extension.CustomAttachmentRecommendAssistant;
 import com.yidianling.nimbase.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter;
@@ -81,7 +82,7 @@ public class MsgViewHolderRecommendAssistant extends MsgViewHolderBase {
     @Override
     protected void onItemClick() {
         try {
-            IMUtil.startChat((AppCompatActivity) context, touid, 0, 0, null, 0, false);
+            IMChatUtil.INSTANCE.startChat((AppCompatActivity) context, touid,0);
         } catch (NumberFormatException e) {
             e.printStackTrace();
         }

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

@@ -12,6 +12,7 @@ import com.ydl.ydl_image.module.GlideApp;
 import com.ydl.ydlcommon.utils.AnimUtils;
 import com.yidianling.im.R;
 import com.yidianling.im.bean.DoctorAssistantRespDtoBean;
+import com.yidianling.im.helper.IMChatUtil;
 import com.yidianling.im.helper.IMUtil;
 import com.yidianling.im.http.ImRetrofitApi;
 import com.yidianling.im.session.extension.CustomRecommendExpertListMsg;
@@ -83,7 +84,7 @@ public class MsgViewHolderRecommendExpertList extends MsgViewHolderBase {
                                         if (String.valueOf(bean.chatUid).equals(toUid)) {
                                             ActionHandlerStorage.getL(message.getSessionId()).judgeSendRemindMsg(message.getSessionId());
                                         } else {
-                                            IMUtil.startChat((AppCompatActivity) context, toUid, IMUtil.FLAG_SAVE | IMUtil.FLAG_USE_UM, 0, null);
+                                            IMChatUtil.INSTANCE.startChat((AppCompatActivity) context,toUid,0);
                                         }
 
                                     });

m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java

@@ -54,6 +54,7 @@ import com.ydl.ydlcommon.view.CircleImageView;
 import com.ydl.ydlcommon.view.dialog.CommonDialog;
 import com.yidianling.common.tools.ToastUtil;
 import com.yidianling.im.R;
+import com.yidianling.im.bridge.P2PCustomActionHandlerImpl;
 import com.yidianling.im.helper.IMChatUtil;
 import com.yidianling.im.router.ImIn;
 import com.yidianling.nimbase.api.UIKitOptions;
@@ -252,7 +253,11 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
         }
 
         if(ActionHandlerStorage.getL(sessionId).isNotPrepare()) {
-            IMChatUtil.INSTANCE.prepareChatData((AppCompatActivity) getActivity(),sessionId, () -> {
+            IMChatUtil.INSTANCE.prepareChatData((AppCompatActivity) getActivity(),sessionId, (expertInfo) -> {
+                String toUid = expertInfo.shareData.toUid;
+                P2PCustomActionHandlerImpl handler = new P2PCustomActionHandlerImpl(toUid, expertInfo);
+                handler.setUserType(expertInfo.shareData.user_type);
+                ActionHandlerStorage.setL(toUid, handler);
                 initView();
             });
         }else {