修改各入口聊天跳转

chatModule/src/main/java/com/cooleshow/chatmodule/utils/helper/ChatHelper.java

@@ -3,6 +3,8 @@ package com.cooleshow.chatmodule.utils.helper;
 import android.os.Bundle;
 import android.text.TextUtils;
 
+import com.cooleshow.base.utils.ToastUtil;
+import com.cooleshow.base.utils.UiUtils;
 import com.tencent.imsdk.v2.V2TIMConversation;
 import com.tencent.qcloud.tuicore.TUIConstants;
 import com.tencent.qcloud.tuicore.TUICore;
@@ -46,6 +48,9 @@ public class ChatHelper {
         if (TextUtils.isEmpty(targetId)) {
             return;
         }
+        if (UiUtils.isFastClick()) {
+            return;
+        }
         Bundle param = new Bundle();
         param.putInt(TUIConstants.TUIChat.CHAT_TYPE, V2TIMConversation.V2TIM_C2C);
         param.putString(TUIConstants.TUIChat.CHAT_ID, targetId);
@@ -58,6 +63,9 @@ public class ChatHelper {
         if (TextUtils.isEmpty(targetId)) {
             return;
         }
+        if (UiUtils.isFastClick()) {
+            return;
+        }
         Bundle param = new Bundle();
         param.putInt(TUIConstants.TUIChat.CHAT_TYPE, V2TIMConversation.V2TIM_GROUP);
         param.putString(TUIConstants.TUIChat.CHAT_ID, targetId);
@@ -65,6 +73,38 @@ public class ChatHelper {
         TUICore.startActivity(TUIConstants.TUIChat.GROUP_CHAT_ACTIVITY_NAME, param);
     }
 
+    public void sendShareLiveMessage(String targetId, int targetConversationType, String liveRoomId, String teacherAvatar, String teacherName, String liveDes) {
+//        RCChatShareLiveMessage liveMessage = new RCChatShareLiveMessage();
+//
+//        liveMessage.setTeacherAvatar(teacherAvatar);
+//        liveMessage.setRoomUID(liveRoomId);
+//        liveMessage.setTeacherName(teacherName);
+//        liveMessage.setLiveDescMessage(liveDes);
+//        Conversation.ConversationType conversationType = getConversationType(targetConversationType);
+//        Message locationMsg = Message.obtain(targetId, conversationType, liveMessage);
+//        MessageTag annotation = liveMessage.getClass().getAnnotation(MessageTag.class);
+//        if (annotation != null) {
+//            locationMsg.setObjectName(annotation.value());
+//        }
+//        RongIM.getInstance().sendMessage(locationMsg, "直播分享", "[曲谱分享]", new IRongCallback.ISendMessageCallback() {
+//            @Override
+//            public void onAttached(Message message) {
+//
+//            }
+//
+//            @Override
+//            public void onSuccess(Message message) {
+//                ToastUtil.getInstance().showShort("分享成功");
+//            }
+//
+//            @Override
+//            public void onError(Message message, RongIMClient.ErrorCode errorCode) {
+//                ToastUtil.getInstance().showShort("分享失败");
+//            }
+//        });
+    }
+
+
     private static class ChatHelperHolder {
         public static ChatHelper mHelper = new ChatHelper();
     }

chatModule/src/main/java/com/cooleshow/chatmodule/utils/helper/IMShareHelper.java

@@ -155,9 +155,6 @@ public class IMShareHelper {
 
                     @Override
                     public void onNext(String s) {
-                        if (resultCallBack != null) {
-                            resultCallBack.onResult(true);
-                        }
                     }
 
                     @Override

student/src/main/java/com/cooleshow/student/helper/ShareHelper.java

@@ -139,41 +139,6 @@ public class ShareHelper {
                 });
     }
 
-    public static void shareImgToChatGroup(String base64, String targetId,boolean isGroup, IMShareHelper.ResultCallBack resultCallBack) {
-        Observable.create(new ObservableOnSubscribe<String>() {
-            @Override
-            public void subscribe(ObservableEmitter<String> emitter) throws Exception {
-                File file = saveImgToLocalFile(base64);
-                IMShareHelper.toShare(file, targetId, isGroup, resultCallBack);
-                emitter.onNext("");
-            }
-        }).subscribeOn(Schedulers.io())
-        .observeOn(AndroidSchedulers.mainThread())
-        .subscribe(new Observer<String>() {
-                    @Override
-                    public void onSubscribe(Disposable d) {
-
-                    }
-
-                    @Override
-                    public void onNext(String s) {
-                    }
-
-                    @Override
-                    public void onError(Throwable e) {
-                        e.printStackTrace();
-                        if (resultCallBack != null) {
-                            resultCallBack.onResult(false);
-                        }
-                    }
-
-                    @Override
-                    public void onComplete() {
-
-                    }
-                });
-    }
-
 
     private static Message createImageMessage(String base64, Conversation conversation) {
         ImageMessage imageMessage = ImageMessage.obtain();
@@ -216,7 +181,7 @@ public class ShareHelper {
         String targetId = data.getStringExtra("targetId");
         int conversationValue = data.getIntExtra("conversation", -1);
         if (!TextUtils.isEmpty(base64)) {
-            shareImgToChatGroup(base64, targetId, ChatGroupHelper.isGroupConversation(conversationValue), new IMShareHelper.ResultCallBack() {
+            IMShareHelper.shareImgToChatGroup(base64, targetId, ChatGroupHelper.isGroupConversation(conversationValue), new IMShareHelper.ResultCallBack() {
                 @Override
                 public void onResult(boolean isSuccess) {
                     if (isSuccess) {

student/src/main/java/com/cooleshow/student/ui/course/MinePracticeCourseFragment.java

@@ -32,6 +32,7 @@ import com.cooleshow.base.utils.TimeUtils;
 import com.cooleshow.base.widgets.EmptyViewLayout;
 import com.cooleshow.base.widgets.poplist.PopMenuBean;
 import com.cooleshow.base.widgets.poplist.PopupListWindow;
+import com.cooleshow.chatmodule.utils.helper.ChatHelper;
 import com.cooleshow.student.R;
 import com.cooleshow.student.adapter.CourseStatusFilterAdapter;
 import com.cooleshow.student.adapter.PracticeCourseListAdapter;
@@ -206,7 +207,7 @@ public class MinePracticeCourseFragment extends BaseMVPFragment<FragmentPractice
                 if (position < mAdapter.getData().size()) {
                     PracticeCourseListBean.RowsBean rowsBean = mAdapter.getData().get(position);
                     if (rowsBean != null) {
-                        OpenChatHelper.goChat(getContext(), rowsBean.imUserId, rowsBean.userName);
+                        ChatHelper.getInstance().goChat(rowsBean.imUserId, rowsBean.userName);
                     }
                 }
             }

student/src/main/java/com/cooleshow/student/ui/course/PianoRoomCourseDetailActivity.java

@@ -13,6 +13,7 @@ import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.base.utils.SizeUtils;
 import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
+import com.cooleshow.chatmodule.utils.helper.ChatHelper;
 import com.cooleshow.student.R;
 import com.cooleshow.student.bean.PianoRoomCourseHomeworkBean;
 import com.cooleshow.student.constants.CourseConstants;
@@ -262,7 +263,7 @@ public class PianoRoomCourseDetailActivity extends BaseMVPActivity<ActivityPiano
         if (id == R.id.iv_go_chat) {
             //跳转聊天
             if (mInfoBean != null) {
-                OpenChatHelper.goGroupChat(PianoRoomCourseDetailActivity.this, mInfoBean.imGroupId, "");
+                ChatHelper.getInstance().goGroupChat(mInfoBean.imGroupId, "");
             }
             return;
         }

student/src/main/java/com/cooleshow/student/ui/course/PianoRoomCourseFragment.java

@@ -18,6 +18,7 @@ import com.cooleshow.base.utils.TimeUtils;
 import com.cooleshow.base.widgets.EmptyViewLayout;
 import com.cooleshow.base.widgets.poplist.PopMenuBean;
 import com.cooleshow.base.widgets.poplist.PopupListWindow;
+import com.cooleshow.chatmodule.utils.helper.ChatHelper;
 import com.cooleshow.student.R;
 import com.cooleshow.student.adapter.PianoRoomCourseListAdapter;
 import com.cooleshow.student.bean.CourseFilterStatusBean;
@@ -146,7 +147,7 @@ public class PianoRoomCourseFragment extends BaseMVPFragment<FragmentPianoRoomCo
                     if (position < mAdapter.getData().size()) {
                         PianoRoomCourseListBean.RowsBean rowsBean = mAdapter.getData().get(position);
                         if (rowsBean != null) {
-                            OpenChatHelper.goGroupChat(getContext(), rowsBean.imGroupId, "");
+                            ChatHelper.getInstance().goGroupChat(rowsBean.imGroupId, "");
                         }
                     }
                 }

student/src/main/java/com/cooleshow/student/ui/course/PracticeCourseDetailActivity.java

@@ -26,6 +26,7 @@ import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
+import com.cooleshow.chatmodule.utils.helper.ChatHelper;
 import com.cooleshow.student.R;
 import com.cooleshow.student.adapter.ItemMarkAdapter;
 import com.cooleshow.student.adapter.PracticeVideoWorkAdapter;
@@ -106,7 +107,7 @@ public class PracticeCourseDetailActivity extends BaseMVPActivity<ActivityPracti
             case R.id.iv_go_chat:
                 //聊天
                 if (mInfoBean != null) {
-                    OpenChatHelper.goChat(PracticeCourseDetailActivity.this, mInfoBean.imUserId, mInfoBean.teacherName);
+                    ChatHelper.getInstance().goChat(mInfoBean.imUserId, mInfoBean.teacherName);
                 }
                 break;
         }

student/src/main/java/com/cooleshow/student/ui/course/SparringCourseDetailActivity.java

@@ -19,6 +19,7 @@ import com.cooleshow.base.utils.SizeUtils;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
+import com.cooleshow.chatmodule.utils.helper.ChatHelper;
 import com.cooleshow.student.R;
 import com.cooleshow.student.bean.SparringCourseCommentBean;
 import com.cooleshow.student.bean.SparringCourseHomeworkBean;
@@ -314,7 +315,7 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
         if (v.getId() == R.id.iv_go_chat) {
             //跳转聊天
             if (mInfoBean != null) {
-                OpenChatHelper.goChat(SparringCourseDetailActivity.this, mInfoBean.imUserId, mInfoBean.teacherName);
+                ChatHelper.getInstance().goChat(mInfoBean.imUserId, mInfoBean.teacherName);
             }
         }
 

student/src/main/java/com/cooleshow/student/ui/main/CourseTableFragment.kt

@@ -22,6 +22,7 @@ import com.cooleshow.base.ui.fragment.BaseMVPFragment
 import com.cooleshow.base.utils.SizeUtils
 import com.cooleshow.base.utils.TimeUtils
 import com.cooleshow.base.widgets.EmptyViewLayout
+import com.cooleshow.chatmodule.utils.helper.ChatHelper
 import com.cooleshow.student.R
 import com.cooleshow.student.adapter.CourseTableListAdapter
 import com.cooleshow.student.bean.CourseTableDataBean
@@ -156,10 +157,10 @@ class CourseTableFragment :
             if (view.id == R.id.iv_go_chat) {
                 if (TextUtils.equals(data.courseType, CourseTableListAdapter.OTHER_COURSE)) {
                     //陪练课
-                    OpenChatHelper.goChat(context, data.imUserId, data.name)
+                    ChatHelper.getInstance().goChat(data.imUserId, data.name)
                 } else {
                     //琴房课或者直播课
-                    OpenChatHelper.goGroupChat(context, data.imGroupId, data.name)
+                    ChatHelper.getInstance().goGroupChat(data.imGroupId, data.name)
                 }
             }
         })

student/src/main/java/com/cooleshow/student/ui/web/HtmlActivity.java

@@ -65,6 +65,7 @@ import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.utils.helper.upload.UploadHelper;
 import com.cooleshow.base.widgets.DialogUtil;
 import com.cooleshow.chatmodule.constants.TCChatRouterPath;
+import com.cooleshow.chatmodule.utils.helper.ChatHelper;
 import com.cooleshow.student.App;
 import com.cooleshow.student.R;
 import com.cooleshow.student.api.APIService;
@@ -606,9 +607,9 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
             return;
         }
         if (TextUtils.equals(OpenChatHelper.SINGLE_CHAT, type)) {
-            OpenChatHelper.goChat(this, id, "");
+            ChatHelper.getInstance().goChat(id, "");
         } else {
-            OpenChatHelper.goGroupChat(this, id, "");
+            ChatHelper.getInstance().goGroupChat(id, "");
         }
     }
 

student/src/main/java/com/cooleshow/student/ui/work/HomeWorkDetailActivity.java

@@ -22,6 +22,7 @@ import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.widgets.VideoThumbnailView;
+import com.cooleshow.chatmodule.utils.helper.ChatHelper;
 import com.cooleshow.student.R;
 import com.cooleshow.student.adapter.PracticeVideoWorkAdapter;
 import com.cooleshow.student.bean.HomeworkDetailBean;
@@ -386,10 +387,10 @@ public class HomeWorkDetailActivity extends BaseMVPActivity<ActivityHomeworkDeta
             }
             if (TextUtils.equals(mInfoBean.courseType, CourseConstants.OTHER_COURSE)) {
                 //陪练课
-                OpenChatHelper.goChat(HomeWorkDetailActivity.this, mInfoBean.imUserId, mInfoBean.teacherName);
+                ChatHelper.getInstance().goChat(mInfoBean.imUserId, mInfoBean.teacherName);
             } else {
                 //琴房课或者直播课
-                OpenChatHelper.goGroupChat(HomeWorkDetailActivity.this, mInfoBean.imGroupId, "");
+                ChatHelper.getInstance().goGroupChat(mInfoBean.imGroupId, "");
             }
         }
     }

student/src/main/java/com/cooleshow/student/ui/work/HomeWorkFragment.java

@@ -24,6 +24,7 @@ import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.fragment.BaseMVPFragment;
 import com.cooleshow.base.utils.TimeUtils;
 
+import com.cooleshow.chatmodule.utils.helper.ChatHelper;
 import com.cooleshow.student.R;
 import com.cooleshow.student.adapter.HomeworkAdapter;
 import com.cooleshow.student.bean.HomeworkListBean;
@@ -113,10 +114,10 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
                 if (view.getId() == R.id.iv_go_chat) {
                     if (TextUtils.equals(rowsBean.type, CourseConstants.OTHER_COURSE)) {
                         //陪练课
-                        OpenChatHelper.goChat(getContext(), rowsBean.imUserId, rowsBean.teacherName);
+                        ChatHelper.getInstance().goChat(rowsBean.imUserId, rowsBean.teacherName);
                     } else {
                         //琴房课或者直播课
-                        OpenChatHelper.goGroupChat(getContext(), rowsBean.imGroupId, "");
+                        ChatHelper.getInstance().goGroupChat(rowsBean.imGroupId, "");
                     }
                 }
             }

teacher/src/main/java/com/cooleshow/teacher/helper/ShareHelper.java

@@ -90,41 +90,6 @@ public class ShareHelper {
                 });
     }
 
-    public static void shareImgToChatGroup(String base64, String targetId, boolean isGroup, IMShareHelper.ResultCallBack resultCallBack) {
-        Observable.create(new ObservableOnSubscribe<String>() {
-            @Override
-            public void subscribe(ObservableEmitter<String> emitter) throws Exception {
-                File file = saveImgToLocalFile(base64);
-                IMShareHelper.toShare(file, targetId, isGroup, resultCallBack);
-                emitter.onNext("");
-            }
-        }).subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<String>() {
-                    @Override
-                    public void onSubscribe(Disposable d) {
-
-                    }
-
-                    @Override
-                    public void onNext(String s) {
-                    }
-
-                    @Override
-                    public void onError(Throwable e) {
-                        e.printStackTrace();
-                        if (resultCallBack != null) {
-                            resultCallBack.onResult(false);
-                        }
-                    }
-
-                    @Override
-                    public void onComplete() {
-
-                    }
-                });
-    }
-
     private static Message createImageMessage(String base64, Conversation conversation) {
         ImageMessage imageMessage = ImageMessage.obtain();
         imageMessage.setBase64(base64);
@@ -179,7 +144,7 @@ public class ShareHelper {
         String targetId = data.getStringExtra("targetId");
         int conversationValue = data.getIntExtra("conversation", -1);
         if (!TextUtils.isEmpty(base64)) {
-            shareImgToChatGroup(base64, targetId, ChatGroupHelper.isGroupConversation(conversationValue), new IMShareHelper.ResultCallBack() {
+            IMShareHelper.shareImgToChatGroup(base64, targetId, ChatGroupHelper.isGroupConversation(conversationValue), new IMShareHelper.ResultCallBack() {
                 @Override
                 public void onResult(boolean isSuccess) {
                     if (isSuccess) {
@@ -192,6 +157,10 @@ public class ShareHelper {
         }
     }
 
+    public static void shareImgToChatGroup(Bitmap targetBitmap, String targetId, boolean isGroup, IMShareHelper.ResultCallBack resultCallBack) {
+        IMShareHelper.shareImgToChatGroup(targetBitmap,targetId,isGroup,resultCallBack);
+    }
+
     public interface ResultCallBack {
         void onResult(boolean isSuccess);
     }

teacher/src/main/java/com/cooleshow/teacher/ui/course/PianoRoomCourseDetailActivity.java

@@ -15,6 +15,7 @@ import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.widgets.EmptyViewLayout;
+import com.cooleshow.chatmodule.utils.helper.ChatHelper;
 import com.cooleshow.teacher.CourseHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.PianoRoomCourseStudentListAdapter;
@@ -228,7 +229,7 @@ public class PianoRoomCourseDetailActivity extends BaseMVPActivity<ActivityPiano
         if (id == R.id.iv_go_chat) {
             //跳转聊天
             if (mInfoBean != null) {
-                OpenChatHelper.goGroupChat(PianoRoomCourseDetailActivity.this, mInfoBean.imGroupId, mInfoBean.courseGroupName);
+                ChatHelper.getInstance().goGroupChat(mInfoBean.imGroupId, mInfoBean.courseGroupName);
             }
         }
         if (v.getId() == R.id.tv_enter_room) {

teacher/src/main/java/com/cooleshow/teacher/ui/course/PianoRoomCourseFragment.java

@@ -25,6 +25,7 @@ import com.cooleshow.base.utils.TimeUtils;
 import com.cooleshow.base.widgets.EmptyViewLayout;
 import com.cooleshow.base.widgets.poplist.PopMenuBean;
 import com.cooleshow.base.widgets.poplist.PopupListWindow;
+import com.cooleshow.chatmodule.utils.helper.ChatHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.CourseStatusFilterAdapter;
 import com.cooleshow.teacher.adapter.PianoRoomCourseListAdapter;
@@ -163,7 +164,7 @@ public class PianoRoomCourseFragment extends BaseMVPFragment<FragmentPianoRoomCo
                     if (position < mAdapter.getData().size()) {
                         PianoRoomCourseListBean.RowsBean rowsBean = mAdapter.getData().get(position);
                         if (rowsBean != null) {
-                            OpenChatHelper.goGroupChat(getContext(), rowsBean.imGroupId, "");
+                            ChatHelper.getInstance().goGroupChat(rowsBean.imGroupId, "");
                         }
                     }
                 }

teacher/src/main/java/com/cooleshow/teacher/ui/course/SparringCourseDetailActivity.java

@@ -14,6 +14,7 @@ import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.base.utils.helper.CourseStatusHelper;
 import com.cooleshow.base.widgets.VideoThumbnailView;
+import com.cooleshow.chatmodule.utils.helper.ChatHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.bean.SparringCourseCommentBean;
 import com.cooleshow.teacher.bean.SparringCourseHomeworkBean;
@@ -323,7 +324,7 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
                 return;
             }
             if (mInfoBean != null) {
-                OpenChatHelper.goChat(SparringCourseDetailActivity.this, mInfoBean.imUserId, mInfoBean.studentName);
+                ChatHelper.getInstance().goChat(mInfoBean.imUserId, mInfoBean.studentName);
             }
         }
     }

teacher/src/main/java/com/cooleshow/teacher/ui/course/SparringCourseFragment.java

@@ -25,6 +25,7 @@ import com.cooleshow.base.utils.TimeUtils;
 import com.cooleshow.base.widgets.EmptyViewLayout;
 import com.cooleshow.base.widgets.poplist.PopMenuBean;
 import com.cooleshow.base.widgets.poplist.PopupListWindow;
+import com.cooleshow.chatmodule.utils.helper.ChatHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.CourseStatusFilterAdapter;
 import com.cooleshow.teacher.adapter.SparringCourseListAdapter;
@@ -157,7 +158,7 @@ public class SparringCourseFragment extends BaseMVPFragment<FragmentSparringCour
             public void onItemChildClick(@NonNull BaseQuickAdapter<?, ?> adapter, @NonNull View view, int position) {
                 if (position < mAdapter.getData().size()) {
                     SparringCourseListBean.RowsBean rowsBean = mAdapter.getData().get(position);
-                    OpenChatHelper.goChat(getContext(), rowsBean.imUserId, rowsBean.userName);
+                    ChatHelper.getInstance().goChat(rowsBean.imUserId, rowsBean.userName);
                 }
             }
         });

teacher/src/main/java/com/cooleshow/teacher/ui/live/TeacherLiveRoomActivity.java

@@ -40,6 +40,7 @@ import com.cooleshow.base.widgets.InputBar;
 import com.cooleshow.base.widgets.dialog.CommonConfirmDialog;
 import com.cooleshow.base.widgets.dialog.InputBarDialog;
 import com.cooleshow.chatmodule.constants.TCChatRouterPath;
+import com.cooleshow.chatmodule.utils.helper.ChatHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.LiveRoomMessageAdapter;
 import com.cooleshow.teacher.bean.LiveRoomInfoBean;
@@ -1568,7 +1569,7 @@ public class TeacherLiveRoomActivity extends BaseMVPActivity<ActivityTeacherLive
                 String targetId = data.getStringExtra("targetId");
                 int conversationValue = data.getIntExtra("conversation", -1);
                 if (mRoomInfoBean != null && !TextUtils.isEmpty(targetId) && conversationValue != -1) {
-                    OpenChatHelper.sendShareLiveMessage(targetId, conversationValue, mRoomInfoBean.roomUid
+                    ChatHelper.getInstance().sendShareLiveMessage(targetId, conversationValue, mRoomInfoBean.roomUid
                             , mRoomInfoBean.speakerPic,
                             mRoomInfoBean.speakerName, mRoomInfoBean.liveRemark);
                 }

teacher/src/main/java/com/cooleshow/teacher/ui/main/CourseTableFragment.kt

@@ -20,6 +20,7 @@ import com.cooleshow.base.ui.fragment.BaseMVPFragment
 import com.cooleshow.base.utils.SizeUtils
 import com.cooleshow.base.utils.TimeUtils
 import com.cooleshow.base.widgets.EmptyViewLayout
+import com.cooleshow.chatmodule.utils.helper.ChatHelper
 import com.cooleshow.teacher.CourseHelper
 import com.cooleshow.teacher.R
 import com.cooleshow.teacher.adapter.CourseTableListAdapter
@@ -119,10 +120,10 @@ class CourseTableFragment :
             if (view.id == R.id.iv_go_chat) {
                 if (TextUtils.equals(data.courseType, CourseTableListAdapter.OTHER_COURSE)) {
                     //陪练课
-                    OpenChatHelper.goChat(context, data.imUserId, data.name)
+                    ChatHelper.getInstance().goChat(data.imUserId, data.name)
                 } else {
                     //琴房课或者直播课
-                    OpenChatHelper.goGroupChat(context, data.imGroupId, data.name)
+                    ChatHelper.getInstance().goGroupChat(data.imGroupId, data.name)
                 }
             }
         }

teacher/src/main/java/com/cooleshow/teacher/ui/score/MineScoreActivity.java

@@ -26,6 +26,8 @@ import com.cooleshow.base.utils.helper.WebStartHelper;
 import com.cooleshow.base.widgets.poplist.PopMenuBean;
 import com.cooleshow.base.widgets.poplist.PopupListWindow;
 import com.cooleshow.chatmodule.constants.TCChatRouterPath;
+import com.cooleshow.chatmodule.utils.helper.ChatGroupHelper;
+import com.cooleshow.chatmodule.utils.helper.IMShareHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.MineLiveCoursePagerAdapter;
 import com.cooleshow.teacher.bean.MusicSheetShareBean;
@@ -89,18 +91,16 @@ public class MineScoreActivity extends BaseMVPActivity<ActivityMineScoreBinding,
 
     @Override
     public void onClick(View view) {
-        switch (view.getId()) {
-            case com.cooleshow.base.R.id.tv_right:
-                String teacherCertificationStatus = UserHelper.getTeacherCertificationStatus();
-                if (!TextUtils.equals(teacherCertificationStatus, TeacherInfoConstants.ENTRY_STATUS_PASS)) {
-                    ToastUtil.getInstance().show(this, "您还未通过达人认证");
-                    return;
-                }
-                presenter.musicSheetShare();
-                break;
-            case R.id.tv_upload_sheet_music:
-                WebStartHelper.startUploadSheetMusicPage();
-                break;
+        int id = view.getId();
+        if (id == com.cooleshow.base.R.id.tv_right) {
+            String teacherCertificationStatus = UserHelper.getTeacherCertificationStatus();
+            if (!TextUtils.equals(teacherCertificationStatus, TeacherInfoConstants.ENTRY_STATUS_PASS)) {
+                ToastUtil.getInstance().show(this, "您还未通过达人认证");
+                return;
+            }
+            presenter.musicSheetShare();
+        } else if (id == R.id.tv_upload_sheet_music) {
+            WebStartHelper.startUploadSheetMusicPage();
         }
 
     }
@@ -368,8 +368,7 @@ public class MineScoreActivity extends BaseMVPActivity<ActivityMineScoreBinding,
                 if (targetBitmap != null) {
                     String targetId = data.getStringExtra("targetId");
                     int conversationValue = data.getIntExtra("conversation", -1);
-                    Conversation.ConversationType conversationType = OpenChatHelper.getConversationType(conversationValue);
-                    ShareHelper.shareImgToChatGroup(targetBitmap, targetId, conversationType, new ShareHelper.ResultCallBack() {
+                    ShareHelper.shareImgToChatGroup(targetBitmap, targetId, ChatGroupHelper.isGroupConversation(conversationValue), new IMShareHelper.ResultCallBack() {
                         @Override
                         public void onResult(boolean isSuccess) {
                             if (isSuccess) {

teacher/src/main/java/com/cooleshow/teacher/ui/web/HtmlActivity.java

@@ -64,6 +64,7 @@ import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.utils.helper.upload.UploadHelper;
 import com.cooleshow.base.widgets.DialogUtil;
 import com.cooleshow.chatmodule.constants.TCChatRouterPath;
+import com.cooleshow.chatmodule.utils.helper.ChatHelper;
 import com.cooleshow.teacher.App;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.api.APIService;
@@ -606,9 +607,9 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
             return;
         }
         if (TextUtils.equals(OpenChatHelper.SINGLE_CHAT, type)) {
-            OpenChatHelper.goChat(this, id, "");
+            ChatHelper.getInstance().goChat(id, "");
         } else {
-            OpenChatHelper.goGroupChat(this, id, "");
+            ChatHelper.getInstance().goGroupChat(id, "");
         }
     }
 

teacher/src/main/java/com/cooleshow/teacher/ui/work/HomeWorkFragment.java

@@ -20,6 +20,7 @@ import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.fragment.BaseMVPFragment;
 import com.cooleshow.base.utils.TimeUtils;
+import com.cooleshow.chatmodule.utils.helper.ChatHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.HomeworkAdapter;
 import com.cooleshow.teacher.bean.HomeworkListBean;
@@ -114,10 +115,10 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
                 HomeworkListBean.RowsBean rowsBean = homeworkAdapter.getData().get(position);
                 if (TextUtils.equals(rowsBean.type, CourseConstants.OTHER_COURSE)) {
                     //陪练课
-                    OpenChatHelper.goChat(getContext(), rowsBean.imUserId, rowsBean.studentName);
+                    ChatHelper.getInstance().goChat(rowsBean.imUserId, rowsBean.studentName);
                 } else {
                     //琴房课或者直播课
-                    OpenChatHelper.goGroupChat(getContext(), rowsBean.imGroupId, "");
+                    ChatHelper.getInstance().goGroupChat(rowsBean.imGroupId, "");
                 }
             }
         });