Browse Source

删除融云模块修改老师端一些报错问题

Pq 1 year ago
parent
commit
e4fe9ad8ed
63 changed files with 2380 additions and 2502 deletions
  1. 1 1
      teacher/build.gradle
  2. 0 52
      teacher/src/main/java/com/cooleshow/teacher/App.java
  3. 1 1
      teacher/src/main/java/com/cooleshow/teacher/adapter/CoursewareListAdapter.java
  4. 422 422
      teacher/src/main/java/com/cooleshow/teacher/adapter/LiveRoomMessageAdapter.java
  5. 1 1
      teacher/src/main/java/com/cooleshow/teacher/api/APIService.java
  6. 1 1
      teacher/src/main/java/com/cooleshow/teacher/contract/CoursewareContract.java
  7. 141 141
      teacher/src/main/java/com/cooleshow/teacher/contract/LiveRoomContract.java
  8. 0 26
      teacher/src/main/java/com/cooleshow/teacher/helper/ShareHelper.java
  9. 1040 1040
      teacher/src/main/java/com/cooleshow/teacher/presenter/live/LiveRoomPresenter.java
  10. 15 8
      teacher/src/main/java/com/cooleshow/teacher/presenter/mine/CoursewareListPresenter.java
  11. 2 5
      teacher/src/main/java/com/cooleshow/teacher/presenter/minestyle/MineStylePagePresenter.java
  12. 2 2
      teacher/src/main/java/com/cooleshow/teacher/push/CustomMiMessageReceiver.java
  13. 2 2
      teacher/src/main/java/com/cooleshow/teacher/push/MyHWPushService.java
  14. 1 17
      teacher/src/main/java/com/cooleshow/teacher/push/SealNotificationReceiver.java
  15. 2 2
      teacher/src/main/java/com/cooleshow/teacher/push/VivoPushReceiver.java
  16. 10 13
      teacher/src/main/java/com/cooleshow/teacher/ui/course/MineLiveCourseActivity.java
  17. 2 2
      teacher/src/main/java/com/cooleshow/teacher/ui/course/MineVideoCourseActivity.java
  18. 0 2
      teacher/src/main/java/com/cooleshow/teacher/ui/course/PianoRoomCourseDetailActivity.java
  19. 0 1
      teacher/src/main/java/com/cooleshow/teacher/ui/course/PianoRoomCourseFragment.java
  20. 0 2
      teacher/src/main/java/com/cooleshow/teacher/ui/course/SparringCourseDetailActivity.java
  21. 0 1
      teacher/src/main/java/com/cooleshow/teacher/ui/course/SparringCourseFragment.java
  22. 0 1
      teacher/src/main/java/com/cooleshow/teacher/ui/homepage/MineStyleFragment.java
  23. 2 2
      teacher/src/main/java/com/cooleshow/teacher/ui/income/EarningStatisticsActivity.java
  24. 2 2
      teacher/src/main/java/com/cooleshow/teacher/ui/income/MineIncomeActivity.java
  25. 2 2
      teacher/src/main/java/com/cooleshow/teacher/ui/income/WithdrawalActivity.java
  26. 2 2
      teacher/src/main/java/com/cooleshow/teacher/ui/income/WithdrawalRecordActivity.java
  27. 2 2
      teacher/src/main/java/com/cooleshow/teacher/ui/income/WithdrawalSuccessActivity.java
  28. 1 1
      teacher/src/main/java/com/cooleshow/teacher/ui/live/CreateLiveActivity.java
  29. 179 179
      teacher/src/main/java/com/cooleshow/teacher/ui/live/LiveApplyMicFragment.java
  30. 164 164
      teacher/src/main/java/com/cooleshow/teacher/ui/live/LiveOnMicFragment.java
  31. 0 1
      teacher/src/main/java/com/cooleshow/teacher/ui/main/CourseTableFragment.kt
  32. 0 7
      teacher/src/main/java/com/cooleshow/teacher/ui/main/MainActivity.java
  33. 1 1
      teacher/src/main/java/com/cooleshow/teacher/ui/main/MallFragment.java
  34. 2 2
      teacher/src/main/java/com/cooleshow/teacher/ui/message/MessageBoxActivity.java
  35. 2 2
      teacher/src/main/java/com/cooleshow/teacher/ui/mine/CheckModifyPhoneNumActivity.java
  36. 1 1
      teacher/src/main/java/com/cooleshow/teacher/ui/mine/CoursewareListActivity.java
  37. 2 2
      teacher/src/main/java/com/cooleshow/teacher/ui/mine/EquipmentTestActivity.java
  38. 2 2
      teacher/src/main/java/com/cooleshow/teacher/ui/mine/FeedBackActivity.java
  39. 2 2
      teacher/src/main/java/com/cooleshow/teacher/ui/mine/InputBankVCodeActivity.java
  40. 2 2
      teacher/src/main/java/com/cooleshow/teacher/ui/mine/ModifyNickNameActivity.java
  41. 2 2
      teacher/src/main/java/com/cooleshow/teacher/ui/mine/ModifyPasswordActivity.java
  42. 2 2
      teacher/src/main/java/com/cooleshow/teacher/ui/mine/ModifyPhoneNumActivity.java
  43. 2 2
      teacher/src/main/java/com/cooleshow/teacher/ui/mine/MyBankCardActivity.java
  44. 2 2
      teacher/src/main/java/com/cooleshow/teacher/ui/mine/NetworkMonitoringActivity.java
  45. 2 2
      teacher/src/main/java/com/cooleshow/teacher/ui/mine/PayTestActivity.java
  46. 2 2
      teacher/src/main/java/com/cooleshow/teacher/ui/mine/PersonalCertificationActivity.java
  47. 3 5
      teacher/src/main/java/com/cooleshow/teacher/ui/mine/PersonalSettingActivity.java
  48. 2 2
      teacher/src/main/java/com/cooleshow/teacher/ui/mine/SettingActivity.java
  49. 0 1
      teacher/src/main/java/com/cooleshow/teacher/ui/mine/UnBindBankCardActivity.java
  50. 3 5
      teacher/src/main/java/com/cooleshow/teacher/ui/minestyle/MineStylePageActivity.java
  51. 2 2
      teacher/src/main/java/com/cooleshow/teacher/ui/minestyle/TeachableInstrumentActivity.java
  52. 2 4
      teacher/src/main/java/com/cooleshow/teacher/ui/score/MineScoreActivity.java
  53. 2 2
      teacher/src/main/java/com/cooleshow/teacher/ui/splash/GuideActivity.java
  54. 2 4
      teacher/src/main/java/com/cooleshow/teacher/ui/web/HtmlActivity.java
  55. 1 1
      teacher/src/main/java/com/cooleshow/teacher/ui/web/HtmlHorizontalScreenActivity.java
  56. 1 1
      teacher/src/main/java/com/cooleshow/teacher/ui/web/WebActivity.java
  57. 2 2
      teacher/src/main/java/com/cooleshow/teacher/ui/work/HomeWorkActivity.java
  58. 0 1
      teacher/src/main/java/com/cooleshow/teacher/ui/work/HomeWorkFragment.java
  59. 174 174
      teacher/src/main/java/com/cooleshow/teacher/widgets/dialog/LiveMicManagerDialog.java
  60. 0 2
      teacher/src/main/java/com/cooleshow/teacher/widgets/helper/JsInterfaceAccomPanyUtils.java
  61. 0 2
      teacher/src/main/java/com/cooleshow/teacher/widgets/helper/JsInterfaceUtils.java
  62. 152 152
      teacher/src/main/java/com/cooleshow/teacher/widgets/helper/VideoViewManager.java
  63. 11 11
      teacher/src/main/res/layout/view_live_room_main_layout.xml

+ 1 - 1
teacher/build.gradle

@@ -122,7 +122,7 @@ dependencies {
 //    implementation project(path: ':rong_im:kit')
 //    implementation project(path: ':rong_im:kit')
 //    implementation project(path: ':rong_im:live')
 //    implementation project(path: ':rong_im:live')
 //    implementation project(path: ':rong_im:common_im_ui')
 //    implementation project(path: ':rong_im:common_im_ui')
-    implementation project(path: ':live_teaching')
+//    implementation project(path: ':live_teaching')
     implementation project(path: ':metronome')
     implementation project(path: ':metronome')
     implementation project(path: ':musictuner')
     implementation project(path: ':musictuner')
     implementation project(path: ':ffmpegCmd')
     implementation project(path: ':ffmpegCmd')

+ 0 - 52
teacher/src/main/java/com/cooleshow/teacher/App.java

@@ -14,23 +14,6 @@ import com.cooleshow.base.utils.ProcessUtils;
 import com.cooleshow.base.utils.Utils;
 import com.cooleshow.base.utils.Utils;
 import com.cooleshow.base.widgets.CustomRefreshHeader;
 import com.cooleshow.base.widgets.CustomRefreshHeader;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.cooleshow.usercenter.helper.UserHelper;
-import com.daya.live_teaching.im.IMManager;
-import com.rong.io.live.message.RCChatJoinRoomMessage;
-import com.rong.io.live.message.RCChatModeMessage;
-import com.rong.io.live.message.RCChatRoomCloseMessage;
-import com.rong.io.live.message.RCChatRoomMemberNumMessage;
-import com.rong.io.live.message.RCChatroomLocationMessage;
-import com.rong.io.live.message.RCLiveRefuseAllMicApplyMessage;
-import com.rong.io.live.message.RCLiveUnderAllMicMessage;
-import com.rong.io.live.message.RCOnSnappingUpMessage;
-import com.rong.io.live.message.RCPauseLiveMessage;
-import com.rong.io.live.message.RCUserAddLikeMessage;
-import com.rong.io.live.message.RCUserLeaveRoomMessage;
-import com.rong.io.live.message.RCUserMicLeaveMessage;
-import com.rong.io.live.message.RCUserSeatApplyMessage;
-import com.rong.io.live.message.RCUserSeatResponseMessage;
-import com.rong.io.live.message.RCUserSeatsCtrlMessage;
-import com.rong.io.live.message.RCUserSyncAddLikeCountMessage;
 import com.scwang.smart.refresh.footer.ClassicsFooter;
 import com.scwang.smart.refresh.footer.ClassicsFooter;
 import com.scwang.smart.refresh.layout.SmartRefreshLayout;
 import com.scwang.smart.refresh.layout.SmartRefreshLayout;
 import com.scwang.smart.refresh.layout.api.RefreshFooter;
 import com.scwang.smart.refresh.layout.api.RefreshFooter;
@@ -39,7 +22,6 @@ import com.scwang.smart.refresh.layout.api.RefreshLayout;
 import com.scwang.smart.refresh.layout.listener.DefaultRefreshFooterCreator;
 import com.scwang.smart.refresh.layout.listener.DefaultRefreshFooterCreator;
 import com.scwang.smart.refresh.layout.listener.DefaultRefreshHeaderCreator;
 import com.scwang.smart.refresh.layout.listener.DefaultRefreshHeaderCreator;
 import com.tencent.bugly.crashreport.CrashReport;
 import com.tencent.bugly.crashreport.CrashReport;
-import com.rong.io.live.helper.LiveRTCEngineInitHelper;
 import com.tencent.tauth.Tencent;
 import com.tencent.tauth.Tencent;
 import com.umeng.commonsdk.UMConfigure;
 import com.umeng.commonsdk.UMConfigure;
 import com.umeng.socialize.PlatformConfig;
 import com.umeng.socialize.PlatformConfig;
@@ -58,10 +40,6 @@ import io.reactivex.rxjava3.core.ObservableOnSubscribe;
 import io.reactivex.rxjava3.core.Scheduler;
 import io.reactivex.rxjava3.core.Scheduler;
 import io.reactivex.rxjava3.functions.Consumer;
 import io.reactivex.rxjava3.functions.Consumer;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.schedulers.Schedulers;
-import io.rong.imkit.IMCenter;
-import io.rong.imlib.RongIMClient;
-import io.rong.push.RongPushClient;
-import io.rong.push.pushconfig.PushConfig;
 
 
 /**
 /**
  * Author by pq, Date on 2022/5/6.
  * Author by pq, Date on 2022/5/6.
@@ -131,36 +109,6 @@ public class App extends BaseApplication {
     }
     }
 
 
     private void initRong() {
     private void initRong() {
-        PushConfig config = new PushConfig.Builder()
-                .enableMiPush("2882303761520172302", "5102017284302")
-                .enableOppoPush("e2e0eff48d6145c0b9f87cd6a57636ad", "519726bf2dfc4a6c95a6e00d61e47f10")
-                .enableHWPush(true)
-                .enableVivoPush(true)
-                .build();
-        RongPushClient.setPushConfig(config);
-
-        if (BuildConfig.DEBUG) {
-            IMManager.init(this, "0vnjpoad0jbdz");
-        } else {
-            IMManager.init(this, "e5t4ouvpe42pa");
-        }
-        RongIMClient.registerMessageType(RCChatJoinRoomMessage.class);//加入直播房间消息
-        RongIMClient.registerMessageType(RCChatModeMessage.class);//直播间聊天模式控制消息
-        RongIMClient.registerMessageType(RCChatroomLocationMessage.class);//本地消息
-        RongIMClient.registerMessageType(RCUserMicLeaveMessage.class);//观众下麦发送消息
-        RongIMClient.registerMessageType(RCUserSeatApplyMessage.class);//申请连麦消息
-        RongIMClient.registerMessageType(RCUserSeatResponseMessage.class);//连麦回复消息
-        RongIMClient.registerMessageType(RCUserSeatsCtrlMessage.class);//连麦控制
-        RongIMClient.registerMessageType(RCUserSyncAddLikeCountMessage.class);//连麦控制
-        RongIMClient.registerMessageType(RCChatRoomCloseMessage.class);//直播间关闭消息
-        RongIMClient.registerMessageType(RCOnSnappingUpMessage.class);//XXX正在抢购
-        RongIMClient.registerMessageType(RCUserAddLikeMessage.class);//点赞数量消息
-        RongIMClient.registerMessageType(RCChatRoomMemberNumMessage.class);//成员数量同步
-        RongIMClient.registerMessageType(RCPauseLiveMessage.class);//暂停直播消息
-        RongIMClient.registerMessageType(RCLiveUnderAllMicMessage.class);//全部下麦消息
-        RongIMClient.registerMessageType(RCLiveRefuseAllMicApplyMessage.class);//拒绝全部连麦申请消息
-        RongIMClient.registerMessageType(RCUserLeaveRoomMessage.class);//用户离开房间消息
-        LiveRTCEngineInitHelper.initRTC();
         EmojiManager.install(new IosEmojiProvider());
         EmojiManager.install(new IosEmojiProvider());
 
 
         /**
         /**

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/adapter/CoursewareListAdapter.java

@@ -9,7 +9,7 @@ import com.chad.library.adapter.base.module.BaseLoadMoreModule;
 import com.chad.library.adapter.base.module.LoadMoreModule;
 import com.chad.library.adapter.base.module.LoadMoreModule;
 import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.R;
-import com.daya.live_teaching.model.CoursewareListBean;
+import com.dayayuemeng.classroom.bean.CoursewareListBean;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;

+ 422 - 422
teacher/src/main/java/com/cooleshow/teacher/adapter/LiveRoomMessageAdapter.java

@@ -1,422 +1,422 @@
-package com.cooleshow.teacher.adapter;
-
-import android.content.Context;
-import android.text.SpannableString;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.cooleshow.base.utils.SizeUtils;
-import com.cooleshow.base.utils.UiUtils;
-import com.cooleshow.teacher.R;
-import com.cooleshow.usercenter.helper.UserHelper;
-import com.rong.io.live.LiveRoomMsgConstants;
-import com.rong.io.live.message.RCChatJoinRoomMessage;
-import com.rong.io.live.message.RCChatModeMessage;
-import com.rong.io.live.message.RCChatroomLocationMessage;
-import com.rong.io.live.message.RCOnSnappingUpMessage;
-import com.rong.io.live.message.RCUserAddLikeMessage;
-import com.rong.io.live.message.RCUserSeatApplyMessage;
-import com.rong.io.live.message.RCUserSeatResponseMessage;
-import com.rong.io.live.message.RCUserSeatsCtrlMessage;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import io.rong.imlib.model.Message;
-import io.rong.imlib.model.MessageContent;
-import io.rong.imlib.model.UserInfo;
-import io.rong.message.TextMessage;
-
-/**
- * Author by pq, Date on 2022/3/31.
- */
-public class LiveRoomMessageAdapter extends RecyclerView.Adapter {
-    private Context context;
-    private String roomAuthorId = "";
-    private ArrayList<Message> mMessageList;
-    public static final int MESSAGE_TYPE_TEXT = -1;//文本消息
-    public static final int MESSAGE_TYPE_JOIN_ROOM = -2;//加入直播间
-    public static final int MESSAGE_TYPE_LOCAL_MSG = -3;//本地消息
-    public static final int MESSAGE_TYPE_ADD_LIKE_MSG = -4;//点赞消息
-    public static final int MESSAGE_TYPE_SEAT_CTRL_MSG = -5;//连麦控制消息
-    public static final int MESSAGE_TYPE_CHAT_CTRL_MSG = -6;//聊天控制消息
-    public static final int MESSAGE_TYPE_SEAT_APPLY_MSG = -7;//观众连麦申请
-    public static final int MESSAGE_TYPE_SEAT_RESPONSE_MSG = -8;//连麦响应消息
-    public static final int MESSAGE_TYPE_ON_SNAP_UP_MSG = -9;//xxx正在抢购
-    public static final String[] MSG_TAGS = new String[]{LiveRoomMsgConstants.TAG_TXT, LiveRoomMsgConstants.TAG_CHAT_ROOM_ENTER
-            , LiveRoomMsgConstants.TAG_CHAT_ROOM_LOCAL_MSG, LiveRoomMsgConstants.TAG_CHAT_ROOM_ADD_LIKE, LiveRoomMsgConstants.TAG_CHAT_ROOM_SEAT_CTRL
-            , LiveRoomMsgConstants.TAG_CHAT_ROOM_CHAT_MODE_CTRL, LiveRoomMsgConstants.TAG_CHAT_ROOM_SEAT_APPLY,
-            LiveRoomMsgConstants.TAG_CHAT_ROOM_SEAT_RESPONSE, LiveRoomMsgConstants.TAG_LIVE_ON_SNAP_UP};
-    public List<String> msgTags;
-
-    public LiveRoomMessageAdapter(Context context) {
-        this.context = context;
-        mMessageList = new ArrayList();
-        msgTags = Arrays.asList(MSG_TAGS);
-
-    }
-
-    public int getMessageSize() {
-        return mMessageList == null ? 0 : mMessageList.size();
-    }
-
-    public void addMessage(Message message) {
-        if (message == null) {
-            return;
-        }
-        if (TextUtils.isEmpty(message.getObjectName())) {
-            return;
-        }
-        if (!msgTags.contains(message.getObjectName())) {
-            return;
-        }
-        if (message.getContent() instanceof RCUserSeatResponseMessage) {
-            RCUserSeatResponseMessage responseMessage = (RCUserSeatResponseMessage) message.getContent();
-            if (!TextUtils.equals(responseMessage.getAudienceId(), UserHelper.getImUserId())) {
-                return;
-            }
-        }
-        if (message.getContent() instanceof RCUserSeatApplyMessage) {
-            RCUserSeatApplyMessage applyMessage = (RCUserSeatApplyMessage) message.getContent();
-            if (!TextUtils.equals(applyMessage.getAudienceId(), UserHelper.getImUserId())) {
-                return;
-            }
-        }
-        mMessageList.add(message);
-        notifyDataSetChanged();
-    }
-
-    public void setRoomAuthorId(String roomAuthorId) {
-        this.roomAuthorId = roomAuthorId;
-    }
-
-    @NonNull
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        switch (viewType) {
-            case MESSAGE_TYPE_TEXT:
-            case MESSAGE_TYPE_LOCAL_MSG:
-                View view = LayoutInflater.from(context).inflate(R.layout.item_live_room_message_text, parent, false);
-                return new TextMessageHolder(view);
-            case MESSAGE_TYPE_ON_SNAP_UP_MSG:
-            case MESSAGE_TYPE_ADD_LIKE_MSG:
-            case MESSAGE_TYPE_JOIN_ROOM:
-                View joinView = LayoutInflater.from(context).inflate(R.layout.item_live_room_join_message_text, parent, false);
-                return new JoinRoomMessageHolder(joinView);
-            case MESSAGE_TYPE_SEAT_APPLY_MSG:
-            case MESSAGE_TYPE_SEAT_RESPONSE_MSG:
-            case MESSAGE_TYPE_CHAT_CTRL_MSG:
-            case MESSAGE_TYPE_SEAT_CTRL_MSG:
-                View modechangeView = LayoutInflater.from(context).inflate(R.layout.item_live_room_message_mode_change, parent, false);
-                return new ModeChangeMessageHolder(modechangeView);
-        }
-        return null;
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-        Message message = mMessageList.get(position);
-        String nickNameShow = "用户" + message != null ? message.getSenderUserId() : "";
-        switch (getItemViewType(position)) {
-            case MESSAGE_TYPE_LOCAL_MSG:
-                TextMessageHolder localMsgHolder = (TextMessageHolder) holder;
-                RCChatroomLocationMessage localMsgContent = (RCChatroomLocationMessage) message.getContent();
-                localMsgHolder.mTvText.setText(localMsgContent.getContent());
-                localMsgHolder.mTvText.setTextColor(context.getResources().getColor(com.cooleshow.base.R.color.color_00d6c9));
-                break;
-            case MESSAGE_TYPE_TEXT:
-                TextMessageHolder textMessageHolder = (TextMessageHolder) holder;
-                TextMessage content = (TextMessage) message.getContent();
-                Log.i("pq", "textMessage:" + content.toString());
-                //昵称
-                String authorName = "用户" + message.getUId();
-                SpannableString spannableString;
-                if (content.getUserInfo() != null) {
-                    UserInfo userInfo = content.getUserInfo();
-                    if (!TextUtils.isEmpty(userInfo.getName())) {
-                        authorName = content.getUserInfo().getName();
-                    }
-                    if (TextUtils.equals(message.getSenderUserId(), roomAuthorId)) {
-                        //房间主讲人
-                        spannableString = getRoomAuthorTextStyleSpan(context.getString(R.string.live_msg_text_nickname, authorName), content.getContent());
-                    } else {
-                        //其他
-                        spannableString = getNormalTextStyleSpan(context.getString(R.string.live_msg_text_nickname, authorName), content.getContent());
-                    }
-                } else {
-                    spannableString = getNormalTextStyleSpan(context.getString(R.string.live_msg_text_nickname, authorName), content.getContent());
-                }
-                textMessageHolder.mTvText.setText(spannableString);
-                break;
-
-            case MESSAGE_TYPE_JOIN_ROOM:
-                JoinRoomMessageHolder joinRoomMessageHolder = (JoinRoomMessageHolder) holder;
-                Message joinMessage = mMessageList.get(position);
-                RCChatJoinRoomMessage content1 = (RCChatJoinRoomMessage) joinMessage.getContent();
-                String name = "用户" + joinMessage.getSenderUserId();
-                if (content1.getUserInfo() != null && !TextUtils.isEmpty(content1.getUserInfo().getName())) {
-                    name = content1.getUserInfo().getName();
-                }
-                joinRoomMessageHolder.mTvText.setText(getNormalTextStyleSpan(name, "进入直播间"));
-                break;
-            case MESSAGE_TYPE_ADD_LIKE_MSG:
-                JoinRoomMessageHolder addLikeMessageHolder = (JoinRoomMessageHolder) holder;
-                Message addLikeMessage = mMessageList.get(position);
-                RCUserAddLikeMessage addLikeContent = (RCUserAddLikeMessage) addLikeMessage.getContent();
-                String nick = "用户" + addLikeMessage.getSenderUserId();
-                if (addLikeContent.getUserInfo() != null && !TextUtils.isEmpty(addLikeContent.getUserInfo().getName())) {
-                    nick = addLikeContent.getUserInfo().getName();
-                }
-                int counts = addLikeContent.getCounts();
-                addLikeMessageHolder.mTvText.setText(getNormalTextStyleSpan(nick, context.getString(R.string.live_room_add_like_count_text_str, counts)));
-                break;
-            case MESSAGE_TYPE_SEAT_CTRL_MSG:
-                //连麦控制
-                ModeChangeMessageHolder seatModeChangeHolder = (ModeChangeMessageHolder) holder;
-                Message modeChangeMsg = mMessageList.get(position);
-                RCUserSeatsCtrlMessage ctrlContent = (RCUserSeatsCtrlMessage) modeChangeMsg.getContent();
-                String nickName = "用户" + modeChangeMsg != null ? modeChangeMsg.getSenderUserId() : "";
-                if (!TextUtils.isEmpty(ctrlContent.getUserName())) {
-                    nickName = ctrlContent.getUserName();
-                }
-                boolean isEnableSeat = ctrlContent.isSeatBan();
-                String afterContent = isEnableSeat ? "关闭连麦" : "开启连麦";
-                seatModeChangeHolder.mIvIcon.setVisibility(View.VISIBLE);
-                seatModeChangeHolder.mTvText.setText(getNormalTextStyleSpan(nickName, afterContent));
-                break;
-            case MESSAGE_TYPE_CHAT_CTRL_MSG:
-                //聊天控制
-                ModeChangeMessageHolder chatModeChangeHolder = (ModeChangeMessageHolder) holder;
-                Message chatModeChangeMsg = mMessageList.get(position);
-                RCChatModeMessage chatModeContent = (RCChatModeMessage) chatModeChangeMsg.getContent();
-                String nickName2 = "用户" + chatModeChangeMsg != null ? chatModeChangeMsg.getSenderUserId() : "";
-                if (!TextUtils.isEmpty(chatModeContent.getUserName())) {
-                    nickName2 = chatModeContent.getUserName();
-                }
-                boolean isEnableChat = chatModeContent.isChatBan();
-                String afterContent2 = isEnableChat ? "关闭聊天" : "开启聊天";
-                chatModeChangeHolder.mIvIcon.setVisibility(View.VISIBLE);
-                chatModeChangeHolder.mTvText.setText(getNormalTextStyleSpan(nickName2, afterContent2));
-                break;
-            case MESSAGE_TYPE_SEAT_APPLY_MSG:
-                ModeChangeMessageHolder seatApplyMsgHolder = (ModeChangeMessageHolder) holder;
-                RCUserSeatApplyMessage content2 = (RCUserSeatApplyMessage) message.getContent();
-                int type = content2.getType();
-                if (type == LiveRoomMsgConstants.MIC_ACTION_SEAT_BY_USER
-                        || type == LiveRoomMsgConstants.MIC_ACTION_CANCEL_SEAT_BY_USER) {
-                    seatApplyMsgHolder.mIvIcon.setVisibility(View.GONE);
-                    seatApplyMsgHolder.mTvText.setPadding(SizeUtils.dp2px(10), 0, SizeUtils.dp2px(10), 0);
-                    if (!TextUtils.isEmpty(content2.getAudienceName())) {
-                        nickNameShow = content2.getAudienceName();
-                    }
-                } else {
-                    seatApplyMsgHolder.mIvIcon.setVisibility(View.VISIBLE);
-                    seatApplyMsgHolder.mTvText.setPadding(SizeUtils.dp2px(5), 0, SizeUtils.dp2px(10), 0);
-                    if (!TextUtils.isEmpty(content2.getTeacherName())) {
-                        nickNameShow = content2.getTeacherName();
-                    }
-                }
-                String contentText = "";
-                if (type == LiveRoomMsgConstants.MIC_ACTION_SEAT_BY_USER) {
-                    //观众发起连麦申请
-                    contentText = "发起了连麦申请";
-                }
-                if (type == LiveRoomMsgConstants.MIC_ACTION_CANCEL_SEAT_BY_USER) {
-                    //观众取消连麦申请
-                    contentText = "取消了连麦申请";
-                }
-
-                if (type == LiveRoomMsgConstants.MIC_ACTION_CANCEL_SEAT_BY_CREATE) {
-                    //主讲人将观众抱下麦
-                    contentText = "将你抱下麦";
-                }
-
-                if (type == LiveRoomMsgConstants.MIC_ACTION_INVITE_SEAT_BY_CREATE) {
-                    //主讲人发起了连麦邀请
-                    contentText = "发起了连麦邀请";
-                }
-                if (type == LiveRoomMsgConstants.MIC_ACTION_CANCEL_INVITE_SEAT_BY_CREATE) {
-                    //主讲人取消了连麦邀请
-                    contentText = "取消了连麦邀请";
-                }
-                seatApplyMsgHolder.mTvText.setText(getNormalTextStyleSpan(nickNameShow, contentText));
-                break;
-            case MESSAGE_TYPE_SEAT_RESPONSE_MSG:
-                ModeChangeMessageHolder seatResponseMsgHolder = (ModeChangeMessageHolder) holder;
-                RCUserSeatResponseMessage responseContent = (RCUserSeatResponseMessage) message.getContent();
-                int responseType = responseContent.getType();
-                if (responseType == LiveRoomMsgConstants.MIC_RESPONSE_AGREE_BY_USER
-                        || responseType == LiveRoomMsgConstants.MIC_RESPONSE_DISAGREE_BY_USER) {
-                    seatResponseMsgHolder.mIvIcon.setVisibility(View.GONE);
-                    seatResponseMsgHolder.mTvText.setPadding(SizeUtils.dp2px(10), 0, SizeUtils.dp2px(10), 0);
-                    if (!TextUtils.isEmpty(responseContent.getAudienceName())) {
-                        nickNameShow = responseContent.getAudienceName();
-                    }
-                } else {
-                    seatResponseMsgHolder.mIvIcon.setVisibility(View.VISIBLE);
-                    seatResponseMsgHolder.mTvText.setPadding(SizeUtils.dp2px(5), 0, SizeUtils.dp2px(10), 0);
-                    if (!TextUtils.isEmpty(responseContent.getTeacherName())) {
-                        nickNameShow = responseContent.getTeacherName();
-                    }
-                }
-                String responseContentText = "";
-                if (responseType == LiveRoomMsgConstants.MIC_RESPONSE_AGREE) {
-                    //主讲人同意观众上麦申请
-                    responseContentText = "同意了连麦申请";
-                }
-                if (responseType == LiveRoomMsgConstants.MIC_RESPONSE_DISAGREE) {
-                    //主讲人不同意观众上麦申请
-                    responseContentText = "取消了连麦申请";
-                }
-                if (responseType == LiveRoomMsgConstants.MIC_RESPONSE_AGREE_BY_USER) {
-                    //观众同意了连麦邀请
-                    responseContentText = "同意了连麦邀请";
-                }
-                if (responseType == LiveRoomMsgConstants.MIC_RESPONSE_DISAGREE_BY_USER) {
-                    //观众取消了连麦邀请
-                    responseContentText = "取消了连麦邀请";
-                }
-                seatResponseMsgHolder.mTvText.setText(getNormalTextStyleSpan(nickNameShow, responseContentText));
-                break;
-            case MESSAGE_TYPE_ON_SNAP_UP_MSG:
-                JoinRoomMessageHolder onSnapUpHolder = (JoinRoomMessageHolder) holder;
-                Message onSnapUpMessage = mMessageList.get(position);
-                RCOnSnappingUpMessage onSnapUpContent = (RCOnSnappingUpMessage) onSnapUpMessage.getContent();
-                String lastName = getNickName(onSnapUpMessage, onSnapUpContent != null ? onSnapUpContent.getUserName() : "");
-                onSnapUpHolder.mTvText.setText(getNormalTextStyleSpan(lastName, " 正在抢购"));
-                break;
-
-        }
-    }
-
-    private void setDefaultInfo(Message message) {
-
-    }
-
-    private String getNickName(Message message, String defaultName) {
-        if (!TextUtils.isEmpty(defaultName)) {
-            return defaultName;
-        }
-        return getNickName(message);
-    }
-
-    private String getNickName(Message message) {
-        //昵称
-        String name = "用户" + message.getSenderUserId();
-        MessageContent content = message.getContent();
-        if (content.getUserInfo() != null && !TextUtils.isEmpty(content.getUserInfo().getName())) {
-            name = content.getUserInfo().getName();
-        }
-        return name;
-    }
-
-    @Override
-    public int getItemCount() {
-        return mMessageList != null ? mMessageList.size() : 0;
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        Message message = mMessageList.get(position);
-        String objectName = message.getObjectName();
-        if (TextUtils.equals(objectName, LiveRoomMsgConstants.TAG_TXT)) {
-            //文本消息
-            return MESSAGE_TYPE_TEXT;
-        }
-        if (TextUtils.equals(objectName, LiveRoomMsgConstants.TAG_CHAT_ROOM_ENTER)) {
-            //进入房间消息
-            return MESSAGE_TYPE_JOIN_ROOM;
-        }
-
-        if (TextUtils.equals(objectName, LiveRoomMsgConstants.TAG_CHAT_ROOM_LOCAL_MSG)) {
-            //本地消息
-            return MESSAGE_TYPE_LOCAL_MSG;
-        }
-
-        if (TextUtils.equals(objectName, LiveRoomMsgConstants.TAG_CHAT_ROOM_ADD_LIKE)) {
-            //点赞消息
-            return MESSAGE_TYPE_ADD_LIKE_MSG;
-        }
-
-        if (TextUtils.equals(objectName, LiveRoomMsgConstants.TAG_CHAT_ROOM_SEAT_CTRL)) {
-            //连麦控制
-            return MESSAGE_TYPE_SEAT_CTRL_MSG;
-        }
-
-        if (TextUtils.equals(objectName, LiveRoomMsgConstants.TAG_CHAT_ROOM_CHAT_MODE_CTRL)) {
-            //聊天控制
-            return MESSAGE_TYPE_CHAT_CTRL_MSG;
-        }
-
-        if (TextUtils.equals(objectName, LiveRoomMsgConstants.TAG_CHAT_ROOM_SEAT_APPLY)) {
-            //连麦相关
-            return MESSAGE_TYPE_SEAT_APPLY_MSG;
-        }
-        if (TextUtils.equals(objectName, LiveRoomMsgConstants.TAG_CHAT_ROOM_SEAT_RESPONSE)) {
-            //连麦响应相关
-            return MESSAGE_TYPE_SEAT_RESPONSE_MSG;
-        }
-
-        if (TextUtils.equals(objectName, LiveRoomMsgConstants.TAG_LIVE_ON_SNAP_UP)) {
-            //正在抢购
-            return MESSAGE_TYPE_ON_SNAP_UP_MSG;
-        }
-        return super.getItemViewType(position);
-    }
-
-
-    private static class TextMessageHolder extends RecyclerView.ViewHolder {
-
-        private final TextView mTvText;
-
-        public TextMessageHolder(@NonNull View itemView) {
-            super(itemView);
-            mTvText = itemView.findViewById(R.id.tv_text);
-        }
-    }
-
-    private static class ModeChangeMessageHolder extends RecyclerView.ViewHolder {
-
-        private final TextView mTvText;
-        private final ImageView mIvIcon;
-
-        public ModeChangeMessageHolder(@NonNull View itemView) {
-            super(itemView);
-            mTvText = itemView.findViewById(R.id.tv_text);
-            mIvIcon = itemView.findViewById(R.id.iv_icon);
-        }
-    }
-
-    private static class JoinRoomMessageHolder extends RecyclerView.ViewHolder {
-
-        private final TextView mTvText;
-
-        public JoinRoomMessageHolder(@NonNull View itemView) {
-            super(itemView);
-            mTvText = itemView.findViewById(R.id.tv_text);
-        }
-    }
-
-    private SpannableString getNormalTextStyleSpan(String startStr, String contentText) {
-        return UiUtils.diffColorString(startStr
-                , contentText
-                , context.getResources().getColor(com.cooleshow.base.R.color.color_00d6c9)
-                , context.getResources().getColor(R.color.white));
-    }
-
-    private SpannableString getRoomAuthorTextStyleSpan(String nickName, String contentText) {
-        return UiUtils.diffColorString(nickName
-                , contentText
-                , context.getResources().getColor(com.cooleshow.base.R.color.color_00d6c9)
-                , context.getResources().getColor(R.color.white)
-                , context.getResources().getDrawable(R.drawable.icon_live_msg_room_author));
-    }
-}
+//package com.cooleshow.teacher.adapter;
+//
+//import android.content.Context;
+//import android.text.SpannableString;
+//import android.text.TextUtils;
+//import android.util.Log;
+//import android.view.LayoutInflater;
+//import android.view.View;
+//import android.view.ViewGroup;
+//import android.widget.ImageView;
+//import android.widget.TextView;
+//
+//import com.cooleshow.base.utils.SizeUtils;
+//import com.cooleshow.base.utils.UiUtils;
+//import com.cooleshow.teacher.R;
+//import com.cooleshow.usercenter.helper.UserHelper;
+//import com.rong.io.live.LiveRoomMsgConstants;
+//import com.rong.io.live.message.RCChatJoinRoomMessage;
+//import com.rong.io.live.message.RCChatModeMessage;
+//import com.rong.io.live.message.RCChatroomLocationMessage;
+//import com.rong.io.live.message.RCOnSnappingUpMessage;
+//import com.rong.io.live.message.RCUserAddLikeMessage;
+//import com.rong.io.live.message.RCUserSeatApplyMessage;
+//import com.rong.io.live.message.RCUserSeatResponseMessage;
+//import com.rong.io.live.message.RCUserSeatsCtrlMessage;
+//
+//import java.util.ArrayList;
+//import java.util.Arrays;
+//import java.util.List;
+//
+//import androidx.annotation.NonNull;
+//import androidx.recyclerview.widget.RecyclerView;
+//import io.rong.imlib.model.Message;
+//import io.rong.imlib.model.MessageContent;
+//import io.rong.imlib.model.UserInfo;
+//import io.rong.message.TextMessage;
+//
+///**
+// * Author by pq, Date on 2022/3/31.
+// */
+//public class LiveRoomMessageAdapter extends RecyclerView.Adapter {
+//    private Context context;
+//    private String roomAuthorId = "";
+//    private ArrayList<Message> mMessageList;
+//    public static final int MESSAGE_TYPE_TEXT = -1;//文本消息
+//    public static final int MESSAGE_TYPE_JOIN_ROOM = -2;//加入直播间
+//    public static final int MESSAGE_TYPE_LOCAL_MSG = -3;//本地消息
+//    public static final int MESSAGE_TYPE_ADD_LIKE_MSG = -4;//点赞消息
+//    public static final int MESSAGE_TYPE_SEAT_CTRL_MSG = -5;//连麦控制消息
+//    public static final int MESSAGE_TYPE_CHAT_CTRL_MSG = -6;//聊天控制消息
+//    public static final int MESSAGE_TYPE_SEAT_APPLY_MSG = -7;//观众连麦申请
+//    public static final int MESSAGE_TYPE_SEAT_RESPONSE_MSG = -8;//连麦响应消息
+//    public static final int MESSAGE_TYPE_ON_SNAP_UP_MSG = -9;//xxx正在抢购
+//    public static final String[] MSG_TAGS = new String[]{LiveRoomMsgConstants.TAG_TXT, LiveRoomMsgConstants.TAG_CHAT_ROOM_ENTER
+//            , LiveRoomMsgConstants.TAG_CHAT_ROOM_LOCAL_MSG, LiveRoomMsgConstants.TAG_CHAT_ROOM_ADD_LIKE, LiveRoomMsgConstants.TAG_CHAT_ROOM_SEAT_CTRL
+//            , LiveRoomMsgConstants.TAG_CHAT_ROOM_CHAT_MODE_CTRL, LiveRoomMsgConstants.TAG_CHAT_ROOM_SEAT_APPLY,
+//            LiveRoomMsgConstants.TAG_CHAT_ROOM_SEAT_RESPONSE, LiveRoomMsgConstants.TAG_LIVE_ON_SNAP_UP};
+//    public List<String> msgTags;
+//
+//    public LiveRoomMessageAdapter(Context context) {
+//        this.context = context;
+//        mMessageList = new ArrayList();
+//        msgTags = Arrays.asList(MSG_TAGS);
+//
+//    }
+//
+//    public int getMessageSize() {
+//        return mMessageList == null ? 0 : mMessageList.size();
+//    }
+//
+//    public void addMessage(Message message) {
+//        if (message == null) {
+//            return;
+//        }
+//        if (TextUtils.isEmpty(message.getObjectName())) {
+//            return;
+//        }
+//        if (!msgTags.contains(message.getObjectName())) {
+//            return;
+//        }
+//        if (message.getContent() instanceof RCUserSeatResponseMessage) {
+//            RCUserSeatResponseMessage responseMessage = (RCUserSeatResponseMessage) message.getContent();
+//            if (!TextUtils.equals(responseMessage.getAudienceId(), UserHelper.getImUserId())) {
+//                return;
+//            }
+//        }
+//        if (message.getContent() instanceof RCUserSeatApplyMessage) {
+//            RCUserSeatApplyMessage applyMessage = (RCUserSeatApplyMessage) message.getContent();
+//            if (!TextUtils.equals(applyMessage.getAudienceId(), UserHelper.getImUserId())) {
+//                return;
+//            }
+//        }
+//        mMessageList.add(message);
+//        notifyDataSetChanged();
+//    }
+//
+//    public void setRoomAuthorId(String roomAuthorId) {
+//        this.roomAuthorId = roomAuthorId;
+//    }
+//
+//    @NonNull
+//    @Override
+//    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+//        switch (viewType) {
+//            case MESSAGE_TYPE_TEXT:
+//            case MESSAGE_TYPE_LOCAL_MSG:
+//                View view = LayoutInflater.from(context).inflate(R.layout.item_live_room_message_text, parent, false);
+//                return new TextMessageHolder(view);
+//            case MESSAGE_TYPE_ON_SNAP_UP_MSG:
+//            case MESSAGE_TYPE_ADD_LIKE_MSG:
+//            case MESSAGE_TYPE_JOIN_ROOM:
+//                View joinView = LayoutInflater.from(context).inflate(R.layout.item_live_room_join_message_text, parent, false);
+//                return new JoinRoomMessageHolder(joinView);
+//            case MESSAGE_TYPE_SEAT_APPLY_MSG:
+//            case MESSAGE_TYPE_SEAT_RESPONSE_MSG:
+//            case MESSAGE_TYPE_CHAT_CTRL_MSG:
+//            case MESSAGE_TYPE_SEAT_CTRL_MSG:
+//                View modechangeView = LayoutInflater.from(context).inflate(R.layout.item_live_room_message_mode_change, parent, false);
+//                return new ModeChangeMessageHolder(modechangeView);
+//        }
+//        return null;
+//    }
+//
+//    @Override
+//    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+//        Message message = mMessageList.get(position);
+//        String nickNameShow = "用户" + message != null ? message.getSenderUserId() : "";
+//        switch (getItemViewType(position)) {
+//            case MESSAGE_TYPE_LOCAL_MSG:
+//                TextMessageHolder localMsgHolder = (TextMessageHolder) holder;
+//                RCChatroomLocationMessage localMsgContent = (RCChatroomLocationMessage) message.getContent();
+//                localMsgHolder.mTvText.setText(localMsgContent.getContent());
+//                localMsgHolder.mTvText.setTextColor(context.getResources().getColor(com.cooleshow.base.R.color.color_00d6c9));
+//                break;
+//            case MESSAGE_TYPE_TEXT:
+//                TextMessageHolder textMessageHolder = (TextMessageHolder) holder;
+//                TextMessage content = (TextMessage) message.getContent();
+//                Log.i("pq", "textMessage:" + content.toString());
+//                //昵称
+//                String authorName = "用户" + message.getUId();
+//                SpannableString spannableString;
+//                if (content.getUserInfo() != null) {
+//                    UserInfo userInfo = content.getUserInfo();
+//                    if (!TextUtils.isEmpty(userInfo.getName())) {
+//                        authorName = content.getUserInfo().getName();
+//                    }
+//                    if (TextUtils.equals(message.getSenderUserId(), roomAuthorId)) {
+//                        //房间主讲人
+//                        spannableString = getRoomAuthorTextStyleSpan(context.getString(R.string.live_msg_text_nickname, authorName), content.getContent());
+//                    } else {
+//                        //其他
+//                        spannableString = getNormalTextStyleSpan(context.getString(R.string.live_msg_text_nickname, authorName), content.getContent());
+//                    }
+//                } else {
+//                    spannableString = getNormalTextStyleSpan(context.getString(R.string.live_msg_text_nickname, authorName), content.getContent());
+//                }
+//                textMessageHolder.mTvText.setText(spannableString);
+//                break;
+//
+//            case MESSAGE_TYPE_JOIN_ROOM:
+//                JoinRoomMessageHolder joinRoomMessageHolder = (JoinRoomMessageHolder) holder;
+//                Message joinMessage = mMessageList.get(position);
+//                RCChatJoinRoomMessage content1 = (RCChatJoinRoomMessage) joinMessage.getContent();
+//                String name = "用户" + joinMessage.getSenderUserId();
+//                if (content1.getUserInfo() != null && !TextUtils.isEmpty(content1.getUserInfo().getName())) {
+//                    name = content1.getUserInfo().getName();
+//                }
+//                joinRoomMessageHolder.mTvText.setText(getNormalTextStyleSpan(name, "进入直播间"));
+//                break;
+//            case MESSAGE_TYPE_ADD_LIKE_MSG:
+//                JoinRoomMessageHolder addLikeMessageHolder = (JoinRoomMessageHolder) holder;
+//                Message addLikeMessage = mMessageList.get(position);
+//                RCUserAddLikeMessage addLikeContent = (RCUserAddLikeMessage) addLikeMessage.getContent();
+//                String nick = "用户" + addLikeMessage.getSenderUserId();
+//                if (addLikeContent.getUserInfo() != null && !TextUtils.isEmpty(addLikeContent.getUserInfo().getName())) {
+//                    nick = addLikeContent.getUserInfo().getName();
+//                }
+//                int counts = addLikeContent.getCounts();
+//                addLikeMessageHolder.mTvText.setText(getNormalTextStyleSpan(nick, context.getString(R.string.live_room_add_like_count_text_str, counts)));
+//                break;
+//            case MESSAGE_TYPE_SEAT_CTRL_MSG:
+//                //连麦控制
+//                ModeChangeMessageHolder seatModeChangeHolder = (ModeChangeMessageHolder) holder;
+//                Message modeChangeMsg = mMessageList.get(position);
+//                RCUserSeatsCtrlMessage ctrlContent = (RCUserSeatsCtrlMessage) modeChangeMsg.getContent();
+//                String nickName = "用户" + modeChangeMsg != null ? modeChangeMsg.getSenderUserId() : "";
+//                if (!TextUtils.isEmpty(ctrlContent.getUserName())) {
+//                    nickName = ctrlContent.getUserName();
+//                }
+//                boolean isEnableSeat = ctrlContent.isSeatBan();
+//                String afterContent = isEnableSeat ? "关闭连麦" : "开启连麦";
+//                seatModeChangeHolder.mIvIcon.setVisibility(View.VISIBLE);
+//                seatModeChangeHolder.mTvText.setText(getNormalTextStyleSpan(nickName, afterContent));
+//                break;
+//            case MESSAGE_TYPE_CHAT_CTRL_MSG:
+//                //聊天控制
+//                ModeChangeMessageHolder chatModeChangeHolder = (ModeChangeMessageHolder) holder;
+//                Message chatModeChangeMsg = mMessageList.get(position);
+//                RCChatModeMessage chatModeContent = (RCChatModeMessage) chatModeChangeMsg.getContent();
+//                String nickName2 = "用户" + chatModeChangeMsg != null ? chatModeChangeMsg.getSenderUserId() : "";
+//                if (!TextUtils.isEmpty(chatModeContent.getUserName())) {
+//                    nickName2 = chatModeContent.getUserName();
+//                }
+//                boolean isEnableChat = chatModeContent.isChatBan();
+//                String afterContent2 = isEnableChat ? "关闭聊天" : "开启聊天";
+//                chatModeChangeHolder.mIvIcon.setVisibility(View.VISIBLE);
+//                chatModeChangeHolder.mTvText.setText(getNormalTextStyleSpan(nickName2, afterContent2));
+//                break;
+//            case MESSAGE_TYPE_SEAT_APPLY_MSG:
+//                ModeChangeMessageHolder seatApplyMsgHolder = (ModeChangeMessageHolder) holder;
+//                RCUserSeatApplyMessage content2 = (RCUserSeatApplyMessage) message.getContent();
+//                int type = content2.getType();
+//                if (type == LiveRoomMsgConstants.MIC_ACTION_SEAT_BY_USER
+//                        || type == LiveRoomMsgConstants.MIC_ACTION_CANCEL_SEAT_BY_USER) {
+//                    seatApplyMsgHolder.mIvIcon.setVisibility(View.GONE);
+//                    seatApplyMsgHolder.mTvText.setPadding(SizeUtils.dp2px(10), 0, SizeUtils.dp2px(10), 0);
+//                    if (!TextUtils.isEmpty(content2.getAudienceName())) {
+//                        nickNameShow = content2.getAudienceName();
+//                    }
+//                } else {
+//                    seatApplyMsgHolder.mIvIcon.setVisibility(View.VISIBLE);
+//                    seatApplyMsgHolder.mTvText.setPadding(SizeUtils.dp2px(5), 0, SizeUtils.dp2px(10), 0);
+//                    if (!TextUtils.isEmpty(content2.getTeacherName())) {
+//                        nickNameShow = content2.getTeacherName();
+//                    }
+//                }
+//                String contentText = "";
+//                if (type == LiveRoomMsgConstants.MIC_ACTION_SEAT_BY_USER) {
+//                    //观众发起连麦申请
+//                    contentText = "发起了连麦申请";
+//                }
+//                if (type == LiveRoomMsgConstants.MIC_ACTION_CANCEL_SEAT_BY_USER) {
+//                    //观众取消连麦申请
+//                    contentText = "取消了连麦申请";
+//                }
+//
+//                if (type == LiveRoomMsgConstants.MIC_ACTION_CANCEL_SEAT_BY_CREATE) {
+//                    //主讲人将观众抱下麦
+//                    contentText = "将你抱下麦";
+//                }
+//
+//                if (type == LiveRoomMsgConstants.MIC_ACTION_INVITE_SEAT_BY_CREATE) {
+//                    //主讲人发起了连麦邀请
+//                    contentText = "发起了连麦邀请";
+//                }
+//                if (type == LiveRoomMsgConstants.MIC_ACTION_CANCEL_INVITE_SEAT_BY_CREATE) {
+//                    //主讲人取消了连麦邀请
+//                    contentText = "取消了连麦邀请";
+//                }
+//                seatApplyMsgHolder.mTvText.setText(getNormalTextStyleSpan(nickNameShow, contentText));
+//                break;
+//            case MESSAGE_TYPE_SEAT_RESPONSE_MSG:
+//                ModeChangeMessageHolder seatResponseMsgHolder = (ModeChangeMessageHolder) holder;
+//                RCUserSeatResponseMessage responseContent = (RCUserSeatResponseMessage) message.getContent();
+//                int responseType = responseContent.getType();
+//                if (responseType == LiveRoomMsgConstants.MIC_RESPONSE_AGREE_BY_USER
+//                        || responseType == LiveRoomMsgConstants.MIC_RESPONSE_DISAGREE_BY_USER) {
+//                    seatResponseMsgHolder.mIvIcon.setVisibility(View.GONE);
+//                    seatResponseMsgHolder.mTvText.setPadding(SizeUtils.dp2px(10), 0, SizeUtils.dp2px(10), 0);
+//                    if (!TextUtils.isEmpty(responseContent.getAudienceName())) {
+//                        nickNameShow = responseContent.getAudienceName();
+//                    }
+//                } else {
+//                    seatResponseMsgHolder.mIvIcon.setVisibility(View.VISIBLE);
+//                    seatResponseMsgHolder.mTvText.setPadding(SizeUtils.dp2px(5), 0, SizeUtils.dp2px(10), 0);
+//                    if (!TextUtils.isEmpty(responseContent.getTeacherName())) {
+//                        nickNameShow = responseContent.getTeacherName();
+//                    }
+//                }
+//                String responseContentText = "";
+//                if (responseType == LiveRoomMsgConstants.MIC_RESPONSE_AGREE) {
+//                    //主讲人同意观众上麦申请
+//                    responseContentText = "同意了连麦申请";
+//                }
+//                if (responseType == LiveRoomMsgConstants.MIC_RESPONSE_DISAGREE) {
+//                    //主讲人不同意观众上麦申请
+//                    responseContentText = "取消了连麦申请";
+//                }
+//                if (responseType == LiveRoomMsgConstants.MIC_RESPONSE_AGREE_BY_USER) {
+//                    //观众同意了连麦邀请
+//                    responseContentText = "同意了连麦邀请";
+//                }
+//                if (responseType == LiveRoomMsgConstants.MIC_RESPONSE_DISAGREE_BY_USER) {
+//                    //观众取消了连麦邀请
+//                    responseContentText = "取消了连麦邀请";
+//                }
+//                seatResponseMsgHolder.mTvText.setText(getNormalTextStyleSpan(nickNameShow, responseContentText));
+//                break;
+//            case MESSAGE_TYPE_ON_SNAP_UP_MSG:
+//                JoinRoomMessageHolder onSnapUpHolder = (JoinRoomMessageHolder) holder;
+//                Message onSnapUpMessage = mMessageList.get(position);
+//                RCOnSnappingUpMessage onSnapUpContent = (RCOnSnappingUpMessage) onSnapUpMessage.getContent();
+//                String lastName = getNickName(onSnapUpMessage, onSnapUpContent != null ? onSnapUpContent.getUserName() : "");
+//                onSnapUpHolder.mTvText.setText(getNormalTextStyleSpan(lastName, " 正在抢购"));
+//                break;
+//
+//        }
+//    }
+//
+//    private void setDefaultInfo(Message message) {
+//
+//    }
+//
+//    private String getNickName(Message message, String defaultName) {
+//        if (!TextUtils.isEmpty(defaultName)) {
+//            return defaultName;
+//        }
+//        return getNickName(message);
+//    }
+//
+//    private String getNickName(Message message) {
+//        //昵称
+//        String name = "用户" + message.getSenderUserId();
+//        MessageContent content = message.getContent();
+//        if (content.getUserInfo() != null && !TextUtils.isEmpty(content.getUserInfo().getName())) {
+//            name = content.getUserInfo().getName();
+//        }
+//        return name;
+//    }
+//
+//    @Override
+//    public int getItemCount() {
+//        return mMessageList != null ? mMessageList.size() : 0;
+//    }
+//
+//    @Override
+//    public int getItemViewType(int position) {
+//        Message message = mMessageList.get(position);
+//        String objectName = message.getObjectName();
+//        if (TextUtils.equals(objectName, LiveRoomMsgConstants.TAG_TXT)) {
+//            //文本消息
+//            return MESSAGE_TYPE_TEXT;
+//        }
+//        if (TextUtils.equals(objectName, LiveRoomMsgConstants.TAG_CHAT_ROOM_ENTER)) {
+//            //进入房间消息
+//            return MESSAGE_TYPE_JOIN_ROOM;
+//        }
+//
+//        if (TextUtils.equals(objectName, LiveRoomMsgConstants.TAG_CHAT_ROOM_LOCAL_MSG)) {
+//            //本地消息
+//            return MESSAGE_TYPE_LOCAL_MSG;
+//        }
+//
+//        if (TextUtils.equals(objectName, LiveRoomMsgConstants.TAG_CHAT_ROOM_ADD_LIKE)) {
+//            //点赞消息
+//            return MESSAGE_TYPE_ADD_LIKE_MSG;
+//        }
+//
+//        if (TextUtils.equals(objectName, LiveRoomMsgConstants.TAG_CHAT_ROOM_SEAT_CTRL)) {
+//            //连麦控制
+//            return MESSAGE_TYPE_SEAT_CTRL_MSG;
+//        }
+//
+//        if (TextUtils.equals(objectName, LiveRoomMsgConstants.TAG_CHAT_ROOM_CHAT_MODE_CTRL)) {
+//            //聊天控制
+//            return MESSAGE_TYPE_CHAT_CTRL_MSG;
+//        }
+//
+//        if (TextUtils.equals(objectName, LiveRoomMsgConstants.TAG_CHAT_ROOM_SEAT_APPLY)) {
+//            //连麦相关
+//            return MESSAGE_TYPE_SEAT_APPLY_MSG;
+//        }
+//        if (TextUtils.equals(objectName, LiveRoomMsgConstants.TAG_CHAT_ROOM_SEAT_RESPONSE)) {
+//            //连麦响应相关
+//            return MESSAGE_TYPE_SEAT_RESPONSE_MSG;
+//        }
+//
+//        if (TextUtils.equals(objectName, LiveRoomMsgConstants.TAG_LIVE_ON_SNAP_UP)) {
+//            //正在抢购
+//            return MESSAGE_TYPE_ON_SNAP_UP_MSG;
+//        }
+//        return super.getItemViewType(position);
+//    }
+//
+//
+//    private static class TextMessageHolder extends RecyclerView.ViewHolder {
+//
+//        private final TextView mTvText;
+//
+//        public TextMessageHolder(@NonNull View itemView) {
+//            super(itemView);
+//            mTvText = itemView.findViewById(R.id.tv_text);
+//        }
+//    }
+//
+//    private static class ModeChangeMessageHolder extends RecyclerView.ViewHolder {
+//
+//        private final TextView mTvText;
+//        private final ImageView mIvIcon;
+//
+//        public ModeChangeMessageHolder(@NonNull View itemView) {
+//            super(itemView);
+//            mTvText = itemView.findViewById(R.id.tv_text);
+//            mIvIcon = itemView.findViewById(R.id.iv_icon);
+//        }
+//    }
+//
+//    private static class JoinRoomMessageHolder extends RecyclerView.ViewHolder {
+//
+//        private final TextView mTvText;
+//
+//        public JoinRoomMessageHolder(@NonNull View itemView) {
+//            super(itemView);
+//            mTvText = itemView.findViewById(R.id.tv_text);
+//        }
+//    }
+//
+//    private SpannableString getNormalTextStyleSpan(String startStr, String contentText) {
+//        return UiUtils.diffColorString(startStr
+//                , contentText
+//                , context.getResources().getColor(com.cooleshow.base.R.color.color_00d6c9)
+//                , context.getResources().getColor(R.color.white));
+//    }
+//
+//    private SpannableString getRoomAuthorTextStyleSpan(String nickName, String contentText) {
+//        return UiUtils.diffColorString(nickName
+//                , contentText
+//                , context.getResources().getColor(com.cooleshow.base.R.color.color_00d6c9)
+//                , context.getResources().getColor(R.color.white)
+//                , context.getResources().getDrawable(R.drawable.icon_live_msg_room_author));
+//    }
+//}

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/api/APIService.java

@@ -58,7 +58,7 @@ import com.cooleshow.teacher.bean.request.TeacherPracticeCourseEntry;
 import com.cooleshow.teacher.bean.request.UnBindCardEntry;
 import com.cooleshow.teacher.bean.request.UnBindCardEntry;
 import com.cooleshow.usercenter.bean.SetDetailBean;
 import com.cooleshow.usercenter.bean.SetDetailBean;
 import com.cooleshow.usercenter.bean.TeacherUserInfo;
 import com.cooleshow.usercenter.bean.TeacherUserInfo;
-import com.daya.live_teaching.model.CoursewareListBean;
+import com.dayayuemeng.classroom.bean.CoursewareListBean;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/contract/CoursewareContract.java

@@ -1,7 +1,7 @@
 package com.cooleshow.teacher.contract;
 package com.cooleshow.teacher.contract;
 
 
 import com.cooleshow.base.presenter.view.BaseView;
 import com.cooleshow.base.presenter.view.BaseView;
-import com.daya.live_teaching.model.CoursewareListBean;
+import com.dayayuemeng.classroom.bean.CoursewareListBean;
 
 
 /**
 /**
  * 创建日期:2022/5/18 14:11
  * 创建日期:2022/5/18 14:11

+ 141 - 141
teacher/src/main/java/com/cooleshow/teacher/contract/LiveRoomContract.java

@@ -1,141 +1,141 @@
-package com.cooleshow.teacher.contract;
-
-import android.view.View;
-
-import com.cooleshow.base.presenter.view.BaseView;
-import com.cooleshow.chatmodule.bean.ContactListBean;
-import com.cooleshow.teacher.bean.LiveRoomInfoBean;
-import com.daya.tclive.bean.FriendInfoBean;
-import com.rong.io.live.message.RCChatJoinRoomMessage;
-import com.rong.io.live.message.RCOnSnappingUpMessage;
-import com.rong.io.live.message.RCUserAddLikeMessage;
-import com.rong.io.live.message.RCUserSeatApplyMessage;
-
-import java.util.List;
-
-import cn.rongcloud.rtc.api.RCRTCRemoteUser;
-import cn.rongcloud.rtc.api.stream.RCRTCVideoView;
-import cn.rongcloud.rtc.base.RCRTCLiveRole;
-import io.rong.imlib.model.Message;
-import io.rong.imlib.model.MessageContent;
-
-/**
- * 创建日期:2022/5/20 15:02
- *
- * @author Ryan
- * 类说明:
- */
-public interface LiveRoomContract {
-    interface LiveRoomView extends BaseView {
-        /**
-         * 获取房间信息成功
-         *
-         * @param roomInfoBean
-         */
-        void getRoomInfoSuccess(LiveRoomInfoBean roomInfoBean);
-
-        /**
-         * 获取房间信息失败
-         *
-         * @param throwable
-         */
-        void getRoomInfoError(Throwable throwable);
-
-        /**
-         * 显示finishview
-         */
-        void showFinishView();
-
-        /**
-         * 添加多条公屏消息
-         */
-        void addMessageList(List<MessageContent> messageContents, boolean isReset);
-
-        /**
-         * 添加单条公屏消息
-         */
-        void addMessageContent(Message message, boolean isReset);
-
-
-        /**
-         * 设置房间数据
-         */
-        void setRoomData(LiveRoomInfoBean roomInfoBean);
-
-        /**
-         * 推流成功
-         */
-        void onPublishSuccess();
-
-        View getContentView();
-
-        void addVideoPreview(RCRTCVideoView videoView);
-
-        void openCameraSuccess(Boolean data);
-
-        void openCameraError(String errorMsg);
-
-        /**
-         * 成员同步
-         *
-         * @param count
-         */
-        void syncMemberCount(String count);
-
-        /**
-         * 加入房间消息
-         *
-         * @param joinRoomMessage
-         */
-        void receiveJoinMessage(RCChatJoinRoomMessage joinRoomMessage);
-        /**
-         * 抢购消息
-         *
-         * @param
-         */
-        void receiveSnapUpMessage(RCOnSnappingUpMessage snappingUpMessage);
-
-        void liveRoomOffline();
-
-        void onAddLikeMessage(RCUserAddLikeMessage addLikeMessage);
-
-        void onUserJoinRoom(RCRTCRemoteUser rcrtcRemoteUser);
-
-        void onUserLeftRoomMic(RCRTCRemoteUser rcrtcRemoteUser);
-
-        void onUserOfflineRoomMic(RCRTCRemoteUser rcrtcRemoteUser);
-
-        void onSwitchRole(String userId, RCRTCLiveRole role);
-
-        /**
-         * 连麦申请
-         */
-        void onSeatApplyMessage(RCUserSeatApplyMessage seatApplyMessage);
-
-        /**
-         * 远端有用户推流
-         * @param remoteUserId
-         */
-        void onRemoteUserPublishResource(String remoteUserId);
-
-        /**
-         * 获取用户信息成功
-         * @param data
-         */
-        void getFriendInfoSuccess(FriendInfoBean data);
-
-        /**
-         * 用户离开房间消息
-         * @param targetUserId
-         */
-        void onUserLeaveRoom(String targetUserId);
-    }
-
-    interface Presenter {
-        void handleAction(int action, Object... params);
-
-        void notifyJoinRoomAction(String roomId, String userId);
-
-        void notifyLeaveRoomAction();
-    }
-}
+//package com.cooleshow.teacher.contract;
+//
+//import android.view.View;
+//
+//import com.cooleshow.base.presenter.view.BaseView;
+//import com.cooleshow.chatmodule.bean.ContactListBean;
+//import com.cooleshow.teacher.bean.LiveRoomInfoBean;
+//import com.daya.tclive.bean.FriendInfoBean;
+//import com.rong.io.live.message.RCChatJoinRoomMessage;
+//import com.rong.io.live.message.RCOnSnappingUpMessage;
+//import com.rong.io.live.message.RCUserAddLikeMessage;
+//import com.rong.io.live.message.RCUserSeatApplyMessage;
+//
+//import java.util.List;
+//
+//import cn.rongcloud.rtc.api.RCRTCRemoteUser;
+//import cn.rongcloud.rtc.api.stream.RCRTCVideoView;
+//import cn.rongcloud.rtc.base.RCRTCLiveRole;
+//import io.rong.imlib.model.Message;
+//import io.rong.imlib.model.MessageContent;
+//
+///**
+// * 创建日期:2022/5/20 15:02
+// *
+// * @author Ryan
+// * 类说明:
+// */
+//public interface LiveRoomContract {
+//    interface LiveRoomView extends BaseView {
+//        /**
+//         * 获取房间信息成功
+//         *
+//         * @param roomInfoBean
+//         */
+//        void getRoomInfoSuccess(LiveRoomInfoBean roomInfoBean);
+//
+//        /**
+//         * 获取房间信息失败
+//         *
+//         * @param throwable
+//         */
+//        void getRoomInfoError(Throwable throwable);
+//
+//        /**
+//         * 显示finishview
+//         */
+//        void showFinishView();
+//
+//        /**
+//         * 添加多条公屏消息
+//         */
+//        void addMessageList(List<MessageContent> messageContents, boolean isReset);
+//
+//        /**
+//         * 添加单条公屏消息
+//         */
+//        void addMessageContent(Message message, boolean isReset);
+//
+//
+//        /**
+//         * 设置房间数据
+//         */
+//        void setRoomData(LiveRoomInfoBean roomInfoBean);
+//
+//        /**
+//         * 推流成功
+//         */
+//        void onPublishSuccess();
+//
+//        View getContentView();
+//
+//        void addVideoPreview(RCRTCVideoView videoView);
+//
+//        void openCameraSuccess(Boolean data);
+//
+//        void openCameraError(String errorMsg);
+//
+//        /**
+//         * 成员同步
+//         *
+//         * @param count
+//         */
+//        void syncMemberCount(String count);
+//
+//        /**
+//         * 加入房间消息
+//         *
+//         * @param joinRoomMessage
+//         */
+//        void receiveJoinMessage(RCChatJoinRoomMessage joinRoomMessage);
+//        /**
+//         * 抢购消息
+//         *
+//         * @param
+//         */
+//        void receiveSnapUpMessage(RCOnSnappingUpMessage snappingUpMessage);
+//
+//        void liveRoomOffline();
+//
+//        void onAddLikeMessage(RCUserAddLikeMessage addLikeMessage);
+//
+//        void onUserJoinRoom(RCRTCRemoteUser rcrtcRemoteUser);
+//
+//        void onUserLeftRoomMic(RCRTCRemoteUser rcrtcRemoteUser);
+//
+//        void onUserOfflineRoomMic(RCRTCRemoteUser rcrtcRemoteUser);
+//
+//        void onSwitchRole(String userId, RCRTCLiveRole role);
+//
+//        /**
+//         * 连麦申请
+//         */
+//        void onSeatApplyMessage(RCUserSeatApplyMessage seatApplyMessage);
+//
+//        /**
+//         * 远端有用户推流
+//         * @param remoteUserId
+//         */
+//        void onRemoteUserPublishResource(String remoteUserId);
+//
+//        /**
+//         * 获取用户信息成功
+//         * @param data
+//         */
+//        void getFriendInfoSuccess(FriendInfoBean data);
+//
+//        /**
+//         * 用户离开房间消息
+//         * @param targetUserId
+//         */
+//        void onUserLeaveRoom(String targetUserId);
+//    }
+//
+//    interface Presenter {
+//        void handleAction(int action, Object... params);
+//
+//        void notifyJoinRoomAction(String roomId, String userId);
+//
+//        void notifyLeaveRoomAction();
+//    }
+//}

+ 0 - 26
teacher/src/main/java/com/cooleshow/teacher/helper/ShareHelper.java

@@ -29,13 +29,6 @@ import io.reactivex.rxjava3.core.ObservableOnSubscribe;
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.schedulers.Schedulers;
-import io.rong.imkit.IMCenter;
-import io.rong.imkit.utils.helper.OpenChatHelper;
-import io.rong.imlib.IRongCallback;
-import io.rong.imlib.RongIMClient;
-import io.rong.imlib.model.Conversation;
-import io.rong.imlib.model.Message;
-import io.rong.message.ImageMessage;
 
 
 /**
 /**
  * Author by pq, Date on 2022/5/31.
  * Author by pq, Date on 2022/5/31.
@@ -90,15 +83,6 @@ public class ShareHelper {
                 });
                 });
     }
     }
 
 
-    private static Message createImageMessage(String base64, Conversation conversation) {
-        ImageMessage imageMessage = ImageMessage.obtain();
-        imageMessage.setBase64(base64);
-        Message message = new Message();
-        message.setTargetId(conversation.getTargetId());
-        message.setContent(imageMessage);
-        message.setConversationType(conversation.getConversationType());
-        return message;
-    }
 
 
     private static File saveImgToLocalFile(String base64) {
     private static File saveImgToLocalFile(String base64) {
         byte[] bytes;
         byte[] bytes;
@@ -130,16 +114,6 @@ public class ShareHelper {
         return new File(file.getAbsolutePath());
         return new File(file.getAbsolutePath());
     }
     }
 
 
-    private static Message createImageMessage(File file, String targetId, Conversation.ConversationType conversationType) {
-        Uri uri = Uri.fromFile(file);
-        ImageMessage imageMessage = ImageMessage.obtain(uri, uri,true);
-        Message message = new Message();
-        message.setTargetId(targetId);
-        message.setContent(imageMessage);
-        message.setConversationType(conversationType);
-        return message;
-    }
-
     public static void parseShareContactData(String base64, Intent data) {
     public static void parseShareContactData(String base64, Intent data) {
         String targetId = data.getStringExtra("targetId");
         String targetId = data.getStringExtra("targetId");
         int conversationValue = data.getIntExtra("conversation", -1);
         int conversationValue = data.getIntExtra("conversation", -1);

+ 1040 - 1040
teacher/src/main/java/com/cooleshow/teacher/presenter/live/LiveRoomPresenter.java

@@ -1,1045 +1,1045 @@
-package com.cooleshow.teacher.presenter.live;
-
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.cooleshow.base.data.net.BaseResponse;
-import com.cooleshow.base.presenter.BasePresenter;
-import com.cooleshow.base.rx.BaseObserver;
-import com.cooleshow.base.utils.LogUtils;
-import com.cooleshow.base.utils.RequestBodyUtil;
-import com.cooleshow.base.utils.Utils;
-import com.cooleshow.chatmodule.api.IMApi;
-import com.cooleshow.chatmodule.bean.ContactListBean;
-import com.cooleshow.teacher.api.APIService;
-import com.cooleshow.teacher.bean.LiveRoomInfoBean;
-import com.cooleshow.teacher.contract.LiveRoomContract;
-import com.cooleshow.usercenter.helper.UserHelper;
-import com.daya.live_teaching.common.ErrorCode;
-import com.daya.live_teaching.common.ResultCallback;
-import com.daya.tclive.api.StudentAPIService;
-import com.daya.tclive.api.TeacherAPIService;
-import com.daya.tclive.bean.FriendInfoBean;
-import com.google.gson.Gson;
-import com.rong.io.live.LiveRoomMsgConstants;
-import com.rong.io.live.bean.ImUserState;
-import com.rong.io.live.bean.User;
-import com.rong.io.live.callback.ClickCallback;
-import com.rong.io.live.callback.IRoomCallBack;
-import com.rong.io.live.helper.LiveEventHelper;
-import com.rong.io.live.helper.LiveRTCEngineInitHelper;
-import com.rong.io.live.manager.RCChatRoomMessageManager;
-import com.rong.io.live.message.RCChatJoinRoomMessage;
-import com.rong.io.live.message.RCChatRoomMemberNumMessage;
-import com.rong.io.live.message.RCChatroomLocationMessage;
-import com.rong.io.live.message.RCLiveRefuseAllMicApplyMessage;
-import com.rong.io.live.message.RCLiveUnderAllMicMessage;
-import com.rong.io.live.message.RCOnSnappingUpMessage;
-import com.rong.io.live.message.RCPauseLiveMessage;
-import com.rong.io.live.message.RCUserAddLikeMessage;
-import com.rong.io.live.message.RCUserLeaveRoomMessage;
-import com.rong.io.live.message.RCUserSeatApplyMessage;
-import com.rong.io.live.message.RCUserSeatResponseMessage;
-import com.rong.io.live.message.RCUserSeatsCtrlMessage;
-import com.rong.io.live.message.RCUserSyncAddLikeCountMessage;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import cn.rongcloud.rtc.api.RCRTCEngine;
-import cn.rongcloud.rtc.api.RCRTCRemoteUser;
-import cn.rongcloud.rtc.api.RCRTCRoom;
-import cn.rongcloud.rtc.api.callback.IRCRTCResultCallback;
-import cn.rongcloud.rtc.api.callback.IRCRTCResultDataCallback;
-import cn.rongcloud.rtc.api.callback.IRCRTCRoomEventsListener;
-import cn.rongcloud.rtc.api.stream.RCRTCAudioInputStream;
-import cn.rongcloud.rtc.api.stream.RCRTCAudioOutputStream;
-import cn.rongcloud.rtc.api.stream.RCRTCCameraOutputStream;
-import cn.rongcloud.rtc.api.stream.RCRTCInputStream;
-import cn.rongcloud.rtc.api.stream.RCRTCLiveInfo;
-import cn.rongcloud.rtc.api.stream.RCRTCOutputStream;
-import cn.rongcloud.rtc.api.stream.RCRTCVideoInputStream;
-import cn.rongcloud.rtc.api.stream.RCRTCVideoOutputStream;
-import cn.rongcloud.rtc.api.stream.RCRTCVideoStreamConfig;
-import cn.rongcloud.rtc.api.stream.RCRTCVideoView;
-import cn.rongcloud.rtc.base.RCRTCLiveRole;
-import cn.rongcloud.rtc.base.RCRTCMediaType;
-import cn.rongcloud.rtc.base.RCRTCParamsType;
-import cn.rongcloud.rtc.base.RTCErrorCode;
-import cn.rongcloud.rtc.core.CameraVideoCapturer;
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
-import io.reactivex.rxjava3.annotations.NonNull;
-import io.reactivex.rxjava3.core.Observable;
-import io.reactivex.rxjava3.core.ObservableEmitter;
-import io.reactivex.rxjava3.core.ObservableOnSubscribe;
-import io.reactivex.rxjava3.core.Observer;
-import io.reactivex.rxjava3.core.Scheduler;
-import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.functions.Consumer;
-import io.reactivex.rxjava3.observers.DisposableObserver;
-import io.reactivex.rxjava3.schedulers.Schedulers;
-import io.rong.imkit.IMCenter;
-import io.rong.imlib.IRongCoreCallback;
-import io.rong.imlib.RongIMClient;
-import io.rong.imlib.model.Message;
-import io.rong.imlib.model.MessageContent;
-import okhttp3.RequestBody;
-
-/**
- * Author by pq, Date on 2022/6/5.
- */
-public class LiveRoomPresenter extends BasePresenter<LiveRoomContract.LiveRoomView> implements LiveRoomContract.Presenter {
-    public boolean isInRoom = false;
-    private LiveRoomInfoBean currentRoomInfo;
-    private List<Disposable> disposablesManager = new ArrayList<>();//监听管理器
-    private final IRCRTCRoomEventsListener mRoomEventsListener = new IRCRTCRoomEventsListener() {
-        @Override
-        public void onRemoteUserPublishResource(RCRTCRemoteUser rcrtcRemoteUser, List<RCRTCInputStream> list) {
-            Log.i("pq", "onRemoteUserPublishResource");
-            subscribeTargetStream(rcrtcRemoteUser.getUserId(), list, new ResultCallback<String>() {
-                @Override
-                public void onSuccess(String s) {
-                    if (getView() != null) {
-                        getView().onRemoteUserPublishResource(rcrtcRemoteUser.getUserId());
-                    }
-                }
-
-                @Override
-                public void onFail(int errorCode, String errorStr) {
-                    LogUtils.i("pq", "subscribeTargetStream fail:errorCode:" + errorCode + "errorStr:" + errorStr);
-                }
-            });
-        }
-
-        @Override
-        public void onRemoteUserMuteAudio(RCRTCRemoteUser rcrtcRemoteUser, RCRTCInputStream rcrtcInputStream, boolean b) {
-            Log.i("pq", "onRemoteUserMuteAudio:" + b);
-            if (getView() != null) {
-//                getView().syncAudioStatus(b);
-            }
-        }
-
-        @Override
-        public void onRemoteUserMuteVideo(RCRTCRemoteUser rcrtcRemoteUser, RCRTCInputStream rcrtcInputStream, boolean b) {
-        }
-
-        @Override
-        public void onRemoteUserUnpublishResource(RCRTCRemoteUser rcrtcRemoteUser, List<RCRTCInputStream> list) {
-            Log.i("pq", "onRemoteUserUnpublishResource");
-            if (getView() != null) {
-//                getView().showCloseVideoView();
-            }
-        }
-
-        @Override
-        public void onUserJoined(RCRTCRemoteUser rcrtcRemoteUser) {
-            //当房间中用户使用RCRTCLocalUser#switchToBroadcaster 方法上麦成功时
-            // ,房间中观众会收到IRCRTCRoomEventsListener#onUserJoined 回调。
-        }
-
-        @Override
-        public void onSwitchRole(String userId, RCRTCLiveRole role) {
-            super.onSwitchRole(userId, role);
-            //当房间内的用户使用 RCRTCLocalUser#switchToBroadcaster 或 RCRTCLocalUser#switchToAudience 方法上下麦时
-            // ,同房间内的其他主播会收到 IRCRTCRoomEventsListener#onSwitchRole 回调。
-            if (getView() != null) {
-                getView().onSwitchRole(userId, role);
-            }
-        }
-
-        @Override
-        public void onUserLeft(RCRTCRemoteUser rcrtcRemoteUser) {
-            if (getView() != null) {
-                getView().onUserLeftRoomMic(rcrtcRemoteUser);
-            }
-        }
-
-        @Override
-        public void onUserOffline(RCRTCRemoteUser rcrtcRemoteUser) {
-            if (getView() != null) {
-                getView().onUserOfflineRoomMic(rcrtcRemoteUser);
-            }
-        }
-
-        @Override
-        public void onPublishLiveStreams(List<RCRTCInputStream> list) {
-            Log.i("pq", "onPublishLiveStreams");
-        }
-
-        @Override
-        public void onUnpublishLiveStreams(List<RCRTCInputStream> list) {
-            Log.i("pq", "onUnpublishLiveStreams");
-            if (getView() != null) {
-//                getView().showRestView();
-            }
-        }
-
-
-        /**
-         * 自己退出房间。 例如断网退出等
-         * @param i 状态码
-         */
-        @Override
-        public void onLeaveRoom(int i) {
-            Log.i("pq", "onLeaveRoom:" + i);
-        }
-    };
-
-
-    /**
-     * init
-     *
-     * @param roomId
-     * @param isCreate
-     */
-    public void init(String roomId, boolean isCreate) {
-        isInRoom = TextUtils.equals(LiveEventHelper.getInstance().getRoomId(), roomId);
-        RongIMClient.ConnectionStatusListener.ConnectionStatus currentConnectionStatus = RongIMClient.getInstance().getCurrentConnectionStatus();
-        if (currentConnectionStatus == RongIMClient.ConnectionStatusListener.ConnectionStatus.CONNECTED) {
-            Log.i("pq", "LiveRoomActivity init getRoomInfo");
-            getRoomInfo(roomId);
-        } else {
-            connectIM();
-        }
-    }
-
-
-    /**
-     * 获取房间信息
-     *
-     * @param roomId
-     */
-    public void getRoomInfo(String roomId) {
-        addSubscribe(create(APIService.class).getLiveRoomInfo(roomId), new BaseObserver<LiveRoomInfoBean>(getView()) {
-            @Override
-            protected void onSuccess(LiveRoomInfoBean data) {
-                Log.i("pq", "getRoomInfo success" + data);
-                currentRoomInfo = data;
-                setObMessageListener(data.roomUid);
-                if (getView() != null) {
-                    getView().getRoomInfoSuccess(data);
-                }
-            }
-
-            @Override
-            public void onError(Throwable e) {
-                super.onError(e);
-                e.printStackTrace();
-                if (getView() != null) {
-                    getView().getRoomInfoError(e);
-                }
-            }
-        });
-    }
-
-    /**
-     * 初始化配置以及预览模式
-     */
-    public void openVideoPreview() {
-        initPublishConfig();
-        startVideoPreview();
-    }
-
-    /**
-     * 切换摄像头
-     */
-    public void reverseCamera() {
-        if (RCRTCEngine.getInstance().getDefaultVideoStream() != null) {
-            RCRTCEngine.getInstance().getDefaultVideoStream().switchCamera(new CameraVideoCapturer.CameraSwitchHandler() {
-                @Override
-                public void onCameraSwitchDone(boolean isFrontCamera) {
-                    // 切换成功
-                    RCRTCEngine.getInstance().getDefaultVideoStream().setPreviewMirror(isFrontCamera);
-                }
-
-                @Override
-                public void onCameraSwitchError(String errorDescription) {
-                    // 切换失败
-                }
-            });
-        }
-    }
-
-    public void prepareJoinRoom(String roomId, boolean isCreate) {
-        //先离开当前房间
-        LiveEventHelper.getInstance().leaveRoom(new IRoomCallBack() {
-            @Override
-            public void onSuccess() {
-                if (getView() != null && getView().getContentView() != null) {
-                    getView().getContentView().postDelayed(new Runnable() {
-                        @Override
-                        public void run() {
-                            joinRoom(roomId, isCreate);
-                        }
-                    }, 1000);
-                }
-            }
-
-            @Override
-            public void onError(int code, String message) {
-                Log.i("pq", "leaveRoom onError:" + code + "-msg:" + message);
-                joinRoom(roomId, isCreate);
-            }
-        });
-    }
-
-    /**
-     * 取消发布流
-     */
-    public void cancelPublish(IRCRTCResultCallback resultCallback) {
-        RCRTCRoom rcrtcRoom = LiveEventHelper.getInstance().getRtcRoom();
-        if (rcrtcRoom == null) {
-            return;
-        }
-        rcrtcRoom.getLocalUser().unpublishDefaultLiveStreams(resultCallback);
-    }
-
-
-    /**
-     * 开启预览
-     *
-     * @param
-     */
-    private void startVideoPreview() {
-        // 创建本地视频显示视图
-        RCRTCVideoView rcrtcVideoView = new RCRTCVideoView(Utils.getApp().getApplicationContext());
-        RCRTCCameraOutputStream rcrtcCameraOutputStream = RCRTCEngine.getInstance().getDefaultVideoStream();
-        if (rcrtcCameraOutputStream == null) {
-            return;
-        }
-        RCRTCEngine.getInstance().getDefaultVideoStream().setVideoView(rcrtcVideoView);
-        if (getView() != null) {
-            getView().addVideoPreview(rcrtcVideoView);
-        }
-        RCRTCEngine.getInstance().getDefaultVideoStream().startCamera(new IRCRTCResultDataCallback<Boolean>() {
-            @Override
-            public void onSuccess(Boolean data) {
-                if (getView() != null) {
-                    getView().openCameraSuccess(data);
-                }
-            }
-
-            @Override
-            public void onFailed(RTCErrorCode errorCode) {
-                if (getView() != null) {
-                    getView().openCameraError(errorCode.getReason());
-                }
-            }
-        });
-    }
-
-    public void initPublishConfig() {
-        try {
-            RCRTCVideoStreamConfig config =
-                    RCRTCVideoStreamConfig.Builder.create()
-                            .setVideoFps(RCRTCParamsType.RCRTCVideoFps.Fps_30)
-                            .setVideoResolution(RCRTCParamsType.RCRTCVideoResolution.RESOLUTION_720_1280)
-                            .build();
-            //音乐教学场景。不建议在会议、语聊房、直播场景中使用 MUSIC_CLASSROOM,否则有出现回声问题的风险。
-            RCRTCEngine.getInstance().getDefaultVideoStream().setVideoConfig(config);
-            RCRTCEngine.getInstance().getDefaultAudioStream().setAudioQuality(RCRTCParamsType.AudioQuality.MUSIC_HIGH, RCRTCParamsType.AudioScenario.MUSIC_CHATROOM);
-            RCRTCEngine.getInstance().getDefaultVideoStream().enableTinyStream(false);//只发布大流
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public void handleAction(int action, Object... params) {
-        //处理教师端直播间操作
-        if (action == LiveRoomMsgConstants.ACTION_AGREE_MIC_APPLY) {
-            //主讲人同意连麦申请
-            Object param = params[0];
-            if (param instanceof User) {
-                User user = (User) param;
-                RCUserSeatResponseMessage rcUserSeatResponseMessage = new RCUserSeatResponseMessage();
-                rcUserSeatResponseMessage.setTeacherId(UserHelper.getImUserId());
-                rcUserSeatResponseMessage.setTeacherName(UserHelper.getUserName());
-                rcUserSeatResponseMessage.setAudienceId(user.getUserId());
-                rcUserSeatResponseMessage.setAudienceName(user.getUserName());
-                rcUserSeatResponseMessage.setType(LiveRoomMsgConstants.MIC_RESPONSE_AGREE);
-                sendMessage(rcUserSeatResponseMessage, false);
-            }
-            return;
-        }
-        if (action == LiveRoomMsgConstants.ACTION_CANCEL_ON_MIC_BY_TEACHER) {
-            //主讲人将观众抱下麦
-            Object param = params[0];
-            if (param instanceof User) {
-                User user = (User) param;
-                RCUserSeatApplyMessage seatApplyMessage = new RCUserSeatApplyMessage();
-                seatApplyMessage.setTeacherId(UserHelper.getImUserId());
-                seatApplyMessage.setTeacherName(UserHelper.getUserName());
-                seatApplyMessage.setAudienceId(user.getUserId());
-                seatApplyMessage.setAudienceName(user.getUserName());
-                seatApplyMessage.setType(LiveRoomMsgConstants.MIC_ACTION_CANCEL_SEAT_BY_CREATE);
-                sendMessage(seatApplyMessage, false);
-            }
-            return;
-        }
-
-        if (action == LiveRoomMsgConstants.ACTION_SWITCH_MIC_MODE) {
-            //切换连麦模式
-            boolean isEnable = (boolean) params[0];
-            RCUserSeatsCtrlMessage rcUserSeatsCtrlMessage = new RCUserSeatsCtrlMessage();
-            rcUserSeatsCtrlMessage.setUserId(UserHelper.getImUserId());
-            rcUserSeatsCtrlMessage.setUserName(UserHelper.getUserName());
-            rcUserSeatsCtrlMessage.setSeatBan(isEnable);
-            sendMessage(rcUserSeatsCtrlMessage, false);
-            return;
-        }
-
-        if (action == LiveRoomMsgConstants.ACTION_SEND_ADD_LIKE_COUNT) {
-            //发送点赞数量总数
-            int count = (int) params[0];
-            RCUserSyncAddLikeCountMessage syncAddLikeCountMessage = new RCUserSyncAddLikeCountMessage();
-            syncAddLikeCountMessage.setCount(count);
-            sendMessage(syncAddLikeCountMessage, false);
-            return;
-        }
-
-        if (action == LiveRoomMsgConstants.ACTION_SEND_PAUSE_LIVE) {
-            //暂停直播消息
-            RCPauseLiveMessage pauseLiveMessage = new RCPauseLiveMessage();
-            sendMessage(pauseLiveMessage, false);
-            return;
-        }
-
-        if (action == LiveRoomMsgConstants.ACTION_SEND_REFUSE_ALL_MIC_APPLY_MSG) {
-            //发送拒绝全部连麦申请消息
-            RCLiveRefuseAllMicApplyMessage rcLiveRefuseAllMicApplyMessage = new RCLiveRefuseAllMicApplyMessage();
-            sendMessage(rcLiveRefuseAllMicApplyMessage, false);
-            return;
-        }
-
-        if (action == LiveRoomMsgConstants.ACTION_SEND_UNDER_ALL_MIC_MSG) {
-            //发送全部下麦消息
-            RCLiveUnderAllMicMessage rcLiveUnderAllMicMessage = new RCLiveUnderAllMicMessage();
-            sendMessage(rcLiveUnderAllMicMessage, false);
-            return;
-        }
-        if (action == LiveRoomMsgConstants.ACTION_SEND_JOIN_ROOM) {
-            //老师端暂时不发送加入房间消息
-            //发送加入房间成功消息
-//            RCChatJoinRoomMessage rcChatJoinRoomMessage = new RCChatJoinRoomMessage();
-//            sendMessage(rcChatJoinRoomMessage, false);
-            return;
-        }
-    }
-
-    /**
-     * 加入房间
-     *
-     * @param roomId
-     * @param isCreate
-     */
-    private void joinRoom(String roomId, boolean isCreate) {
-        //如果是观众就直接加入房间
-        Log.i("pq", "joinRoom");
-        LiveEventHelper.getInstance().joinRoom(roomId, RCRTCLiveRole.BROADCASTER, new ClickCallback<Boolean>() {
-            @Override
-            public void onResult(Boolean result, String msg) {
-                Log.i("pq", "joinRoom onResult:" + result);
-                if (result) {
-                    setCurrentRoom(currentRoomInfo);
-                } else {
-                    //加入直播房间失败
-                    if (getView() != null) {
-                        getView().showFinishView();
-                    }
-                    leaveRoom();
-                }
-            }
-        });
-    }
-
-    /**
-     * 设置当前房间
-     *
-     * @param roomInfo
-     */
-    public void setCurrentRoom(LiveRoomInfoBean roomInfo) {
-        initLiveRoomListener(roomInfo.roomUid);
-        //设置创建者id
-        LiveEventHelper.getInstance().setCreateUserId(roomInfo.speakerId);
-//        getShield();获取敏感词汇
-        if (getView() != null) {
-            getView().setRoomData(currentRoomInfo);
-        }
-    }
-
-    /**
-     * 加入房间后,开始摄像头采集并发布音视频流。
-     */
-    public void startPublish() {
-        RCRTCRoom rcrtcRoom = LiveEventHelper.getInstance().getRtcRoom();
-        if (rcrtcRoom == null) {
-            return;
-        }
-        boolean frontCamera = RCRTCEngine.getInstance().getDefaultVideoStream().isFrontCamera();
-        RCRTCEngine.getInstance().getDefaultVideoStream().setPreviewMirror(frontCamera);
-        RCRTCEngine.getInstance().getDefaultVideoStream().startCamera(null);
-        if (rcrtcRoom.getLocalUser() == null) {
-            return;
-        }
-        rcrtcRoom.getLocalUser().publishDefaultLiveStreams(new IRCRTCResultDataCallback<RCRTCLiveInfo>() {
-            @Override
-            public void onSuccess(RCRTCLiveInfo liveInfo) {
-                if (getView() != null) {
-                    getView().onPublishSuccess();
-                }
-            }
-
-            @Override
-            public void onFailed(RTCErrorCode code) {
-                Log.i("pq", "publishDefaultLiveStreamError:" + code);
-            }
-        });
-    }
-
-    /**
-     * 设置直播房的各种监听
-     *
-     * @param roomId
-     */
-    public void initLiveRoomListener(String roomId) {
-        LiveEventHelper.getInstance().getRtcRoom().registerRoomListener(mRoomEventsListener);
-        //添加消息监听
-    }
-
-    /**
-     * 进入房间后发送默认的消息
-     */
-    public void sendDefaultMessage() {
-        if (currentRoomInfo != null) {
-            RCChatroomLocationMessage tips = new RCChatroomLocationMessage();
-            tips.setContent("欢迎进入直播课堂,请遵守相关法规,禁止传播低俗、暴力等不良信息。为孩子创造健康绿色的学习环境。");
-            sendMessage(tips);
-        }
-    }
-
-    /**
-     * 发送消息
-     * 默认显示在本地
-     *
-     * @param messageContent
-     */
-    public void sendMessage(MessageContent messageContent) {
-        sendMessage(messageContent, true);
-    }
-
-    /**
-     * 发送消息
-     *
-     * @param messageContent 消息体
-     * @param isShowLocation 是否显示在本地
-     */
-    public void sendMessage(MessageContent messageContent, boolean isShowLocation) {
-        if (!isContainsShield(messageContent)) {
-            LiveEventHelper.getInstance().sendMessage(messageContent, isShowLocation);
-        }
-    }
-
-    /**
-     * 是否包含屏蔽词
-     *
-     * @return
-     */
-    private boolean isContainsShield(MessageContent messageContent) {
-        boolean isContains = false;
-//        if (shields != null) {
-//            for (String shield : shields) {
-//                if (messageContent instanceof RCChatroomBarrage) {
-//                    if (((RCChatroomBarrage) messageContent).getContent().contains(shield)) {
-//                        isContains = true;
-//                        break;
+//package com.cooleshow.teacher.presenter.live;
+//
+//import android.text.TextUtils;
+//import android.util.Log;
+//
+//import com.cooleshow.base.data.net.BaseResponse;
+//import com.cooleshow.base.presenter.BasePresenter;
+//import com.cooleshow.base.rx.BaseObserver;
+//import com.cooleshow.base.utils.LogUtils;
+//import com.cooleshow.base.utils.RequestBodyUtil;
+//import com.cooleshow.base.utils.Utils;
+//import com.cooleshow.chatmodule.api.IMApi;
+//import com.cooleshow.chatmodule.bean.ContactListBean;
+//import com.cooleshow.teacher.api.APIService;
+//import com.cooleshow.teacher.bean.LiveRoomInfoBean;
+//import com.cooleshow.teacher.contract.LiveRoomContract;
+//import com.cooleshow.usercenter.helper.UserHelper;
+//import com.daya.live_teaching.common.ErrorCode;
+//import com.daya.live_teaching.common.ResultCallback;
+//import com.daya.tclive.api.StudentAPIService;
+//import com.daya.tclive.api.TeacherAPIService;
+//import com.daya.tclive.bean.FriendInfoBean;
+//import com.google.gson.Gson;
+//import com.rong.io.live.LiveRoomMsgConstants;
+//import com.rong.io.live.bean.ImUserState;
+//import com.rong.io.live.bean.User;
+//import com.rong.io.live.callback.ClickCallback;
+//import com.rong.io.live.callback.IRoomCallBack;
+//import com.rong.io.live.helper.LiveEventHelper;
+//import com.rong.io.live.helper.LiveRTCEngineInitHelper;
+//import com.rong.io.live.manager.RCChatRoomMessageManager;
+//import com.rong.io.live.message.RCChatJoinRoomMessage;
+//import com.rong.io.live.message.RCChatRoomMemberNumMessage;
+//import com.rong.io.live.message.RCChatroomLocationMessage;
+//import com.rong.io.live.message.RCLiveRefuseAllMicApplyMessage;
+//import com.rong.io.live.message.RCLiveUnderAllMicMessage;
+//import com.rong.io.live.message.RCOnSnappingUpMessage;
+//import com.rong.io.live.message.RCPauseLiveMessage;
+//import com.rong.io.live.message.RCUserAddLikeMessage;
+//import com.rong.io.live.message.RCUserLeaveRoomMessage;
+//import com.rong.io.live.message.RCUserSeatApplyMessage;
+//import com.rong.io.live.message.RCUserSeatResponseMessage;
+//import com.rong.io.live.message.RCUserSeatsCtrlMessage;
+//import com.rong.io.live.message.RCUserSyncAddLikeCountMessage;
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//
+//import cn.rongcloud.rtc.api.RCRTCEngine;
+//import cn.rongcloud.rtc.api.RCRTCRemoteUser;
+//import cn.rongcloud.rtc.api.RCRTCRoom;
+//import cn.rongcloud.rtc.api.callback.IRCRTCResultCallback;
+//import cn.rongcloud.rtc.api.callback.IRCRTCResultDataCallback;
+//import cn.rongcloud.rtc.api.callback.IRCRTCRoomEventsListener;
+//import cn.rongcloud.rtc.api.stream.RCRTCAudioInputStream;
+//import cn.rongcloud.rtc.api.stream.RCRTCAudioOutputStream;
+//import cn.rongcloud.rtc.api.stream.RCRTCCameraOutputStream;
+//import cn.rongcloud.rtc.api.stream.RCRTCInputStream;
+//import cn.rongcloud.rtc.api.stream.RCRTCLiveInfo;
+//import cn.rongcloud.rtc.api.stream.RCRTCOutputStream;
+//import cn.rongcloud.rtc.api.stream.RCRTCVideoInputStream;
+//import cn.rongcloud.rtc.api.stream.RCRTCVideoOutputStream;
+//import cn.rongcloud.rtc.api.stream.RCRTCVideoStreamConfig;
+//import cn.rongcloud.rtc.api.stream.RCRTCVideoView;
+//import cn.rongcloud.rtc.base.RCRTCLiveRole;
+//import cn.rongcloud.rtc.base.RCRTCMediaType;
+//import cn.rongcloud.rtc.base.RCRTCParamsType;
+//import cn.rongcloud.rtc.base.RTCErrorCode;
+//import cn.rongcloud.rtc.core.CameraVideoCapturer;
+//import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+//import io.reactivex.rxjava3.annotations.NonNull;
+//import io.reactivex.rxjava3.core.Observable;
+//import io.reactivex.rxjava3.core.ObservableEmitter;
+//import io.reactivex.rxjava3.core.ObservableOnSubscribe;
+//import io.reactivex.rxjava3.core.Observer;
+//import io.reactivex.rxjava3.core.Scheduler;
+//import io.reactivex.rxjava3.disposables.Disposable;
+//import io.reactivex.rxjava3.functions.Consumer;
+//import io.reactivex.rxjava3.observers.DisposableObserver;
+//import io.reactivex.rxjava3.schedulers.Schedulers;
+//import io.rong.imkit.IMCenter;
+//import io.rong.imlib.IRongCoreCallback;
+//import io.rong.imlib.RongIMClient;
+//import io.rong.imlib.model.Message;
+//import io.rong.imlib.model.MessageContent;
+//import okhttp3.RequestBody;
+//
+///**
+// * Author by pq, Date on 2022/6/5.
+// */
+//public class LiveRoomPresenter extends BasePresenter<LiveRoomContract.LiveRoomView> implements LiveRoomContract.Presenter {
+//    public boolean isInRoom = false;
+//    private LiveRoomInfoBean currentRoomInfo;
+//    private List<Disposable> disposablesManager = new ArrayList<>();//监听管理器
+//    private final IRCRTCRoomEventsListener mRoomEventsListener = new IRCRTCRoomEventsListener() {
+//        @Override
+//        public void onRemoteUserPublishResource(RCRTCRemoteUser rcrtcRemoteUser, List<RCRTCInputStream> list) {
+//            Log.i("pq", "onRemoteUserPublishResource");
+//            subscribeTargetStream(rcrtcRemoteUser.getUserId(), list, new ResultCallback<String>() {
+//                @Override
+//                public void onSuccess(String s) {
+//                    if (getView() != null) {
+//                        getView().onRemoteUserPublishResource(rcrtcRemoteUser.getUserId());
 //                    }
 //                    }
 //                }
 //                }
+//
+//                @Override
+//                public void onFail(int errorCode, String errorStr) {
+//                    LogUtils.i("pq", "subscribeTargetStream fail:errorCode:" + errorCode + "errorStr:" + errorStr);
+//                }
+//            });
+//        }
+//
+//        @Override
+//        public void onRemoteUserMuteAudio(RCRTCRemoteUser rcrtcRemoteUser, RCRTCInputStream rcrtcInputStream, boolean b) {
+//            Log.i("pq", "onRemoteUserMuteAudio:" + b);
+//            if (getView() != null) {
+////                getView().syncAudioStatus(b);
+//            }
+//        }
+//
+//        @Override
+//        public void onRemoteUserMuteVideo(RCRTCRemoteUser rcrtcRemoteUser, RCRTCInputStream rcrtcInputStream, boolean b) {
+//        }
+//
+//        @Override
+//        public void onRemoteUserUnpublishResource(RCRTCRemoteUser rcrtcRemoteUser, List<RCRTCInputStream> list) {
+//            Log.i("pq", "onRemoteUserUnpublishResource");
+//            if (getView() != null) {
+////                getView().showCloseVideoView();
+//            }
+//        }
+//
+//        @Override
+//        public void onUserJoined(RCRTCRemoteUser rcrtcRemoteUser) {
+//            //当房间中用户使用RCRTCLocalUser#switchToBroadcaster 方法上麦成功时
+//            // ,房间中观众会收到IRCRTCRoomEventsListener#onUserJoined 回调。
+//        }
+//
+//        @Override
+//        public void onSwitchRole(String userId, RCRTCLiveRole role) {
+//            super.onSwitchRole(userId, role);
+//            //当房间内的用户使用 RCRTCLocalUser#switchToBroadcaster 或 RCRTCLocalUser#switchToAudience 方法上下麦时
+//            // ,同房间内的其他主播会收到 IRCRTCRoomEventsListener#onSwitchRole 回调。
+//            if (getView() != null) {
+//                getView().onSwitchRole(userId, role);
+//            }
+//        }
+//
+//        @Override
+//        public void onUserLeft(RCRTCRemoteUser rcrtcRemoteUser) {
+//            if (getView() != null) {
+//                getView().onUserLeftRoomMic(rcrtcRemoteUser);
+//            }
+//        }
+//
+//        @Override
+//        public void onUserOffline(RCRTCRemoteUser rcrtcRemoteUser) {
+//            if (getView() != null) {
+//                getView().onUserOfflineRoomMic(rcrtcRemoteUser);
+//            }
+//        }
+//
+//        @Override
+//        public void onPublishLiveStreams(List<RCRTCInputStream> list) {
+//            Log.i("pq", "onPublishLiveStreams");
+//        }
+//
+//        @Override
+//        public void onUnpublishLiveStreams(List<RCRTCInputStream> list) {
+//            Log.i("pq", "onUnpublishLiveStreams");
+//            if (getView() != null) {
+////                getView().showRestView();
+//            }
+//        }
+//
+//
+//        /**
+//         * 自己退出房间。 例如断网退出等
+//         * @param i 状态码
+//         */
+//        @Override
+//        public void onLeaveRoom(int i) {
+//            Log.i("pq", "onLeaveRoom:" + i);
+//        }
+//    };
+//
+//
+//    /**
+//     * init
+//     *
+//     * @param roomId
+//     * @param isCreate
+//     */
+//    public void init(String roomId, boolean isCreate) {
+//        isInRoom = TextUtils.equals(LiveEventHelper.getInstance().getRoomId(), roomId);
+//        RongIMClient.ConnectionStatusListener.ConnectionStatus currentConnectionStatus = RongIMClient.getInstance().getCurrentConnectionStatus();
+//        if (currentConnectionStatus == RongIMClient.ConnectionStatusListener.ConnectionStatus.CONNECTED) {
+//            Log.i("pq", "LiveRoomActivity init getRoomInfo");
+//            getRoomInfo(roomId);
+//        } else {
+//            connectIM();
+//        }
+//    }
+//
+//
+//    /**
+//     * 获取房间信息
+//     *
+//     * @param roomId
+//     */
+//    public void getRoomInfo(String roomId) {
+//        addSubscribe(create(APIService.class).getLiveRoomInfo(roomId), new BaseObserver<LiveRoomInfoBean>(getView()) {
+//            @Override
+//            protected void onSuccess(LiveRoomInfoBean data) {
+//                Log.i("pq", "getRoomInfo success" + data);
+//                currentRoomInfo = data;
+//                setObMessageListener(data.roomUid);
+//                if (getView() != null) {
+//                    getView().getRoomInfoSuccess(data);
+//                }
+//            }
+//
+//            @Override
+//            public void onError(Throwable e) {
+//                super.onError(e);
+//                e.printStackTrace();
+//                if (getView() != null) {
+//                    getView().getRoomInfoError(e);
+//                }
+//            }
+//        });
+//    }
+//
+//    /**
+//     * 初始化配置以及预览模式
+//     */
+//    public void openVideoPreview() {
+//        initPublishConfig();
+//        startVideoPreview();
+//    }
+//
+//    /**
+//     * 切换摄像头
+//     */
+//    public void reverseCamera() {
+//        if (RCRTCEngine.getInstance().getDefaultVideoStream() != null) {
+//            RCRTCEngine.getInstance().getDefaultVideoStream().switchCamera(new CameraVideoCapturer.CameraSwitchHandler() {
+//                @Override
+//                public void onCameraSwitchDone(boolean isFrontCamera) {
+//                    // 切换成功
+//                    RCRTCEngine.getInstance().getDefaultVideoStream().setPreviewMirror(isFrontCamera);
+//                }
+//
+//                @Override
+//                public void onCameraSwitchError(String errorDescription) {
+//                    // 切换失败
+//                }
+//            });
+//        }
+//    }
+//
+//    public void prepareJoinRoom(String roomId, boolean isCreate) {
+//        //先离开当前房间
+//        LiveEventHelper.getInstance().leaveRoom(new IRoomCallBack() {
+//            @Override
+//            public void onSuccess() {
+//                if (getView() != null && getView().getContentView() != null) {
+//                    getView().getContentView().postDelayed(new Runnable() {
+//                        @Override
+//                        public void run() {
+//                            joinRoom(roomId, isCreate);
+//                        }
+//                    }, 1000);
+//                }
+//            }
+//
+//            @Override
+//            public void onError(int code, String message) {
+//                Log.i("pq", "leaveRoom onError:" + code + "-msg:" + message);
+//                joinRoom(roomId, isCreate);
+//            }
+//        });
+//    }
+//
+//    /**
+//     * 取消发布流
+//     */
+//    public void cancelPublish(IRCRTCResultCallback resultCallback) {
+//        RCRTCRoom rcrtcRoom = LiveEventHelper.getInstance().getRtcRoom();
+//        if (rcrtcRoom == null) {
+//            return;
+//        }
+//        rcrtcRoom.getLocalUser().unpublishDefaultLiveStreams(resultCallback);
+//    }
+//
+//
+//    /**
+//     * 开启预览
+//     *
+//     * @param
+//     */
+//    private void startVideoPreview() {
+//        // 创建本地视频显示视图
+//        RCRTCVideoView rcrtcVideoView = new RCRTCVideoView(Utils.getApp().getApplicationContext());
+//        RCRTCCameraOutputStream rcrtcCameraOutputStream = RCRTCEngine.getInstance().getDefaultVideoStream();
+//        if (rcrtcCameraOutputStream == null) {
+//            return;
+//        }
+//        RCRTCEngine.getInstance().getDefaultVideoStream().setVideoView(rcrtcVideoView);
+//        if (getView() != null) {
+//            getView().addVideoPreview(rcrtcVideoView);
+//        }
+//        RCRTCEngine.getInstance().getDefaultVideoStream().startCamera(new IRCRTCResultDataCallback<Boolean>() {
+//            @Override
+//            public void onSuccess(Boolean data) {
+//                if (getView() != null) {
+//                    getView().openCameraSuccess(data);
+//                }
+//            }
+//
+//            @Override
+//            public void onFailed(RTCErrorCode errorCode) {
+//                if (getView() != null) {
+//                    getView().openCameraError(errorCode.getReason());
+//                }
+//            }
+//        });
+//    }
+//
+//    public void initPublishConfig() {
+//        try {
+//            RCRTCVideoStreamConfig config =
+//                    RCRTCVideoStreamConfig.Builder.create()
+//                            .setVideoFps(RCRTCParamsType.RCRTCVideoFps.Fps_30)
+//                            .setVideoResolution(RCRTCParamsType.RCRTCVideoResolution.RESOLUTION_720_1280)
+//                            .build();
+//            //音乐教学场景。不建议在会议、语聊房、直播场景中使用 MUSIC_CLASSROOM,否则有出现回声问题的风险。
+//            RCRTCEngine.getInstance().getDefaultVideoStream().setVideoConfig(config);
+//            RCRTCEngine.getInstance().getDefaultAudioStream().setAudioQuality(RCRTCParamsType.AudioQuality.MUSIC_HIGH, RCRTCParamsType.AudioScenario.MUSIC_CHATROOM);
+//            RCRTCEngine.getInstance().getDefaultVideoStream().enableTinyStream(false);//只发布大流
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//    }
+//
+//    @Override
+//    public void handleAction(int action, Object... params) {
+//        //处理教师端直播间操作
+//        if (action == LiveRoomMsgConstants.ACTION_AGREE_MIC_APPLY) {
+//            //主讲人同意连麦申请
+//            Object param = params[0];
+//            if (param instanceof User) {
+//                User user = (User) param;
+//                RCUserSeatResponseMessage rcUserSeatResponseMessage = new RCUserSeatResponseMessage();
+//                rcUserSeatResponseMessage.setTeacherId(UserHelper.getImUserId());
+//                rcUserSeatResponseMessage.setTeacherName(UserHelper.getUserName());
+//                rcUserSeatResponseMessage.setAudienceId(user.getUserId());
+//                rcUserSeatResponseMessage.setAudienceName(user.getUserName());
+//                rcUserSeatResponseMessage.setType(LiveRoomMsgConstants.MIC_RESPONSE_AGREE);
+//                sendMessage(rcUserSeatResponseMessage, false);
+//            }
+//            return;
+//        }
+//        if (action == LiveRoomMsgConstants.ACTION_CANCEL_ON_MIC_BY_TEACHER) {
+//            //主讲人将观众抱下麦
+//            Object param = params[0];
+//            if (param instanceof User) {
+//                User user = (User) param;
+//                RCUserSeatApplyMessage seatApplyMessage = new RCUserSeatApplyMessage();
+//                seatApplyMessage.setTeacherId(UserHelper.getImUserId());
+//                seatApplyMessage.setTeacherName(UserHelper.getUserName());
+//                seatApplyMessage.setAudienceId(user.getUserId());
+//                seatApplyMessage.setAudienceName(user.getUserName());
+//                seatApplyMessage.setType(LiveRoomMsgConstants.MIC_ACTION_CANCEL_SEAT_BY_CREATE);
+//                sendMessage(seatApplyMessage, false);
+//            }
+//            return;
+//        }
+//
+//        if (action == LiveRoomMsgConstants.ACTION_SWITCH_MIC_MODE) {
+//            //切换连麦模式
+//            boolean isEnable = (boolean) params[0];
+//            RCUserSeatsCtrlMessage rcUserSeatsCtrlMessage = new RCUserSeatsCtrlMessage();
+//            rcUserSeatsCtrlMessage.setUserId(UserHelper.getImUserId());
+//            rcUserSeatsCtrlMessage.setUserName(UserHelper.getUserName());
+//            rcUserSeatsCtrlMessage.setSeatBan(isEnable);
+//            sendMessage(rcUserSeatsCtrlMessage, false);
+//            return;
+//        }
+//
+//        if (action == LiveRoomMsgConstants.ACTION_SEND_ADD_LIKE_COUNT) {
+//            //发送点赞数量总数
+//            int count = (int) params[0];
+//            RCUserSyncAddLikeCountMessage syncAddLikeCountMessage = new RCUserSyncAddLikeCountMessage();
+//            syncAddLikeCountMessage.setCount(count);
+//            sendMessage(syncAddLikeCountMessage, false);
+//            return;
+//        }
+//
+//        if (action == LiveRoomMsgConstants.ACTION_SEND_PAUSE_LIVE) {
+//            //暂停直播消息
+//            RCPauseLiveMessage pauseLiveMessage = new RCPauseLiveMessage();
+//            sendMessage(pauseLiveMessage, false);
+//            return;
+//        }
+//
+//        if (action == LiveRoomMsgConstants.ACTION_SEND_REFUSE_ALL_MIC_APPLY_MSG) {
+//            //发送拒绝全部连麦申请消息
+//            RCLiveRefuseAllMicApplyMessage rcLiveRefuseAllMicApplyMessage = new RCLiveRefuseAllMicApplyMessage();
+//            sendMessage(rcLiveRefuseAllMicApplyMessage, false);
+//            return;
+//        }
+//
+//        if (action == LiveRoomMsgConstants.ACTION_SEND_UNDER_ALL_MIC_MSG) {
+//            //发送全部下麦消息
+//            RCLiveUnderAllMicMessage rcLiveUnderAllMicMessage = new RCLiveUnderAllMicMessage();
+//            sendMessage(rcLiveUnderAllMicMessage, false);
+//            return;
+//        }
+//        if (action == LiveRoomMsgConstants.ACTION_SEND_JOIN_ROOM) {
+//            //老师端暂时不发送加入房间消息
+//            //发送加入房间成功消息
+////            RCChatJoinRoomMessage rcChatJoinRoomMessage = new RCChatJoinRoomMessage();
+////            sendMessage(rcChatJoinRoomMessage, false);
+//            return;
+//        }
+//    }
+//
+//    /**
+//     * 加入房间
+//     *
+//     * @param roomId
+//     * @param isCreate
+//     */
+//    private void joinRoom(String roomId, boolean isCreate) {
+//        //如果是观众就直接加入房间
+//        Log.i("pq", "joinRoom");
+//        LiveEventHelper.getInstance().joinRoom(roomId, RCRTCLiveRole.BROADCASTER, new ClickCallback<Boolean>() {
+//            @Override
+//            public void onResult(Boolean result, String msg) {
+//                Log.i("pq", "joinRoom onResult:" + result);
+//                if (result) {
+//                    setCurrentRoom(currentRoomInfo);
+//                } else {
+//                    //加入直播房间失败
+//                    if (getView() != null) {
+//                        getView().showFinishView();
+//                    }
+//                    leaveRoom();
+//                }
+//            }
+//        });
+//    }
+//
+//    /**
+//     * 设置当前房间
+//     *
+//     * @param roomInfo
+//     */
+//    public void setCurrentRoom(LiveRoomInfoBean roomInfo) {
+//        initLiveRoomListener(roomInfo.roomUid);
+//        //设置创建者id
+//        LiveEventHelper.getInstance().setCreateUserId(roomInfo.speakerId);
+////        getShield();获取敏感词汇
+//        if (getView() != null) {
+//            getView().setRoomData(currentRoomInfo);
+//        }
+//    }
+//
+//    /**
+//     * 加入房间后,开始摄像头采集并发布音视频流。
+//     */
+//    public void startPublish() {
+//        RCRTCRoom rcrtcRoom = LiveEventHelper.getInstance().getRtcRoom();
+//        if (rcrtcRoom == null) {
+//            return;
+//        }
+//        boolean frontCamera = RCRTCEngine.getInstance().getDefaultVideoStream().isFrontCamera();
+//        RCRTCEngine.getInstance().getDefaultVideoStream().setPreviewMirror(frontCamera);
+//        RCRTCEngine.getInstance().getDefaultVideoStream().startCamera(null);
+//        if (rcrtcRoom.getLocalUser() == null) {
+//            return;
+//        }
+//        rcrtcRoom.getLocalUser().publishDefaultLiveStreams(new IRCRTCResultDataCallback<RCRTCLiveInfo>() {
+//            @Override
+//            public void onSuccess(RCRTCLiveInfo liveInfo) {
+//                if (getView() != null) {
+//                    getView().onPublishSuccess();
+//                }
+//            }
+//
+//            @Override
+//            public void onFailed(RTCErrorCode code) {
+//                Log.i("pq", "publishDefaultLiveStreamError:" + code);
+//            }
+//        });
+//    }
+//
+//    /**
+//     * 设置直播房的各种监听
+//     *
+//     * @param roomId
+//     */
+//    public void initLiveRoomListener(String roomId) {
+//        LiveEventHelper.getInstance().getRtcRoom().registerRoomListener(mRoomEventsListener);
+//        //添加消息监听
+//    }
+//
+//    /**
+//     * 进入房间后发送默认的消息
+//     */
+//    public void sendDefaultMessage() {
+//        if (currentRoomInfo != null) {
+//            RCChatroomLocationMessage tips = new RCChatroomLocationMessage();
+//            tips.setContent("欢迎进入直播课堂,请遵守相关法规,禁止传播低俗、暴力等不良信息。为孩子创造健康绿色的学习环境。");
+//            sendMessage(tips);
+//        }
+//    }
+//
+//    /**
+//     * 发送消息
+//     * 默认显示在本地
+//     *
+//     * @param messageContent
+//     */
+//    public void sendMessage(MessageContent messageContent) {
+//        sendMessage(messageContent, true);
+//    }
+//
+//    /**
+//     * 发送消息
+//     *
+//     * @param messageContent 消息体
+//     * @param isShowLocation 是否显示在本地
+//     */
+//    public void sendMessage(MessageContent messageContent, boolean isShowLocation) {
+//        if (!isContainsShield(messageContent)) {
+//            LiveEventHelper.getInstance().sendMessage(messageContent, isShowLocation);
+//        }
+//    }
+//
+//    /**
+//     * 是否包含屏蔽词
+//     *
+//     * @return
+//     */
+//    private boolean isContainsShield(MessageContent messageContent) {
+//        boolean isContains = false;
+////        if (shields != null) {
+////            for (String shield : shields) {
+////                if (messageContent instanceof RCChatroomBarrage) {
+////                    if (((RCChatroomBarrage) messageContent).getContent().contains(shield)) {
+////                        isContains = true;
+////                        break;
+////                    }
+////                }
+////            }
+////            if (isContains) {
+////                //如果是包含了敏感词'
+////                mView.addMessageContent(messageContent, false);
+////                return true;
+////            }
+////        }
+//        return false;
+//    }
+//
+//
+//    /**
+//     * 获得当前房间所有的视频流和音频流
+//     */
+//    public void getAllStreams(List<RCRTCVideoOutputStream> outputStreams, List<RCRTCVideoInputStream> inputStreams, List<RCRTCAudioInputStream> audioinputstream, List<RCRTCAudioOutputStream> audioOutputStreams) {
+//        RCRTCRoom mRtcRoom = LiveEventHelper.getInstance().getRtcRoom();
+//        if (mRtcRoom == null) {
+//            return;
+//        }
+//        for (final RCRTCRemoteUser remoteUser : mRtcRoom.getRemoteUsers()) {
+//            if (remoteUser.getStreams().size() == 0) {
+//                continue;
+//            }
+//            List<RCRTCInputStream> userStreams = remoteUser.getStreams();
+//            for (RCRTCInputStream i : userStreams) {
+//                if (i.getMediaType() == RCRTCMediaType.VIDEO) {
+//                    inputStreams.add((RCRTCVideoInputStream) i);
+//                }
+//                if (i.getMediaType() == RCRTCMediaType.AUDIO) {
+//                    audioinputstream.add((RCRTCAudioInputStream) i);
+//                }
+//            }
+//        }
+//
+//        for (RCRTCOutputStream o : mRtcRoom.getLocalUser().getStreams()) {
+//            if (o.getMediaType() == RCRTCMediaType.VIDEO) {
+//                outputStreams.add((RCRTCVideoOutputStream) o);
+//            }
+//            if (o.getMediaType() == RCRTCMediaType.AUDIO) {
+//                audioOutputStreams.add((RCRTCAudioOutputStream) o);
+//            }
+//        }
+//    }
+//
+//    /**
+//     * 获取房间所有的音频流
+//     *
+//     * @param audioinputstream
+//     * @param audioOutputStreams
+//     */
+//    public void getAudioStreams(List<RCRTCAudioInputStream> audioinputstream, List<RCRTCAudioOutputStream> audioOutputStreams) {
+//        RCRTCRoom mRtcRoom = LiveEventHelper.getInstance().getRtcRoom();
+//        if (mRtcRoom == null) {
+//            return;
+//        }
+//
+//        for (final RCRTCRemoteUser remoteUser : mRtcRoom.getRemoteUsers()) {
+//            if (remoteUser.getStreams().size() == 0) {
+//                continue;
+//            }
+//            List<RCRTCInputStream> userStreams = remoteUser.getStreams();
+//            for (RCRTCInputStream i : userStreams) {
+//                if (i.getMediaType() == RCRTCMediaType.AUDIO) {
+//                    audioinputstream.add((RCRTCAudioInputStream) i);
+//                }
+//            }
+//        }
+//
+//        for (RCRTCOutputStream o : mRtcRoom.getLocalUser().getStreams()) {
+//            if (o.getMediaType() == RCRTCMediaType.AUDIO) {
+//                audioOutputStreams.add((RCRTCAudioOutputStream) o);
+//            }
+//        }
+//    }
+//
+//    /**
+//     * 离开房间
+//     */
+//    public void leaveRoom() {
+//        LiveEventHelper.getInstance().leaveRoom(new IRoomCallBack() {
+//            @Override
+//            public void onSuccess() {
+//            }
+//
+//            @Override
+//            public void onError(int code, String message) {
+//            }
+//        });
+//    }
+//
+//    /**
+//     * 监听接收房间的所有信息
+//     *
+//     * @param roomId
+//     */
+//    public void setObMessageListener(String roomId) {
+//        if (disposablesManager.size() != 0) {
+//            return;
+//        }
+//        Disposable subscribe = RCChatRoomMessageManager.
+//                obMessageReceiveByRoomId(roomId)
+//                .observeOn(AndroidSchedulers.mainThread())
+//                .subscribe(new Consumer<Message>() {
+//                    @Override
+//                    public void accept(Message message) {
+//                        //将消息显示到列表上
+//                        if (LiveEventHelper.getInstance().isShowingMessage(message.getContent())) {
+//                            if (null != getView()) {
+//                                getView().addMessageContent(message, false);
+//                            }
+//                        }
+//                        if (TextUtils.equals(message.getObjectName(), LiveRoomMsgConstants.TAG_CHAT_ROOM_ENTER)) {
+//                            //加入房间消息
+//                            if (null != getView() && message.getContent() != null) {
+//                                RCChatJoinRoomMessage joinRoomMessage = (RCChatJoinRoomMessage) message.getContent();
+//                                getView().receiveJoinMessage(joinRoomMessage);
+//                            }
+//                            return;
+//                        }
+//
+//                        if (TextUtils.equals(message.getObjectName(), LiveRoomMsgConstants.TAG_LIVE_ON_SNAP_UP)) {
+//                            //抢购消息
+//                            if (null != getView() && message.getContent() != null) {
+//                                RCOnSnappingUpMessage rcOnSnappingUpMessage = (RCOnSnappingUpMessage) message.getContent();
+//                                getView().receiveSnapUpMessage(rcOnSnappingUpMessage);
+//                            }
+//                            return;
+//                        }
+//
+//                        if (TextUtils.equals(message.getObjectName(), LiveRoomMsgConstants.TAG_CHAT_ROOM_ADD_LIKE)) {
+//                            if (message.getContent() != null) {
+//                                RCUserAddLikeMessage addLikeMessage = (RCUserAddLikeMessage) message.getContent();
+//                                if (getView() != null) {
+//                                    getView().onAddLikeMessage(addLikeMessage);
+//                                }
+//                            }
+//                            return;
+//                        }
+//                        if (TextUtils.equals(message.getObjectName(), LiveRoomMsgConstants.TAG_CHAT_ROOM_SEAT_APPLY)) {
+//                            //学生连麦申请
+//                            if (message.getContent() != null) {
+//                                RCUserSeatApplyMessage rcUserSeatApplyMessage = (RCUserSeatApplyMessage) message.getContent();
+//                                if (getView() != null) {
+//                                    getView().onSeatApplyMessage(rcUserSeatApplyMessage);
+//                                }
+//                            }
+//                            return;
+//                        }
+//
+//                        if (TextUtils.equals(message.getObjectName(), LiveRoomMsgConstants.TAG_LIVE_MEMBER_COUNT_SYNC)) {
+//                            //同步成员数量
+//                            if (message.getContent() != null && null != getView()) {
+//                                RCChatRoomMemberNumMessage rcChatRoomMemberNumMessage = (RCChatRoomMemberNumMessage) message.getContent();
+//                                getView().syncMemberCount(rcChatRoomMemberNumMessage.getCount());
+//                            }
+//                            return;
+//                        }
+//
+//                        if (TextUtils.equals(message.getObjectName(), LiveRoomMsgConstants.TAG_LIVE_FINISH_MSG)) {
+//                            //关闭直播间
+//                            if (null != getView()) {
+//                                getView().liveRoomOffline();
+//                            }
+//                            return;
+//                        }
+//
+//                        if (TextUtils.equals(message.getObjectName(), LiveRoomMsgConstants.TAG_LIVE_LEAVE_MSG)) {
+//                            //用户离开直播间消息
+//                            if (message.getContent() != null && null != getView()) {
+//                                RCUserLeaveRoomMessage leaveRoomMessage = (RCUserLeaveRoomMessage) message.getContent();
+//                                String userId = leaveRoomMessage.getUserId();
+//                                getView().onUserLeaveRoom(!TextUtils.isEmpty(userId) ? userId : getUserIdFromMessage(message));
+//                                return;
+//                            }
+//                            return;
+//                        }
+//                    }
+//                });
+//        disposablesManager.add(subscribe);
+//    }
+//
+//    private String getUserIdFromMessage(Message message) {
+//        String userId = "";
+//        if (message.getContent() != null && message.getContent().getUserInfo() != null) {
+//            userId = message.getContent().getUserInfo().getUserId();
+//        }
+//        if (TextUtils.isEmpty(userId)) {
+//            userId = message.getSenderUserId();
+//        }
+//        return userId;
+//    }
+//
+//    public void joinChartRoom(String chatroomId, final IRongCoreCallback.OperationCallback callback) {
+//        LiveEventHelper.getInstance().joinChatRoom(chatroomId, callback);
+//    }
+//
+//    /**
+//     * 连接融云IM
+//     *
+//     * @param
+//     */
+//    public void connectIM() {
+//        String imtoken = UserHelper.getUserIMToken();
+//        Log.i("pq", "im未连接,token:" + imtoken);
+//        if (TextUtils.isEmpty(imtoken)) {
+//            return;
+//        }
+//        if (getView() != null) {
+//            getView().showLoading();
+//        }
+//        IMCenter.getInstance().connect(imtoken, new RongIMClient.ConnectCallback() {
+//            @Override
+//            public void onSuccess(String t) {
+//                Log.i("pq", "连接成功");
+//            }
+//
+//            @Override
+//            public void onError(RongIMClient.ConnectionErrorCode e) {
+//                Log.i("pq", "connect error" + e);
+//            }
+//
+//            @Override
+//            public void onDatabaseOpened(RongIMClient.DatabaseOpenStatus code) {
+//
+//            }
+//        });
+//    }
+//
+//    @Override
+//    public void notifyJoinRoomAction(String roomId, String userId) {
+//        //主进程调用,因为BaseObserver onStart show了loading控件,防止在子线程创建
+//        addSubscribe(create(APIService.class).notifyJoinRoomAction(roomId, userId), new DisposableObserver() {
+//            @Override
+//            public void onNext(Object o) {
+//                //通知服务端加入成功即可,无须关注结果
+//            }
+//
+//            @Override
+//            public void onError(Throwable e) {
+//                e.printStackTrace();
+//            }
+//
+//            @Override
+//            public void onComplete() {
+//
+//            }
+//        });
+//    }
+//
+//    public void syncMicMode(String roomId, int micMode) {
+//        create(APIService.class).syncMicMode(roomId, micMode)
+//                .subscribeOn(Schedulers.io())
+//                .observeOn(AndroidSchedulers.mainThread())
+//                .subscribe(new Observer<BaseResponse<Object>>() {
+//                    @Override
+//                    public void onSubscribe(Disposable d) {
+//
+//                    }
+//
+//                    @Override
+//                    public void onNext(BaseResponse<Object> objectBaseResponse) {
+//                        //通知服务端离开即可,无须关注结果
+//                    }
+//
+//                    @Override
+//                    public void onError(Throwable e) {
+//
+//                    }
+//
+//                    @Override
+//                    public void onComplete() {
+//                        //通知服务端离开即可,无须关注结果
+//                    }
+//                });
+//    }
+//
+//    /**
+//     * 通知服务端离开直播间
+//     */
+//    @Override
+//    public void notifyLeaveRoomAction() {
+//        handleAction(LiveRoomMsgConstants.ACTION_SEND_LEAVE_ROOM);
+//        ImUserState imUserState = new ImUserState();
+//        imUserState.setStatus(ImUserState.ACTION_LEAVE_LIVE_ROOM);
+//        imUserState.setUserid(UserHelper.getUserId());
+//        ArrayList<ImUserState> imUserStates = new ArrayList();
+//        imUserStates.add(imUserState);
+//        RequestBody body = RequestBodyUtil.convertToRequestBodyJson(new Gson().toJson(imUserStates));
+//        create(APIService.class).notifyLeaveRoomAction(body)
+//                .subscribeOn(Schedulers.io())
+//                .observeOn(AndroidSchedulers.mainThread())
+//                .subscribe(new Observer<BaseResponse<Object>>() {
+//                    @Override
+//                    public void onSubscribe(Disposable d) {
+//
+//                    }
+//
+//                    @Override
+//                    public void onNext(BaseResponse<Object> objectBaseResponse) {
+//                        //通知服务端离开即可,无须关注结果
+//                    }
+//
+//                    @Override
+//                    public void onError(Throwable e) {
+//
+//                    }
+//
+//                    @Override
+//                    public void onComplete() {
+//                        //通知服务端离开即可,无须关注结果
+//                    }
+//                });
+//    }
+//
+//
+//    /**
+//     * 通知(开启/关闭)直播间录像
+//     *
+//     * @param roomId
+//     * @param type
+//     * @param userId
+//     */
+//    public void notifyOpenOpsLiveVideoAction(String roomId, String type, String userId) {
+//        addSubscribe(create(APIService.class).notifyOpenOpsLiveVideoAction(roomId, type, userId, "1080x1920"), new DisposableObserver() {
+//            @Override
+//            public void onNext(Object o) {
+//                //通知服务端加入成功即可,无须关注结果
+//            }
+//
+//            @Override
+//            public void onError(Throwable e) {
+//                e.printStackTrace();
+//            }
+//
+//            @Override
+//            public void onComplete() {
+//
+//            }
+//        });
+//    }
+//
+//    /**
+//     * 通知关闭直播间
+//     *
+//     * @param roomId
+//     */
+//    public void notifyCloseLiveRoomAction(String roomId) {
+//        addSubscribe(create(APIService.class).notifyCloseLiveRoomAction(roomId), new DisposableObserver() {
+//            @Override
+//            public void onNext(Object o) {
+//                //通知服务端加入成功即可,无须关注结果
+//            }
+//
+//            @Override
+//            public void onError(Throwable e) {
+//                e.printStackTrace();
+//            }
+//
+//            @Override
+//            public void onComplete() {
+//
+//            }
+//        });
+//    }
+//
+//    /**
+//     * 同步点赞数量
+//     *
+//     * @param addLikeNum
+//     * @param roomUid
+//     */
+//    public void syncAddLikeNum(String addLikeNum, String roomUid) {
+//        addSubscribe(create(APIService.class).syncAddLikeNum(addLikeNum, roomUid), new DisposableObserver() {
+//            @Override
+//            public void onNext(Object o) {
+//
+//            }
+//
+//            @Override
+//            public void onError(Throwable e) {
+//
+//            }
+//
+//            @Override
+//            public void onComplete() {
+//
+//            }
+//        });
+//    }
+//
+//    public void subscribeTargetStream(final String userId, List<RCRTCInputStream> list, final ResultCallback<String> callback) {
+//        RCRTCRoom rcrtcRoom = LiveEventHelper.getInstance().getRtcRoom();
+//        if (rcrtcRoom == null) {
+//            Log.i("pq", "unSubscribeStream failed , rcrtcRoom is null");
+//            if (callback != null) {
+//                callback.onFail(ErrorCode.RTC_ERROR.getCode(), null);
 //            }
 //            }
-//            if (isContains) {
-//                //如果是包含了敏感词'
-//                mView.addMessageContent(messageContent, false);
-//                return true;
+//            return;
+//        }
+//        rcrtcRoom.getLocalUser().subscribeStreams(list, new IRCRTCResultCallback() {
+//            @Override
+//            public void onSuccess() {
+//                if (callback != null) {
+//                    callback.onSuccess("");
+//                }
+//            }
+//
+//            @Override
+//            public void onFailed(RTCErrorCode errorCode) {
+//                if (callback != null) {
+//                    callback.onFail(errorCode.getValue(), errorCode.getReason());
+//                }
 //            }
 //            }
+//        });
+//    }
+//
+//    /**
+//     * 取消订阅指定的流
+//     *
+//     * @param userId
+//     */
+//    public void unSubscribeStream(final String userId, final ResultCallback<String> callback) {
+//        RCRTCRoom rcrtcRoom = LiveEventHelper.getInstance().getRtcRoom();
+//        if (rcrtcRoom == null) {
+//            Log.i("pq", "unSubscribeStream failed , rcrtcRoom is null");
+//            if (callback != null) {
+//                callback.onFail(ErrorCode.RTC_ERROR.getCode(), null);
+//            }
+//            return;
+//        }
+//        RCRTCRemoteUser remoteUser = rcrtcRoom.getRemoteUser(userId);
+//
+//        if (remoteUser == null || remoteUser.getStreams() == null) {
+//            Log.i("pq", "unSubscribeStream failed , remoteUser  = " + remoteUser);
+//            if (callback != null) {
+//                callback.onFail(ErrorCode.RTC_ERROR.getCode(), null);
+//            }
+//            return;
 //        }
 //        }
-        return false;
-    }
-
-
-    /**
-     * 获得当前房间所有的视频流和音频流
-     */
-    public void getAllStreams(List<RCRTCVideoOutputStream> outputStreams, List<RCRTCVideoInputStream> inputStreams, List<RCRTCAudioInputStream> audioinputstream, List<RCRTCAudioOutputStream> audioOutputStreams) {
-        RCRTCRoom mRtcRoom = LiveEventHelper.getInstance().getRtcRoom();
-        if (mRtcRoom == null) {
-            return;
-        }
-        for (final RCRTCRemoteUser remoteUser : mRtcRoom.getRemoteUsers()) {
-            if (remoteUser.getStreams().size() == 0) {
-                continue;
-            }
-            List<RCRTCInputStream> userStreams = remoteUser.getStreams();
-            for (RCRTCInputStream i : userStreams) {
-                if (i.getMediaType() == RCRTCMediaType.VIDEO) {
-                    inputStreams.add((RCRTCVideoInputStream) i);
-                }
-                if (i.getMediaType() == RCRTCMediaType.AUDIO) {
-                    audioinputstream.add((RCRTCAudioInputStream) i);
-                }
-            }
-        }
-
-        for (RCRTCOutputStream o : mRtcRoom.getLocalUser().getStreams()) {
-            if (o.getMediaType() == RCRTCMediaType.VIDEO) {
-                outputStreams.add((RCRTCVideoOutputStream) o);
-            }
-            if (o.getMediaType() == RCRTCMediaType.AUDIO) {
-                audioOutputStreams.add((RCRTCAudioOutputStream) o);
-            }
-        }
-    }
-
-    /**
-     * 获取房间所有的音频流
-     *
-     * @param audioinputstream
-     * @param audioOutputStreams
-     */
-    public void getAudioStreams(List<RCRTCAudioInputStream> audioinputstream, List<RCRTCAudioOutputStream> audioOutputStreams) {
-        RCRTCRoom mRtcRoom = LiveEventHelper.getInstance().getRtcRoom();
-        if (mRtcRoom == null) {
-            return;
-        }
-
-        for (final RCRTCRemoteUser remoteUser : mRtcRoom.getRemoteUsers()) {
-            if (remoteUser.getStreams().size() == 0) {
-                continue;
-            }
-            List<RCRTCInputStream> userStreams = remoteUser.getStreams();
-            for (RCRTCInputStream i : userStreams) {
-                if (i.getMediaType() == RCRTCMediaType.AUDIO) {
-                    audioinputstream.add((RCRTCAudioInputStream) i);
-                }
-            }
-        }
-
-        for (RCRTCOutputStream o : mRtcRoom.getLocalUser().getStreams()) {
-            if (o.getMediaType() == RCRTCMediaType.AUDIO) {
-                audioOutputStreams.add((RCRTCAudioOutputStream) o);
-            }
-        }
-    }
-
-    /**
-     * 离开房间
-     */
-    public void leaveRoom() {
-        LiveEventHelper.getInstance().leaveRoom(new IRoomCallBack() {
-            @Override
-            public void onSuccess() {
-            }
-
-            @Override
-            public void onError(int code, String message) {
-            }
-        });
-    }
-
-    /**
-     * 监听接收房间的所有信息
-     *
-     * @param roomId
-     */
-    public void setObMessageListener(String roomId) {
-        if (disposablesManager.size() != 0) {
-            return;
-        }
-        Disposable subscribe = RCChatRoomMessageManager.
-                obMessageReceiveByRoomId(roomId)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Consumer<Message>() {
-                    @Override
-                    public void accept(Message message) {
-                        //将消息显示到列表上
-                        if (LiveEventHelper.getInstance().isShowingMessage(message.getContent())) {
-                            if (null != getView()) {
-                                getView().addMessageContent(message, false);
-                            }
-                        }
-                        if (TextUtils.equals(message.getObjectName(), LiveRoomMsgConstants.TAG_CHAT_ROOM_ENTER)) {
-                            //加入房间消息
-                            if (null != getView() && message.getContent() != null) {
-                                RCChatJoinRoomMessage joinRoomMessage = (RCChatJoinRoomMessage) message.getContent();
-                                getView().receiveJoinMessage(joinRoomMessage);
-                            }
-                            return;
-                        }
-
-                        if (TextUtils.equals(message.getObjectName(), LiveRoomMsgConstants.TAG_LIVE_ON_SNAP_UP)) {
-                            //抢购消息
-                            if (null != getView() && message.getContent() != null) {
-                                RCOnSnappingUpMessage rcOnSnappingUpMessage = (RCOnSnappingUpMessage) message.getContent();
-                                getView().receiveSnapUpMessage(rcOnSnappingUpMessage);
-                            }
-                            return;
-                        }
-
-                        if (TextUtils.equals(message.getObjectName(), LiveRoomMsgConstants.TAG_CHAT_ROOM_ADD_LIKE)) {
-                            if (message.getContent() != null) {
-                                RCUserAddLikeMessage addLikeMessage = (RCUserAddLikeMessage) message.getContent();
-                                if (getView() != null) {
-                                    getView().onAddLikeMessage(addLikeMessage);
-                                }
-                            }
-                            return;
-                        }
-                        if (TextUtils.equals(message.getObjectName(), LiveRoomMsgConstants.TAG_CHAT_ROOM_SEAT_APPLY)) {
-                            //学生连麦申请
-                            if (message.getContent() != null) {
-                                RCUserSeatApplyMessage rcUserSeatApplyMessage = (RCUserSeatApplyMessage) message.getContent();
-                                if (getView() != null) {
-                                    getView().onSeatApplyMessage(rcUserSeatApplyMessage);
-                                }
-                            }
-                            return;
-                        }
-
-                        if (TextUtils.equals(message.getObjectName(), LiveRoomMsgConstants.TAG_LIVE_MEMBER_COUNT_SYNC)) {
-                            //同步成员数量
-                            if (message.getContent() != null && null != getView()) {
-                                RCChatRoomMemberNumMessage rcChatRoomMemberNumMessage = (RCChatRoomMemberNumMessage) message.getContent();
-                                getView().syncMemberCount(rcChatRoomMemberNumMessage.getCount());
-                            }
-                            return;
-                        }
-
-                        if (TextUtils.equals(message.getObjectName(), LiveRoomMsgConstants.TAG_LIVE_FINISH_MSG)) {
-                            //关闭直播间
-                            if (null != getView()) {
-                                getView().liveRoomOffline();
-                            }
-                            return;
-                        }
-
-                        if (TextUtils.equals(message.getObjectName(), LiveRoomMsgConstants.TAG_LIVE_LEAVE_MSG)) {
-                            //用户离开直播间消息
-                            if (message.getContent() != null && null != getView()) {
-                                RCUserLeaveRoomMessage leaveRoomMessage = (RCUserLeaveRoomMessage) message.getContent();
-                                String userId = leaveRoomMessage.getUserId();
-                                getView().onUserLeaveRoom(!TextUtils.isEmpty(userId) ? userId : getUserIdFromMessage(message));
-                                return;
-                            }
-                            return;
-                        }
-                    }
-                });
-        disposablesManager.add(subscribe);
-    }
-
-    private String getUserIdFromMessage(Message message) {
-        String userId = "";
-        if (message.getContent() != null && message.getContent().getUserInfo() != null) {
-            userId = message.getContent().getUserInfo().getUserId();
-        }
-        if (TextUtils.isEmpty(userId)) {
-            userId = message.getSenderUserId();
-        }
-        return userId;
-    }
-
-    public void joinChartRoom(String chatroomId, final IRongCoreCallback.OperationCallback callback) {
-        LiveEventHelper.getInstance().joinChatRoom(chatroomId, callback);
-    }
-
-    /**
-     * 连接融云IM
-     *
-     * @param
-     */
-    public void connectIM() {
-        String imtoken = UserHelper.getUserIMToken();
-        Log.i("pq", "im未连接,token:" + imtoken);
-        if (TextUtils.isEmpty(imtoken)) {
-            return;
-        }
-        if (getView() != null) {
-            getView().showLoading();
-        }
-        IMCenter.getInstance().connect(imtoken, new RongIMClient.ConnectCallback() {
-            @Override
-            public void onSuccess(String t) {
-                Log.i("pq", "连接成功");
-            }
-
-            @Override
-            public void onError(RongIMClient.ConnectionErrorCode e) {
-                Log.i("pq", "connect error" + e);
-            }
-
-            @Override
-            public void onDatabaseOpened(RongIMClient.DatabaseOpenStatus code) {
-
-            }
-        });
-    }
-
-    @Override
-    public void notifyJoinRoomAction(String roomId, String userId) {
-        //主进程调用,因为BaseObserver onStart show了loading控件,防止在子线程创建
-        addSubscribe(create(APIService.class).notifyJoinRoomAction(roomId, userId), new DisposableObserver() {
-            @Override
-            public void onNext(Object o) {
-                //通知服务端加入成功即可,无须关注结果
-            }
-
-            @Override
-            public void onError(Throwable e) {
-                e.printStackTrace();
-            }
-
-            @Override
-            public void onComplete() {
-
-            }
-        });
-    }
-
-    public void syncMicMode(String roomId, int micMode) {
-        create(APIService.class).syncMicMode(roomId, micMode)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<BaseResponse<Object>>() {
-                    @Override
-                    public void onSubscribe(Disposable d) {
-
-                    }
-
-                    @Override
-                    public void onNext(BaseResponse<Object> objectBaseResponse) {
-                        //通知服务端离开即可,无须关注结果
-                    }
-
-                    @Override
-                    public void onError(Throwable e) {
-
-                    }
-
-                    @Override
-                    public void onComplete() {
-                        //通知服务端离开即可,无须关注结果
-                    }
-                });
-    }
-
-    /**
-     * 通知服务端离开直播间
-     */
-    @Override
-    public void notifyLeaveRoomAction() {
-        handleAction(LiveRoomMsgConstants.ACTION_SEND_LEAVE_ROOM);
-        ImUserState imUserState = new ImUserState();
-        imUserState.setStatus(ImUserState.ACTION_LEAVE_LIVE_ROOM);
-        imUserState.setUserid(UserHelper.getUserId());
-        ArrayList<ImUserState> imUserStates = new ArrayList();
-        imUserStates.add(imUserState);
-        RequestBody body = RequestBodyUtil.convertToRequestBodyJson(new Gson().toJson(imUserStates));
-        create(APIService.class).notifyLeaveRoomAction(body)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<BaseResponse<Object>>() {
-                    @Override
-                    public void onSubscribe(Disposable d) {
-
-                    }
-
-                    @Override
-                    public void onNext(BaseResponse<Object> objectBaseResponse) {
-                        //通知服务端离开即可,无须关注结果
-                    }
-
-                    @Override
-                    public void onError(Throwable e) {
-
-                    }
-
-                    @Override
-                    public void onComplete() {
-                        //通知服务端离开即可,无须关注结果
-                    }
-                });
-    }
-
-
-    /**
-     * 通知(开启/关闭)直播间录像
-     *
-     * @param roomId
-     * @param type
-     * @param userId
-     */
-    public void notifyOpenOpsLiveVideoAction(String roomId, String type, String userId) {
-        addSubscribe(create(APIService.class).notifyOpenOpsLiveVideoAction(roomId, type, userId, "1080x1920"), new DisposableObserver() {
-            @Override
-            public void onNext(Object o) {
-                //通知服务端加入成功即可,无须关注结果
-            }
-
-            @Override
-            public void onError(Throwable e) {
-                e.printStackTrace();
-            }
-
-            @Override
-            public void onComplete() {
-
-            }
-        });
-    }
-
-    /**
-     * 通知关闭直播间
-     *
-     * @param roomId
-     */
-    public void notifyCloseLiveRoomAction(String roomId) {
-        addSubscribe(create(APIService.class).notifyCloseLiveRoomAction(roomId), new DisposableObserver() {
-            @Override
-            public void onNext(Object o) {
-                //通知服务端加入成功即可,无须关注结果
-            }
-
-            @Override
-            public void onError(Throwable e) {
-                e.printStackTrace();
-            }
-
-            @Override
-            public void onComplete() {
-
-            }
-        });
-    }
-
-    /**
-     * 同步点赞数量
-     *
-     * @param addLikeNum
-     * @param roomUid
-     */
-    public void syncAddLikeNum(String addLikeNum, String roomUid) {
-        addSubscribe(create(APIService.class).syncAddLikeNum(addLikeNum, roomUid), new DisposableObserver() {
-            @Override
-            public void onNext(Object o) {
-
-            }
-
-            @Override
-            public void onError(Throwable e) {
-
-            }
-
-            @Override
-            public void onComplete() {
-
-            }
-        });
-    }
-
-    public void subscribeTargetStream(final String userId, List<RCRTCInputStream> list, final ResultCallback<String> callback) {
-        RCRTCRoom rcrtcRoom = LiveEventHelper.getInstance().getRtcRoom();
-        if (rcrtcRoom == null) {
-            Log.i("pq", "unSubscribeStream failed , rcrtcRoom is null");
-            if (callback != null) {
-                callback.onFail(ErrorCode.RTC_ERROR.getCode(), null);
-            }
-            return;
-        }
-        rcrtcRoom.getLocalUser().subscribeStreams(list, new IRCRTCResultCallback() {
-            @Override
-            public void onSuccess() {
-                if (callback != null) {
-                    callback.onSuccess("");
-                }
-            }
-
-            @Override
-            public void onFailed(RTCErrorCode errorCode) {
-                if (callback != null) {
-                    callback.onFail(errorCode.getValue(), errorCode.getReason());
-                }
-            }
-        });
-    }
-
-    /**
-     * 取消订阅指定的流
-     *
-     * @param userId
-     */
-    public void unSubscribeStream(final String userId, final ResultCallback<String> callback) {
-        RCRTCRoom rcrtcRoom = LiveEventHelper.getInstance().getRtcRoom();
-        if (rcrtcRoom == null) {
-            Log.i("pq", "unSubscribeStream failed , rcrtcRoom is null");
-            if (callback != null) {
-                callback.onFail(ErrorCode.RTC_ERROR.getCode(), null);
-            }
-            return;
-        }
-        RCRTCRemoteUser remoteUser = rcrtcRoom.getRemoteUser(userId);
-
-        if (remoteUser == null || remoteUser.getStreams() == null) {
-            Log.i("pq", "unSubscribeStream failed , remoteUser  = " + remoteUser);
-            if (callback != null) {
-                callback.onFail(ErrorCode.RTC_ERROR.getCode(), null);
-            }
-            return;
-        }
-
-        List<RCRTCInputStream> inputStreams = remoteUser.getStreams();
-        Log.i("pq", "unSubscribeStream , inputStreams  = " + inputStreams);
-        rcrtcRoom.getLocalUser().unsubscribeStreams(inputStreams, new IRCRTCResultCallback() {
-            @Override
-            public void onSuccess() {
-                Log.i("pq", "unSubscribeStream success,user = " + userId);
-                if (callback != null) {
-                    callback.onSuccess(userId);
-                }
-            }
-
-            @Override
-            public void onFailed(RTCErrorCode rtcErrorCode) {
-                Log.i("pq", "unSubscribeStream  error - " + rtcErrorCode.getReason());
-                if (callback != null) {
-                    callback.onFail(ErrorCode.RTC_ERROR.getCode(), null);
-                }
-            }
-        });
-
-    }
-
-    public void getUserInfoByUserId(String userId) {
-        addSubscribe(create(TeacherAPIService.class).queryFriendDetail(userId), new DisposableObserver<BaseResponse<FriendInfoBean>>() {
-            @Override
-            public void onNext(BaseResponse<FriendInfoBean> friendInfoBeanBaseResponse) {
-                if (getView() != null && friendInfoBeanBaseResponse != null) {
-                    getView().getFriendInfoSuccess(friendInfoBeanBaseResponse.getData());
-                }
-            }
-
-            @Override
-            public void onError(Throwable e) {
-                e.printStackTrace();
-            }
-
-            @Override
-            public void onComplete() {
-
-            }
-        });
-    }
-
-    public void setMicrophoneDisable(boolean isDisable) {
-        //disable true 关闭麦克风 false 打开麦克风
-        RCRTCEngine.getInstance().getDefaultAudioStream().setMicrophoneDisable(isDisable);
-    }
-}
+//
+//        List<RCRTCInputStream> inputStreams = remoteUser.getStreams();
+//        Log.i("pq", "unSubscribeStream , inputStreams  = " + inputStreams);
+//        rcrtcRoom.getLocalUser().unsubscribeStreams(inputStreams, new IRCRTCResultCallback() {
+//            @Override
+//            public void onSuccess() {
+//                Log.i("pq", "unSubscribeStream success,user = " + userId);
+//                if (callback != null) {
+//                    callback.onSuccess(userId);
+//                }
+//            }
+//
+//            @Override
+//            public void onFailed(RTCErrorCode rtcErrorCode) {
+//                Log.i("pq", "unSubscribeStream  error - " + rtcErrorCode.getReason());
+//                if (callback != null) {
+//                    callback.onFail(ErrorCode.RTC_ERROR.getCode(), null);
+//                }
+//            }
+//        });
+//
+//    }
+//
+//    public void getUserInfoByUserId(String userId) {
+//        addSubscribe(create(TeacherAPIService.class).queryFriendDetail(userId), new DisposableObserver<BaseResponse<FriendInfoBean>>() {
+//            @Override
+//            public void onNext(BaseResponse<FriendInfoBean> friendInfoBeanBaseResponse) {
+//                if (getView() != null && friendInfoBeanBaseResponse != null) {
+//                    getView().getFriendInfoSuccess(friendInfoBeanBaseResponse.getData());
+//                }
+//            }
+//
+//            @Override
+//            public void onError(Throwable e) {
+//                e.printStackTrace();
+//            }
+//
+//            @Override
+//            public void onComplete() {
+//
+//            }
+//        });
+//    }
+//
+//    public void setMicrophoneDisable(boolean isDisable) {
+//        //disable true 关闭麦克风 false 打开麦克风
+//        RCRTCEngine.getInstance().getDefaultAudioStream().setMicrophoneDisable(isDisable);
+//    }
+//}

+ 15 - 8
teacher/src/main/java/com/cooleshow/teacher/presenter/mine/CoursewareListPresenter.java

@@ -7,13 +7,15 @@ import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.ErrorParse;
 import com.cooleshow.base.utils.ErrorParse;
+import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.teacher.api.APIService;
 import com.cooleshow.teacher.api.APIService;
 import com.cooleshow.teacher.contract.AboutContract;
 import com.cooleshow.teacher.contract.AboutContract;
 import com.cooleshow.teacher.contract.CoursewareContract;
 import com.cooleshow.teacher.contract.CoursewareContract;
-import com.daya.live_teaching.api.retrofit.RetrofitUtil;
-import com.daya.live_teaching.callback.CoursewareDataResultCallBack;
-import com.daya.live_teaching.model.CoursewareListBean;
+import com.dayayuemeng.classroom.bean.CoursewareListBean;
+
+import org.json.JSONException;
+import org.json.JSONObject;
 
 
 import java.util.HashMap;
 import java.util.HashMap;
 
 
@@ -32,11 +34,16 @@ public class CoursewareListPresenter extends BasePresenter<CoursewareContract.Co
         if (isShowLoading && getView() != null) {
         if (isShowLoading && getView() != null) {
             getView().showLoading();
             getView().showLoading();
         }
         }
-        HashMap<String, Object> bodyMap = new HashMap<>();
-        bodyMap.put("idAndName", searchStr);
-        bodyMap.put("page", page);
-        bodyMap.put("rows", Constants.DEFAULT_DATA_SIZE);
-        addSubscribe(create(APIService.class).getCoursewareList(RetrofitUtil.createJsonRequest(bodyMap)), new BaseObserver<CoursewareListBean>(getView()) {
+        JSONObject jsonObject =new JSONObject();
+        try {
+            jsonObject.put("idAndName", searchStr);
+            jsonObject.put("page", page);
+            jsonObject.put("rows", Constants.DEFAULT_DATA_SIZE);
+        } catch (JSONException e) {
+            throw new RuntimeException(e);
+        }
+
+        addSubscribe(create(APIService.class).getCoursewareList(RequestBodyUtil.convertToRequestBodyJson(jsonObject.toString())), new BaseObserver<CoursewareListBean>(getView()) {
             @Override
             @Override
             protected void onSuccess(CoursewareListBean data) {
             protected void onSuccess(CoursewareListBean data) {
                 if (getView() != null) {
                 if (getView() != null) {

+ 2 - 5
teacher/src/main/java/com/cooleshow/teacher/presenter/minestyle/MineStylePagePresenter.java

@@ -16,6 +16,7 @@ import com.cooleshow.base.data.net.BaseResponse;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.FileUtils;
 import com.cooleshow.base.utils.FileUtils;
+import com.cooleshow.base.utils.ImageUtils;
 import com.cooleshow.base.utils.LogUtils;
 import com.cooleshow.base.utils.LogUtils;
 import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.base.utils.Utils;
 import com.cooleshow.base.utils.Utils;
@@ -30,9 +31,6 @@ import com.cooleshow.teacher.contract.MineStylePageContract;
 import com.cooleshow.teacher.ui.minestyle.MineStylePageActivity;
 import com.cooleshow.teacher.ui.minestyle.MineStylePageActivity;
 import com.cooleshow.usercenter.bean.SetDetailBean;
 import com.cooleshow.usercenter.bean.SetDetailBean;
 import com.cooleshow.usercenter.bean.TeacherUserInfo;
 import com.cooleshow.usercenter.bean.TeacherUserInfo;
-import com.daya.live_teaching.LiveTeachingApp;
-import com.daya.live_teaching.model.FileUploadBean;
-import com.daya.live_teaching.repository.ClassRepository;
 import com.luck.picture.lib.tools.BitmapUtils;
 import com.luck.picture.lib.tools.BitmapUtils;
 
 
 import java.io.File;
 import java.io.File;
@@ -47,7 +45,6 @@ import io.reactivex.rxjava3.core.ObservableOnSubscribe;
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.schedulers.Schedulers;
-import io.rong.imkit.picture.tools.PictureFileUtils;
 import retrofit2.Call;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Callback;
 import retrofit2.Response;
 import retrofit2.Response;
@@ -306,7 +303,7 @@ public class MineStylePagePresenter extends BasePresenter<MineStylePageContract.
                                 parentFile.mkdirs();
                                 parentFile.mkdirs();
                             }
                             }
                             File file = new File(parentFile, String.valueOf(currentTime) + ".png");
                             File file = new File(parentFile, String.valueOf(currentTime) + ".png");
-                            PictureFileUtils.saveBitmapFile(resource, file);
+                            ImageUtils.save(resource,file,Bitmap.CompressFormat.JPEG);
                             if (emitter != null) {
                             if (emitter != null) {
                                 emitter.onNext(file.getAbsolutePath());
                                 emitter.onNext(file.getAbsolutePath());
                             }
                             }

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/push/CustomMiMessageReceiver.java

@@ -3,16 +3,16 @@ package com.cooleshow.teacher.push;
 import android.content.Context;
 import android.content.Context;
 
 
 import com.cooleshow.base.utils.LogUtils;
 import com.cooleshow.base.utils.LogUtils;
+import com.tencent.qcloud.tim.tuiofflinepush.oempush.XiaomiMsgReceiver;
 import com.xiaomi.mipush.sdk.MiPushCommandMessage;
 import com.xiaomi.mipush.sdk.MiPushCommandMessage;
 import com.xiaomi.mipush.sdk.MiPushMessage;
 import com.xiaomi.mipush.sdk.MiPushMessage;
 
 
 import cn.jpush.android.service.PluginXiaomiPlatformsReceiver;
 import cn.jpush.android.service.PluginXiaomiPlatformsReceiver;
-import io.rong.push.platform.mi.MiMessageReceiver;
 
 
 /**
 /**
  * Author by pq, Date on 2022/7/18.
  * Author by pq, Date on 2022/7/18.
  */
  */
-public class CustomMiMessageReceiver extends MiMessageReceiver {
+public class CustomMiMessageReceiver extends XiaomiMsgReceiver {
     final PluginXiaomiPlatformsReceiver jpushService = new PluginXiaomiPlatformsReceiver();
     final PluginXiaomiPlatformsReceiver jpushService = new PluginXiaomiPlatformsReceiver();
 
 
     @Override
     @Override

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/push/MyHWPushService.java

@@ -1,11 +1,11 @@
 package com.cooleshow.teacher.push;
 package com.cooleshow.teacher.push;
 
 
 import com.huawei.hms.push.RemoteMessage;
 import com.huawei.hms.push.RemoteMessage;
+import com.tencent.qcloud.tim.tuiofflinepush.oempush.HUAWEIHmsMessageService;
 
 
 import cn.jpush.android.service.PluginHuaweiPlatformsService;
 import cn.jpush.android.service.PluginHuaweiPlatformsService;
-import io.rong.push.platform.hms.HMSPushService;
 
 
-public class MyHWPushService extends HMSPushService {
+public class MyHWPushService extends HUAWEIHmsMessageService {
 
 
       final PluginHuaweiPlatformsService jpushService = new PluginHuaweiPlatformsService();
       final PluginHuaweiPlatformsService jpushService = new PluginHuaweiPlatformsService();
 
 

+ 1 - 17
teacher/src/main/java/com/cooleshow/teacher/push/SealNotificationReceiver.java

@@ -7,23 +7,7 @@ import android.os.Build;
 
 
 import com.cooleshow.base.utils.LogUtils;
 import com.cooleshow.base.utils.LogUtils;
 
 
-import io.rong.push.PushType;
-import io.rong.push.notification.PushMessageReceiver;
-import io.rong.push.notification.PushNotificationMessage;
 
 
-public class SealNotificationReceiver extends PushMessageReceiver {
+public class SealNotificationReceiver {
 
 
-    @Override
-    public boolean onNotificationMessageArrived(Context context, PushType pushType, PushNotificationMessage pushNotificationMessage) {
-        return false;// 返回 false, 会弹出融云 SDK 默认通知; 返回 true, 融云 SDK 不会弹通知, 通知需要由您自定义。
-    }
-
-    @Override
-    public boolean onNotificationMessageClicked(Context context, PushType pushType, PushNotificationMessage notificationMessage) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            return false;
-        }
-        LogUtils.i("pq","SealNotificationReceiver Clicked");
-        return false;// 返回 false, 会走融云 SDK 默认处理逻辑, 即点击该通知会打开会话列表或会话界面; 返回 true, 则由您自定义处理逻辑。
-    }
 }
 }

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/push/VivoPushReceiver.java

@@ -2,16 +2,16 @@ package com.cooleshow.teacher.push;
 
 
 import android.content.Context;
 import android.content.Context;
 
 
+import com.tencent.qcloud.tim.tuiofflinepush.oempush.VIVOPushMessageReceiverImpl;
 import com.vivo.push.model.UPSNotificationMessage;
 import com.vivo.push.model.UPSNotificationMessage;
 import com.vivo.push.model.UnvarnishedMessage;
 import com.vivo.push.model.UnvarnishedMessage;
 
 
 import cn.jpush.android.service.PluginVivoMessageReceiver;
 import cn.jpush.android.service.PluginVivoMessageReceiver;
-import io.rong.push.platform.vivo.VivoPushMessageReceiver;
 
 
 /**
 /**
  * Author by pq, Date on 2022/7/18.
  * Author by pq, Date on 2022/7/18.
  */
  */
-public class VivoPushReceiver extends VivoPushMessageReceiver {
+public class VivoPushReceiver extends VIVOPushMessageReceiverImpl {
     final PluginVivoMessageReceiver mPluginOppoPushService =new PluginVivoMessageReceiver();
     final PluginVivoMessageReceiver mPluginOppoPushService =new PluginVivoMessageReceiver();
     @Override
     @Override
     public void onNotificationMessageClicked(Context context, UPSNotificationMessage message) {
     public void onNotificationMessageClicked(Context context, UPSNotificationMessage message) {

+ 10 - 13
teacher/src/main/java/com/cooleshow/teacher/ui/course/MineLiveCourseActivity.java

@@ -28,7 +28,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Arrays;
 import java.util.List;
 import java.util.List;
 
 
-import io.rong.imkit.utils.StatusBarUtil;
 
 
 /**
 /**
  * 创建日期:2022/5/19 15:12
  * 创建日期:2022/5/19 15:12
@@ -53,18 +52,16 @@ public class MineLiveCourseActivity extends BaseMVPActivity<ActivityMineLiveCour
 
 
     @Override
     @Override
     public void onClick(View view) {
     public void onClick(View view) {
-        switch (view.getId()) {
-            case com.cooleshow.base.R.id.tv_right_text:
-                int teacherLiveFlag = UserHelper.getTeacherLiveFlag();
-                if (teacherLiveFlag == 0) {
-                    ToastUtil.getInstance().showShort("您还未开通直播权限,开通后才可创建\n直播课哦");
-                    return;
-                }
-                ARouter.getInstance()
-                        .build(RouterPath.WebCenter.ACTIVITY_HTML)
-                        .withString(WebConstants.WEB_URL, WebConstants.TEACHER_LIVE_CREATE)
-                        .navigation();
-                break;
+        if (view.getId() == com.cooleshow.base.R.id.tv_right_text) {
+            int teacherLiveFlag = UserHelper.getTeacherLiveFlag();
+            if (teacherLiveFlag == 0) {
+                ToastUtil.getInstance().showShort("您还未开通直播权限,开通后才可创建\n直播课哦");
+                return;
+            }
+            ARouter.getInstance()
+                    .build(RouterPath.WebCenter.ACTIVITY_HTML)
+                    .withString(WebConstants.WEB_URL, WebConstants.TEACHER_LIVE_CREATE)
+                    .navigation();
         }
         }
     }
     }
 
 

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/course/MineVideoCourseActivity.java

@@ -14,6 +14,7 @@ import com.cooleshow.base.common.WebConstants;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtil;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.MineVideoCoursePagerAdapter;
 import com.cooleshow.teacher.adapter.MineVideoCoursePagerAdapter;
 import com.cooleshow.teacher.constants.TeacherInfoConstants;
 import com.cooleshow.teacher.constants.TeacherInfoConstants;
@@ -26,7 +27,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Arrays;
 import java.util.List;
 import java.util.List;
 
 
-import io.rong.imkit.utils.StatusBarUtil;
 
 
 /**
 /**
  * 创建日期:2022/5/20 13:47
  * 创建日期:2022/5/20 13:47
@@ -64,7 +64,7 @@ public class MineVideoCourseActivity extends BaseMVPActivity<ActivityMineVideoCo
     @Override
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
         String teacherCertificationStatus = UserHelper.getTeacherCertificationStatus();
         String teacherCertificationStatus = UserHelper.getTeacherCertificationStatus();
         teacherIsCert = TextUtils.equals(teacherCertificationStatus, TeacherInfoConstants.ENTRY_STATUS_PASS);
         teacherIsCert = TextUtils.equals(teacherCertificationStatus, TeacherInfoConstants.ENTRY_STATUS_PASS);
     }
     }

+ 0 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/course/PianoRoomCourseDetailActivity.java

@@ -28,7 +28,6 @@ import com.cooleshow.teacher.contract.PianoRoomCourseDetailContract;
 import com.cooleshow.teacher.databinding.ActivityPianoRoomDetailLayoutBinding;
 import com.cooleshow.teacher.databinding.ActivityPianoRoomDetailLayoutBinding;
 import com.cooleshow.teacher.presenter.course.PianoRoomDetailPresenter;
 import com.cooleshow.teacher.presenter.course.PianoRoomDetailPresenter;
 import com.cooleshow.teacher.widgets.CourseSetCommentDialog;
 import com.cooleshow.teacher.widgets.CourseSetCommentDialog;
-import com.daya.live_teaching.utils.helper.CourseEnterHelper;
 import com.dayayuemeng.classroom.helper.OpenClassRoomHelper;
 import com.dayayuemeng.classroom.helper.OpenClassRoomHelper;
 
 
 import java.util.List;
 import java.util.List;
@@ -36,7 +35,6 @@ import java.util.List;
 import androidx.annotation.NonNull;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
-import io.rong.imkit.utils.helper.OpenChatHelper;
 
 
 /**
 /**
  * Author by pq, Date on 2022/6/24.
  * Author by pq, Date on 2022/6/24.

+ 0 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/course/PianoRoomCourseFragment.java

@@ -52,7 +52,6 @@ import java.util.List;
 import androidx.annotation.NonNull;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView;
-import io.rong.imkit.utils.helper.OpenChatHelper;
 
 
 /**
 /**
  * Author by pq, Date on 2022/4/25.
  * Author by pq, Date on 2022/4/25.

+ 0 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/course/SparringCourseDetailActivity.java

@@ -25,11 +25,9 @@ import com.cooleshow.teacher.databinding.ActivitySparringCourseDetailLayoutBindi
 import com.cooleshow.teacher.presenter.course.SparringCourseDetailPresenter;
 import com.cooleshow.teacher.presenter.course.SparringCourseDetailPresenter;
 import com.cooleshow.teacher.widgets.CourseSetCommentDialog;
 import com.cooleshow.teacher.widgets.CourseSetCommentDialog;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.cooleshow.usercenter.helper.UserHelper;
-import com.daya.live_teaching.utils.helper.CourseEnterHelper;
 import com.dayayuemeng.classroom.helper.OpenClassRoomHelper;
 import com.dayayuemeng.classroom.helper.OpenClassRoomHelper;
 
 
 import androidx.annotation.NonNull;
 import androidx.annotation.NonNull;
-import io.rong.imkit.utils.helper.OpenChatHelper;
 
 
 /**
 /**
  * Author by pq, Date on 2022/4/27.
  * Author by pq, Date on 2022/4/27.

+ 0 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/course/SparringCourseFragment.java

@@ -47,7 +47,6 @@ import java.util.List;
 import androidx.annotation.NonNull;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView;
-import io.rong.imkit.utils.helper.OpenChatHelper;
 
 
 /**
 /**
  * Author by pq, Date on 2022/4/25.
  * Author by pq, Date on 2022/4/25.

+ 0 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/homepage/MineStyleFragment.java

@@ -29,7 +29,6 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 
 
 import java.util.List;
 import java.util.List;
 
 
-import io.rong.imkit.RongIM;
 
 
 /**
 /**
  * Author by pq, Date on 2022/5/9.
  * Author by pq, Date on 2022/5/9.

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/income/EarningStatisticsActivity.java

@@ -32,6 +32,7 @@ import com.contrarywind.view.WheelView;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.DateUtil;
 import com.cooleshow.base.utils.DateUtil;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.EarningDoughnutListAdapter;
 import com.cooleshow.teacher.adapter.EarningDoughnutListAdapter;
 import com.cooleshow.teacher.adapter.EarningStackedListAdapter;
 import com.cooleshow.teacher.adapter.EarningStackedListAdapter;
@@ -51,7 +52,6 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
-import io.rong.imkit.utils.StatusBarUtil;
 
 
 /**
 /**
  * 创建日期:2022/6/1 17:58
  * 创建日期:2022/6/1 17:58
@@ -64,7 +64,7 @@ public class EarningStatisticsActivity extends BaseMVPActivity<ActivityEarningSt
     @Override
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
         initViewState(savedInstanceState);
         initViewState(savedInstanceState);
     }
     }
 
 

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/income/MineIncomeActivity.java

@@ -30,6 +30,7 @@ import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.PopupUtil;
 import com.cooleshow.base.utils.PopupUtil;
 import com.cooleshow.base.utils.TimeUtils;
 import com.cooleshow.base.utils.TimeUtils;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.IncomeFilterAdapter;
 import com.cooleshow.teacher.adapter.IncomeFilterAdapter;
 import com.cooleshow.teacher.adapter.MineIncomeAdapter;
 import com.cooleshow.teacher.adapter.MineIncomeAdapter;
@@ -48,7 +49,6 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
-import io.rong.imkit.utils.StatusBarUtil;
 
 
 /**
 /**
  * 创建日期:2022/5/23 14:06
  * 创建日期:2022/5/23 14:06
@@ -97,7 +97,7 @@ public class MineIncomeActivity extends BaseMVPActivity<ActivityMineIncomeBindin
     @Override
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
     }
     }
 
 
     private MineIncomeAdapter mineIncomeAdapter;
     private MineIncomeAdapter mineIncomeAdapter;

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/income/WithdrawalActivity.java

@@ -15,6 +15,7 @@ import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.ToastUtils;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.widgets.dialog.CommonDialog;
 import com.cooleshow.base.widgets.dialog.CommonDialog;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.bean.WithdrawalInfoBean;
 import com.cooleshow.teacher.bean.WithdrawalInfoBean;
@@ -24,7 +25,6 @@ import com.cooleshow.teacher.presenter.income.WithdrawalPresenter;
 
 
 import java.text.DecimalFormat;
 import java.text.DecimalFormat;
 
 
-import io.rong.imkit.utils.StatusBarUtil;
 
 
 /**
 /**
  * 创建日期:2022/5/23 17:29
  * 创建日期:2022/5/23 17:29
@@ -76,7 +76,7 @@ public class WithdrawalActivity extends BaseMVPActivity<ActivityWithdrawalBindin
     @Override
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
     }
     }
 
 
     @Override
     @Override

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/income/WithdrawalRecordActivity.java

@@ -26,6 +26,7 @@ import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.PopupUtil;
 import com.cooleshow.base.utils.PopupUtil;
 import com.cooleshow.base.utils.TimeUtils;
 import com.cooleshow.base.utils.TimeUtils;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.WithdrawalFilterAdapter;
 import com.cooleshow.teacher.adapter.WithdrawalFilterAdapter;
 import com.cooleshow.teacher.adapter.WithdrawalRecordAdapter;
 import com.cooleshow.teacher.adapter.WithdrawalRecordAdapter;
@@ -43,7 +44,6 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
-import io.rong.imkit.utils.StatusBarUtil;
 
 
 /**
 /**
  * 创建日期:2022/5/24 10:12
  * 创建日期:2022/5/24 10:12
@@ -70,7 +70,7 @@ public class WithdrawalRecordActivity extends BaseMVPActivity<ActivityWithdrawal
     @Override
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
     }
     }
 
 
     private WithdrawalRecordAdapter withdrawalRecordAdapter;
     private WithdrawalRecordAdapter withdrawalRecordAdapter;

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/income/WithdrawalSuccessActivity.java

@@ -8,12 +8,12 @@ import androidx.annotation.Nullable;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.contract.WithdrawalSuccessContract;
 import com.cooleshow.teacher.contract.WithdrawalSuccessContract;
 import com.cooleshow.teacher.databinding.ActivityWithdrawalSuccessBinding;
 import com.cooleshow.teacher.databinding.ActivityWithdrawalSuccessBinding;
 import com.cooleshow.teacher.presenter.income.WithdrawalSuccessPresenter;
 import com.cooleshow.teacher.presenter.income.WithdrawalSuccessPresenter;
 
 
-import io.rong.imkit.utils.StatusBarUtil;
 
 
 /**
 /**
  * 创建日期:2022/5/24 9:53
  * 创建日期:2022/5/24 9:53
@@ -34,7 +34,7 @@ public class WithdrawalSuccessActivity extends BaseMVPActivity<ActivityWithdrawa
     @Override
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
     }
     }
     @Override
     @Override
     protected void initView() {
     protected void initView() {

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/live/CreateLiveActivity.java

@@ -16,12 +16,12 @@ import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.base.utils.MyFileUtils;
 import com.cooleshow.base.utils.MyFileUtils;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.ToastUtils;
+import com.cooleshow.base.utils.helper.GlideEngine;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.contract.CreateLiveContract;
 import com.cooleshow.teacher.contract.CreateLiveContract;
 import com.cooleshow.teacher.databinding.ActivityCreateLiveBinding;
 import com.cooleshow.teacher.databinding.ActivityCreateLiveBinding;
 import com.cooleshow.teacher.presenter.live.CreateLivePresenter;
 import com.cooleshow.teacher.presenter.live.CreateLivePresenter;
-import com.daya.live_teaching.utils.GlideEngine;
 import com.daya.tclive.helper.TTLiveHelper;
 import com.daya.tclive.helper.TTLiveHelper;
 import com.luck.picture.lib.PictureSelector;
 import com.luck.picture.lib.PictureSelector;
 import com.luck.picture.lib.config.PictureConfig;
 import com.luck.picture.lib.config.PictureConfig;

+ 179 - 179
teacher/src/main/java/com/cooleshow/teacher/ui/live/LiveApplyMicFragment.java

@@ -1,179 +1,179 @@
-package com.cooleshow.teacher.ui.live;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.chad.library.adapter.base.listener.OnItemChildClickListener;
-import com.chad.library.adapter.base.viewholder.BaseViewHolder;
-import com.cooleshow.base.ui.fragment.BaseFragment;
-import com.cooleshow.base.utils.LogUtils;
-import com.cooleshow.base.utils.ToastUtil;
-import com.cooleshow.base.utils.UiUtils;
-import com.cooleshow.base.widgets.dialog.CommonConfirmDialog;
-import com.cooleshow.teacher.R;
-import com.cooleshow.teacher.databinding.FragmentLiveApplyMicLayoutBinding;
-import com.cooleshow.teacher.widgets.dialog.LiveMicManagerDialog;
-import com.huawei.hms.utils.UIUtil;
-import com.rong.io.live.bean.User;
-import com.rong.io.live.config.LiveConfig;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-/**
- * Author by pq, Date on 2022/6/13.
- * 直播间申请连麦列表页面
- */
-public class LiveApplyMicFragment extends BaseFragment<FragmentLiveApplyMicLayoutBinding> implements View.OnClickListener {
-    RecyclerView recyclerView;
-
-    private LiveMicManagerDialog.OnEventListener mEventListener;
-
-    private ArrayList<User> mList = new ArrayList<>();
-    private Adapter mAdapter;
-    private CommonConfirmDialog mConfirmDialog;
-
-
-    @Override
-    protected FragmentLiveApplyMicLayoutBinding getLayoutView() {
-        return FragmentLiveApplyMicLayoutBinding.inflate(getLayoutInflater());
-    }
-
-    @Override
-    protected void initView(View rootView) {
-        recyclerView = mViewBinding.recyclerView;
-    }
-
-    @Override
-    protected void initData() {
-        LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext());
-        recyclerView.setLayoutManager(linearLayoutManager);
-        mViewBinding.tvEnableMic.setOnClickListener(this);
-        mViewBinding.tvRefuseAll.setOnClickListener(this);
-        mAdapter = new Adapter(R.layout.item_live_mic_manager_layout, mList);
-        recyclerView.setAdapter(mAdapter);
-        mAdapter.setOnItemChildClickListener(new OnItemChildClickListener() {
-            @Override
-            public void onItemChildClick(@NonNull BaseQuickAdapter<?, ?> adapter, @NonNull View view, int position) {
-                if (UiUtils.isFastClick(500)) {
-                    ToastUtil.getInstance().showShort("请勿频繁操作~");
-                    return;
-                }
-                if (mAdapter != null && position < mAdapter.getData().size()) {
-                    User user = mAdapter.getData().get(position);
-                    if (user != null && mEventListener != null) {
-                        mEventListener.onAgreeApply(user);
-                    }
-                }
-            }
-        });
-    }
-
-    @Override
-    public void onClick(View view) {
-        int id = view.getId();
-        if (id == R.id.tv_refuse_all) {
-            //全部拒绝
-            showCommonTipDialog("确认后所有连麦中学员都将下麦", "确认", new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (mEventListener != null) {
-                        if (mConfirmDialog != null) {
-                            mConfirmDialog.dismiss();
-                        }
-                        mEventListener.onRefuseAllMicApply();
-                    }
-                }
-            });
-            return;
-        }
-
-        if (id == R.id.tv_enable_mic) {
-            //禁止连麦
-            if (LiveConfig.MODE_LIVE_IS_ENABLE_MIC == 0) {
-                //当前允许连麦,触发禁止连麦
-                showCommonTipDialog("是否确认禁止学员连麦?", "确认", new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        if (mConfirmDialog != null) {
-                            mConfirmDialog.dismiss();
-                        }
-                        if (mEventListener != null) {
-                            LiveConfig.MODE_LIVE_IS_ENABLE_MIC = 1;
-                            mViewBinding.tvEnableMic.setText("开启连麦");
-                            mEventListener.onSwitchMicMode(true);
-                        }
-                    }
-                });
-            } else {
-                //当前禁止连麦,触发允许连麦
-                if (mEventListener != null) {
-                    LiveConfig.MODE_LIVE_IS_ENABLE_MIC = 0;
-                    mViewBinding.tvEnableMic.setText("禁止连麦");
-                    mEventListener.onSwitchMicMode(false);
-                }
-            }
-            return;
-        }
-    }
-
-    /**
-     * 刷新
-     *
-     * @param applyListData
-     */
-    public void refresh(ArrayList<User> applyListData) {
-        mList.clear();
-        mList.addAll(applyListData);
-        if (mAdapter != null) {
-            mAdapter.notifyDataSetChanged();
-        }
-    }
-
-    public void setOnEventListener(LiveMicManagerDialog.OnEventListener listener) {
-        this.mEventListener = listener;
-    }
-
-    private class Adapter extends BaseQuickAdapter<User, BaseViewHolder> {
-
-
-        public Adapter(int layoutResId, @Nullable List<User> data) {
-            super(layoutResId, data);
-            addChildClickViewIds(R.id.tv_handle);
-        }
-
-        @Override
-        protected void convert(@NonNull BaseViewHolder helper, User user) {
-            //创建人头像
-            ImageView iv_avatar = helper.getView(R.id.iv_avatar);
-            Glide.with(getContext()).load(user.getPortraitUrl()).placeholder(R.drawable.icon_teacher_default_head).error(R.drawable.icon_teacher_default_head).into(iv_avatar);
-            //名称
-            helper.setText(R.id.tv_name, user.getUserName());
-            helper.setText(R.id.tv_tip, "申请连麦中");
-            helper.setText(R.id.tv_handle, "上麦");
-        }
-    }
-
-    private void showCommonTipDialog(String content, String confirmText, View.OnClickListener listener) {
-        if (mConfirmDialog == null) {
-            mConfirmDialog = new CommonConfirmDialog(getContext());
-        }
-        if (!mConfirmDialog.isShowing()) {
-            mConfirmDialog.show();
-        }
-        mConfirmDialog.setContent(content);
-        mConfirmDialog.setConfirmText(confirmText);
-        mConfirmDialog.setOnConfirmClickListener(listener);
-    }
-
-}
+//package com.cooleshow.teacher.ui.live;
+//
+//import android.view.LayoutInflater;
+//import android.view.View;
+//import android.view.ViewGroup;
+//import android.widget.ImageView;
+//import android.widget.TextView;
+//
+//import com.bumptech.glide.Glide;
+//import com.chad.library.adapter.base.BaseQuickAdapter;
+//import com.chad.library.adapter.base.listener.OnItemChildClickListener;
+//import com.chad.library.adapter.base.viewholder.BaseViewHolder;
+//import com.cooleshow.base.ui.fragment.BaseFragment;
+//import com.cooleshow.base.utils.LogUtils;
+//import com.cooleshow.base.utils.ToastUtil;
+//import com.cooleshow.base.utils.UiUtils;
+//import com.cooleshow.base.widgets.dialog.CommonConfirmDialog;
+//import com.cooleshow.teacher.R;
+//import com.cooleshow.teacher.databinding.FragmentLiveApplyMicLayoutBinding;
+//import com.cooleshow.teacher.widgets.dialog.LiveMicManagerDialog;
+//import com.huawei.hms.utils.UIUtil;
+//import com.rong.io.live.bean.User;
+//import com.rong.io.live.config.LiveConfig;
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//
+//import androidx.annotation.NonNull;
+//import androidx.annotation.Nullable;
+//import androidx.recyclerview.widget.LinearLayoutManager;
+//import androidx.recyclerview.widget.RecyclerView;
+//
+///**
+// * Author by pq, Date on 2022/6/13.
+// * 直播间申请连麦列表页面
+// */
+//public class LiveApplyMicFragment extends BaseFragment<FragmentLiveApplyMicLayoutBinding> implements View.OnClickListener {
+//    RecyclerView recyclerView;
+//
+//    private LiveMicManagerDialog.OnEventListener mEventListener;
+//
+//    private ArrayList<User> mList = new ArrayList<>();
+//    private Adapter mAdapter;
+//    private CommonConfirmDialog mConfirmDialog;
+//
+//
+//    @Override
+//    protected FragmentLiveApplyMicLayoutBinding getLayoutView() {
+//        return FragmentLiveApplyMicLayoutBinding.inflate(getLayoutInflater());
+//    }
+//
+//    @Override
+//    protected void initView(View rootView) {
+//        recyclerView = mViewBinding.recyclerView;
+//    }
+//
+//    @Override
+//    protected void initData() {
+//        LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext());
+//        recyclerView.setLayoutManager(linearLayoutManager);
+//        mViewBinding.tvEnableMic.setOnClickListener(this);
+//        mViewBinding.tvRefuseAll.setOnClickListener(this);
+//        mAdapter = new Adapter(R.layout.item_live_mic_manager_layout, mList);
+//        recyclerView.setAdapter(mAdapter);
+//        mAdapter.setOnItemChildClickListener(new OnItemChildClickListener() {
+//            @Override
+//            public void onItemChildClick(@NonNull BaseQuickAdapter<?, ?> adapter, @NonNull View view, int position) {
+//                if (UiUtils.isFastClick(500)) {
+//                    ToastUtil.getInstance().showShort("请勿频繁操作~");
+//                    return;
+//                }
+//                if (mAdapter != null && position < mAdapter.getData().size()) {
+//                    User user = mAdapter.getData().get(position);
+//                    if (user != null && mEventListener != null) {
+//                        mEventListener.onAgreeApply(user);
+//                    }
+//                }
+//            }
+//        });
+//    }
+//
+//    @Override
+//    public void onClick(View view) {
+//        int id = view.getId();
+//        if (id == R.id.tv_refuse_all) {
+//            //全部拒绝
+//            showCommonTipDialog("确认后所有连麦中学员都将下麦", "确认", new View.OnClickListener() {
+//                @Override
+//                public void onClick(View v) {
+//                    if (mEventListener != null) {
+//                        if (mConfirmDialog != null) {
+//                            mConfirmDialog.dismiss();
+//                        }
+//                        mEventListener.onRefuseAllMicApply();
+//                    }
+//                }
+//            });
+//            return;
+//        }
+//
+//        if (id == R.id.tv_enable_mic) {
+//            //禁止连麦
+//            if (LiveConfig.MODE_LIVE_IS_ENABLE_MIC == 0) {
+//                //当前允许连麦,触发禁止连麦
+//                showCommonTipDialog("是否确认禁止学员连麦?", "确认", new View.OnClickListener() {
+//                    @Override
+//                    public void onClick(View v) {
+//                        if (mConfirmDialog != null) {
+//                            mConfirmDialog.dismiss();
+//                        }
+//                        if (mEventListener != null) {
+//                            LiveConfig.MODE_LIVE_IS_ENABLE_MIC = 1;
+//                            mViewBinding.tvEnableMic.setText("开启连麦");
+//                            mEventListener.onSwitchMicMode(true);
+//                        }
+//                    }
+//                });
+//            } else {
+//                //当前禁止连麦,触发允许连麦
+//                if (mEventListener != null) {
+//                    LiveConfig.MODE_LIVE_IS_ENABLE_MIC = 0;
+//                    mViewBinding.tvEnableMic.setText("禁止连麦");
+//                    mEventListener.onSwitchMicMode(false);
+//                }
+//            }
+//            return;
+//        }
+//    }
+//
+//    /**
+//     * 刷新
+//     *
+//     * @param applyListData
+//     */
+//    public void refresh(ArrayList<User> applyListData) {
+//        mList.clear();
+//        mList.addAll(applyListData);
+//        if (mAdapter != null) {
+//            mAdapter.notifyDataSetChanged();
+//        }
+//    }
+//
+//    public void setOnEventListener(LiveMicManagerDialog.OnEventListener listener) {
+//        this.mEventListener = listener;
+//    }
+//
+//    private class Adapter extends BaseQuickAdapter<User, BaseViewHolder> {
+//
+//
+//        public Adapter(int layoutResId, @Nullable List<User> data) {
+//            super(layoutResId, data);
+//            addChildClickViewIds(R.id.tv_handle);
+//        }
+//
+//        @Override
+//        protected void convert(@NonNull BaseViewHolder helper, User user) {
+//            //创建人头像
+//            ImageView iv_avatar = helper.getView(R.id.iv_avatar);
+//            Glide.with(getContext()).load(user.getPortraitUrl()).placeholder(R.drawable.icon_teacher_default_head).error(R.drawable.icon_teacher_default_head).into(iv_avatar);
+//            //名称
+//            helper.setText(R.id.tv_name, user.getUserName());
+//            helper.setText(R.id.tv_tip, "申请连麦中");
+//            helper.setText(R.id.tv_handle, "上麦");
+//        }
+//    }
+//
+//    private void showCommonTipDialog(String content, String confirmText, View.OnClickListener listener) {
+//        if (mConfirmDialog == null) {
+//            mConfirmDialog = new CommonConfirmDialog(getContext());
+//        }
+//        if (!mConfirmDialog.isShowing()) {
+//            mConfirmDialog.show();
+//        }
+//        mConfirmDialog.setContent(content);
+//        mConfirmDialog.setConfirmText(confirmText);
+//        mConfirmDialog.setOnConfirmClickListener(listener);
+//    }
+//
+//}

+ 164 - 164
teacher/src/main/java/com/cooleshow/teacher/ui/live/LiveOnMicFragment.java

@@ -1,164 +1,164 @@
-package com.cooleshow.teacher.ui.live;
-
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.chad.library.adapter.base.listener.OnItemChildClickListener;
-import com.chad.library.adapter.base.viewholder.BaseViewHolder;
-import com.cooleshow.base.ui.fragment.BaseFragment;
-import com.cooleshow.base.utils.LogUtils;
-import com.cooleshow.base.widgets.dialog.CommonConfirmDialog;
-import com.cooleshow.teacher.R;
-import com.cooleshow.teacher.databinding.FragmentLiveOnMicLayoutBinding;
-import com.cooleshow.teacher.widgets.dialog.LiveMicManagerDialog;
-import com.rong.io.live.bean.User;
-import com.rong.io.live.config.LiveConfig;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-/**
- * Author by pq, Date on 2022/6/13.
- * 直播间连麦中列表页面
- */
-public class LiveOnMicFragment extends BaseFragment<FragmentLiveOnMicLayoutBinding> implements View.OnClickListener {
-    RecyclerView recyclerView;
-    private LiveMicManagerDialog.OnEventListener mEventListener;
-    private ArrayList<User> mList = new ArrayList<>();
-    private Adapter mAdapter;
-    private CommonConfirmDialog mConfirmDialog;
-
-    @Override
-    protected FragmentLiveOnMicLayoutBinding getLayoutView() {
-        return FragmentLiveOnMicLayoutBinding.inflate(getLayoutInflater());
-    }
-
-    @Override
-    protected void initView(View rootView) {
-        recyclerView = mViewBinding.recyclerView;
-    }
-
-    @Override
-    protected void initData() {
-        LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext());
-        recyclerView.setLayoutManager(linearLayoutManager);
-        mViewBinding.tvDownAllMic.setOnClickListener(this);
-        mAdapter = new Adapter(R.layout.item_live_mic_manager_layout, mList);
-        mAdapter.setOnItemChildClickListener(new OnItemChildClickListener() {
-            @Override
-            public void onItemChildClick(@NonNull BaseQuickAdapter<?, ?> adapter, @NonNull View view, int position) {
-                int id = view.getId();
-                if (id == R.id.tv_handle) {
-                    //下麦操作
-                    if (mAdapter != null && position < mAdapter.getData().size()) {
-                        User user = mAdapter.getData().get(position);
-                        if (mEventListener != null) {
-                            mEventListener.onUnderMic(user);
-                        }
-                    }
-                }
-            }
-        });
-        recyclerView.setAdapter(mAdapter);
-    }
-
-    public void onClick(View view) {
-        int id = view.getId();
-        if (id == R.id.tv_down_all_mic) {
-            //全部下麦
-            showCommonTipDialog("确认后所有连麦中学员都将下麦?", "确认", new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (mConfirmDialog != null) {
-                        mConfirmDialog.dismiss();
-                    }
-                    if (mEventListener != null) {
-                        mEventListener.onUnderAllMic();
-                    }
-                }
-            });
-            return;
-        }
-    }
-
-    /**
-     * 刷新
-     *
-     * @param applyListData
-     */
-    public void refresh(ArrayList<User> applyListData) {
-        mList.clear();
-        mList.addAll(applyListData);
-        if (mAdapter != null) {
-            mAdapter.notifyDataSetChanged();
-        }
-    }
-
-    public void setOnEventListener(LiveMicManagerDialog.OnEventListener listener) {
-        this.mEventListener = listener;
-    }
-
-    private class Adapter extends BaseQuickAdapter<User, Adapter.ViewHolder> {
-
-        public Adapter(int layoutResId, @Nullable List<User> data) {
-            super(layoutResId, data);
-            addChildClickViewIds(R.id.tv_handle);
-        }
-
-        @Override
-        public int getItemCount() {
-            return mList != null ? mList.size() : 0;
-        }
-
-        @Override
-        protected void convert(@NonNull ViewHolder viewHolder, User user) {
-            //创建人头像
-            Glide.with(getContext()).load(user.getPortraitUrl()).placeholder(R.drawable.icon_teacher_default_head).error(R.drawable.icon_teacher_default_head).into(viewHolder.ivAvatar);
-            //名称
-            String userName = user.getUserName();
-            viewHolder.tvName.setText(!TextUtils.isEmpty(userName) ? userName : "连麦用户");
-
-            viewHolder.tvTip.setText("连麦中");
-            viewHolder.tvHandle.setText("下麦");
-        }
-
-        public class ViewHolder extends BaseViewHolder {
-            ImageView ivAvatar;
-            TextView tvName;
-            TextView tvTip;
-            TextView tvHandle;
-
-            public ViewHolder(View itemView) {
-                super(itemView);
-                ivAvatar = itemView.findViewById(R.id.iv_avatar);
-                tvName = itemView.findViewById(R.id.tv_name);
-                tvTip = itemView.findViewById(R.id.tv_tip);
-                tvHandle = itemView.findViewById(R.id.tv_handle);
-            }
-
-        }
-    }
-
-    private void showCommonTipDialog(String content, String confirmText, View.OnClickListener listener) {
-        if (mConfirmDialog == null) {
-            mConfirmDialog = new CommonConfirmDialog(getContext());
-        }
-        if (!mConfirmDialog.isShowing()) {
-            mConfirmDialog.show();
-        }
-        mConfirmDialog.setContent(content);
-        mConfirmDialog.setConfirmText(confirmText);
-        mConfirmDialog.setOnConfirmClickListener(listener);
-    }
-}
+//package com.cooleshow.teacher.ui.live;
+//
+//import android.text.TextUtils;
+//import android.view.LayoutInflater;
+//import android.view.View;
+//import android.view.ViewGroup;
+//import android.widget.ImageView;
+//import android.widget.TextView;
+//
+//import com.bumptech.glide.Glide;
+//import com.chad.library.adapter.base.BaseQuickAdapter;
+//import com.chad.library.adapter.base.listener.OnItemChildClickListener;
+//import com.chad.library.adapter.base.viewholder.BaseViewHolder;
+//import com.cooleshow.base.ui.fragment.BaseFragment;
+//import com.cooleshow.base.utils.LogUtils;
+//import com.cooleshow.base.widgets.dialog.CommonConfirmDialog;
+//import com.cooleshow.teacher.R;
+//import com.cooleshow.teacher.databinding.FragmentLiveOnMicLayoutBinding;
+//import com.cooleshow.teacher.widgets.dialog.LiveMicManagerDialog;
+//import com.rong.io.live.bean.User;
+//import com.rong.io.live.config.LiveConfig;
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//
+//import androidx.annotation.NonNull;
+//import androidx.annotation.Nullable;
+//import androidx.recyclerview.widget.LinearLayoutManager;
+//import androidx.recyclerview.widget.RecyclerView;
+//
+///**
+// * Author by pq, Date on 2022/6/13.
+// * 直播间连麦中列表页面
+// */
+//public class LiveOnMicFragment extends BaseFragment<FragmentLiveOnMicLayoutBinding> implements View.OnClickListener {
+//    RecyclerView recyclerView;
+//    private LiveMicManagerDialog.OnEventListener mEventListener;
+//    private ArrayList<User> mList = new ArrayList<>();
+//    private Adapter mAdapter;
+//    private CommonConfirmDialog mConfirmDialog;
+//
+//    @Override
+//    protected FragmentLiveOnMicLayoutBinding getLayoutView() {
+//        return FragmentLiveOnMicLayoutBinding.inflate(getLayoutInflater());
+//    }
+//
+//    @Override
+//    protected void initView(View rootView) {
+//        recyclerView = mViewBinding.recyclerView;
+//    }
+//
+//    @Override
+//    protected void initData() {
+//        LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext());
+//        recyclerView.setLayoutManager(linearLayoutManager);
+//        mViewBinding.tvDownAllMic.setOnClickListener(this);
+//        mAdapter = new Adapter(R.layout.item_live_mic_manager_layout, mList);
+//        mAdapter.setOnItemChildClickListener(new OnItemChildClickListener() {
+//            @Override
+//            public void onItemChildClick(@NonNull BaseQuickAdapter<?, ?> adapter, @NonNull View view, int position) {
+//                int id = view.getId();
+//                if (id == R.id.tv_handle) {
+//                    //下麦操作
+//                    if (mAdapter != null && position < mAdapter.getData().size()) {
+//                        User user = mAdapter.getData().get(position);
+//                        if (mEventListener != null) {
+//                            mEventListener.onUnderMic(user);
+//                        }
+//                    }
+//                }
+//            }
+//        });
+//        recyclerView.setAdapter(mAdapter);
+//    }
+//
+//    public void onClick(View view) {
+//        int id = view.getId();
+//        if (id == R.id.tv_down_all_mic) {
+//            //全部下麦
+//            showCommonTipDialog("确认后所有连麦中学员都将下麦?", "确认", new View.OnClickListener() {
+//                @Override
+//                public void onClick(View v) {
+//                    if (mConfirmDialog != null) {
+//                        mConfirmDialog.dismiss();
+//                    }
+//                    if (mEventListener != null) {
+//                        mEventListener.onUnderAllMic();
+//                    }
+//                }
+//            });
+//            return;
+//        }
+//    }
+//
+//    /**
+//     * 刷新
+//     *
+//     * @param applyListData
+//     */
+//    public void refresh(ArrayList<User> applyListData) {
+//        mList.clear();
+//        mList.addAll(applyListData);
+//        if (mAdapter != null) {
+//            mAdapter.notifyDataSetChanged();
+//        }
+//    }
+//
+//    public void setOnEventListener(LiveMicManagerDialog.OnEventListener listener) {
+//        this.mEventListener = listener;
+//    }
+//
+//    private class Adapter extends BaseQuickAdapter<User, Adapter.ViewHolder> {
+//
+//        public Adapter(int layoutResId, @Nullable List<User> data) {
+//            super(layoutResId, data);
+//            addChildClickViewIds(R.id.tv_handle);
+//        }
+//
+//        @Override
+//        public int getItemCount() {
+//            return mList != null ? mList.size() : 0;
+//        }
+//
+//        @Override
+//        protected void convert(@NonNull ViewHolder viewHolder, User user) {
+//            //创建人头像
+//            Glide.with(getContext()).load(user.getPortraitUrl()).placeholder(R.drawable.icon_teacher_default_head).error(R.drawable.icon_teacher_default_head).into(viewHolder.ivAvatar);
+//            //名称
+//            String userName = user.getUserName();
+//            viewHolder.tvName.setText(!TextUtils.isEmpty(userName) ? userName : "连麦用户");
+//
+//            viewHolder.tvTip.setText("连麦中");
+//            viewHolder.tvHandle.setText("下麦");
+//        }
+//
+//        public class ViewHolder extends BaseViewHolder {
+//            ImageView ivAvatar;
+//            TextView tvName;
+//            TextView tvTip;
+//            TextView tvHandle;
+//
+//            public ViewHolder(View itemView) {
+//                super(itemView);
+//                ivAvatar = itemView.findViewById(R.id.iv_avatar);
+//                tvName = itemView.findViewById(R.id.tv_name);
+//                tvTip = itemView.findViewById(R.id.tv_tip);
+//                tvHandle = itemView.findViewById(R.id.tv_handle);
+//            }
+//
+//        }
+//    }
+//
+//    private void showCommonTipDialog(String content, String confirmText, View.OnClickListener listener) {
+//        if (mConfirmDialog == null) {
+//            mConfirmDialog = new CommonConfirmDialog(getContext());
+//        }
+//        if (!mConfirmDialog.isShowing()) {
+//            mConfirmDialog.show();
+//        }
+//        mConfirmDialog.setContent(content);
+//        mConfirmDialog.setConfirmText(confirmText);
+//        mConfirmDialog.setOnConfirmClickListener(listener);
+//    }
+//}

+ 0 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/main/CourseTableFragment.kt

@@ -13,7 +13,6 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder
 import com.bigkoo.pickerview.listener.CustomListener
 import com.bigkoo.pickerview.listener.CustomListener
 import com.bigkoo.pickerview.listener.OnTimeSelectListener
 import com.bigkoo.pickerview.listener.OnTimeSelectListener
 import com.bigkoo.pickerview.view.TimePickerView
 import com.bigkoo.pickerview.view.TimePickerView
-import io.rong.imkit.utils.helper.OpenChatHelper
 import com.cooleshow.base.common.WebConstants
 import com.cooleshow.base.common.WebConstants
 import com.cooleshow.base.router.RouterPath
 import com.cooleshow.base.router.RouterPath
 import com.cooleshow.base.ui.fragment.BaseMVPFragment
 import com.cooleshow.base.ui.fragment.BaseMVPFragment

+ 0 - 7
teacher/src/main/java/com/cooleshow/teacher/ui/main/MainActivity.java

@@ -47,13 +47,10 @@ import com.cooleshow.teacher.presenter.main.MainPresenter;
 import com.cooleshow.usercenter.bean.TeacherUserInfo;
 import com.cooleshow.usercenter.bean.TeacherUserInfo;
 import com.cooleshow.usercenter.bean.UserInfo;
 import com.cooleshow.usercenter.bean.UserInfo;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.cooleshow.usercenter.helper.UserHelper;
-import com.daya.live_teaching.common.ResultCallback;
-import com.daya.live_teaching.im.IMManager;
 import com.google.android.material.bottomnavigation.BottomNavigationItemView;
 import com.google.android.material.bottomnavigation.BottomNavigationItemView;
 import com.google.android.material.bottomnavigation.BottomNavigationMenuView;
 import com.google.android.material.bottomnavigation.BottomNavigationMenuView;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 import com.google.android.material.snackbar.Snackbar;
 import com.google.android.material.snackbar.Snackbar;
-import com.rong.io.live.config.LiveConfig;
 import com.tbruyelle.rxpermissions3.RxPermissions;
 import com.tbruyelle.rxpermissions3.RxPermissions;
 import com.tencent.bugly.crashreport.CrashReport;
 import com.tencent.bugly.crashreport.CrashReport;
 import com.tencent.open.im.IM;
 import com.tencent.open.im.IM;
@@ -74,8 +71,6 @@ import io.reactivex.rxjava3.core.ObservableEmitter;
 import io.reactivex.rxjava3.core.ObservableOnSubscribe;
 import io.reactivex.rxjava3.core.ObservableOnSubscribe;
 import io.reactivex.rxjava3.functions.Consumer;
 import io.reactivex.rxjava3.functions.Consumer;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.schedulers.Schedulers;
-import io.rong.imkit.manager.UnReadMessageManager;
-import io.rong.imlib.RongIMClient;
 
 
 import static com.cooleshow.base.constanst.Constants.MAIN_PAGE_SELECT_POTION_KEY;
 import static com.cooleshow.base.constanst.Constants.MAIN_PAGE_SELECT_POTION_KEY;
 
 
@@ -427,8 +422,6 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
     public void loadEventBus(LoginStatusEvent event) {
     public void loadEventBus(LoginStatusEvent event) {
         if (event != null && event.eventCode == LoginStatusConstants.LOGIN_OUT) {
         if (event != null && event.eventCode == LoginStatusConstants.LOGIN_OUT) {
             IMCenter.getInstance().logoutIM();
             IMCenter.getInstance().logoutIM();
-            IMManager.getInstance().logout();
-            LiveConfig.isNeedReInitRTC = true;
             JPushInterface.deleteAlias(getApplicationContext(), 1);
             JPushInterface.deleteAlias(getApplicationContext(), 1);
             isNeedSetPushId = true;
             isNeedSetPushId = true;
             LogUtils.i("pq", "LoginStatusEvent:logout");
             LogUtils.i("pq", "LoginStatusEvent:logout");

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/main/MallFragment.java

@@ -49,6 +49,7 @@ import com.cooleshow.base.utils.AppUtils;
 import com.cooleshow.base.utils.PermissionUtils;
 import com.cooleshow.base.utils.PermissionUtils;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.Utils;
 import com.cooleshow.base.utils.Utils;
+import com.cooleshow.base.utils.helper.GlideEngine;
 import com.cooleshow.base.widgets.DialogUtil;
 import com.cooleshow.base.widgets.DialogUtil;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.api.APIService;
 import com.cooleshow.teacher.api.APIService;
@@ -61,7 +62,6 @@ import com.cooleshow.base.utils.MyFileUtils;
 import com.cooleshow.teacher.widgets.LollipopFixedWebView;
 import com.cooleshow.teacher.widgets.LollipopFixedWebView;
 import com.cooleshow.teacher.widgets.helper.JsInterfaceUtils;
 import com.cooleshow.teacher.widgets.helper.JsInterfaceUtils;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.cooleshow.usercenter.helper.UserHelper;
-import com.daya.live_teaching.utils.GlideEngine;
 import com.google.gson.Gson;
 import com.google.gson.Gson;
 import com.gyf.immersionbar.ImmersionBar;
 import com.gyf.immersionbar.ImmersionBar;
 import com.luck.picture.lib.PictureSelector;
 import com.luck.picture.lib.PictureSelector;

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/message/MessageBoxActivity.java

@@ -24,6 +24,7 @@ import com.cooleshow.base.utils.GsonUtils;
 import com.cooleshow.base.utils.JumpUtils;
 import com.cooleshow.base.utils.JumpUtils;
 import com.cooleshow.base.utils.LogUtils;
 import com.cooleshow.base.utils.LogUtils;
 import com.cooleshow.base.utils.SizeUtils;
 import com.cooleshow.base.utils.SizeUtils;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.MessageBoxAdapter;
 import com.cooleshow.teacher.adapter.MessageBoxAdapter;
 import com.cooleshow.teacher.bean.CountOfUnreadBean;
 import com.cooleshow.teacher.bean.CountOfUnreadBean;
@@ -40,7 +41,6 @@ import org.json.JSONObject;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
-import io.rong.imkit.utils.StatusBarUtil;
 
 
 /**
 /**
  * 创建日期:2022/5/24 11:14
  * 创建日期:2022/5/24 11:14
@@ -102,7 +102,7 @@ public class MessageBoxActivity extends BaseMVPActivity<ActivityMessageBoxBindin
     @Override
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
     }
     }
 
 
     private MessageBoxAdapter messageBoxAdapter;
     private MessageBoxAdapter messageBoxAdapter;

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/mine/CheckModifyPhoneNumActivity.java

@@ -13,12 +13,12 @@ import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.ToastUtils;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.contract.CheckModifyPhoneNumContract;
 import com.cooleshow.teacher.contract.CheckModifyPhoneNumContract;
 import com.cooleshow.teacher.databinding.ActivityCheckModifyPhonenumBinding;
 import com.cooleshow.teacher.databinding.ActivityCheckModifyPhonenumBinding;
 import com.cooleshow.teacher.presenter.mine.CheckModifyPhoneNumPresenter;
 import com.cooleshow.teacher.presenter.mine.CheckModifyPhoneNumPresenter;
 
 
-import io.rong.imkit.utils.StatusBarUtil;
 
 
 /**
 /**
  * 创建日期:2022/5/17 10:02
  * 创建日期:2022/5/17 10:02
@@ -51,7 +51,7 @@ public class CheckModifyPhoneNumActivity extends BaseMVPActivity<ActivityCheckMo
     @Override
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
     }
     }
     @Override
     @Override
     protected void initView() {
     protected void initView() {

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/mine/CoursewareListActivity.java

@@ -19,7 +19,7 @@ import com.cooleshow.teacher.adapter.CoursewareListAdapter;
 import com.cooleshow.teacher.contract.CoursewareContract;
 import com.cooleshow.teacher.contract.CoursewareContract;
 import com.cooleshow.teacher.databinding.ActivityCoursewareListLayoutBinding;
 import com.cooleshow.teacher.databinding.ActivityCoursewareListLayoutBinding;
 import com.cooleshow.teacher.presenter.mine.CoursewareListPresenter;
 import com.cooleshow.teacher.presenter.mine.CoursewareListPresenter;
-import com.daya.live_teaching.model.CoursewareListBean;
+import com.dayayuemeng.classroom.bean.CoursewareListBean;
 
 
 import androidx.annotation.NonNull;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.Nullable;

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/mine/EquipmentTestActivity.java

@@ -28,6 +28,7 @@ import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.FileUtils;
 import com.cooleshow.base.utils.FileUtils;
 import com.cooleshow.base.utils.NetworkUtil;
 import com.cooleshow.base.utils.NetworkUtil;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.widgets.DialogUtil;
 import com.cooleshow.base.widgets.DialogUtil;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.TestingListAdapter;
 import com.cooleshow.teacher.adapter.TestingListAdapter;
@@ -41,7 +42,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.List;
 import java.util.Timer;
 import java.util.Timer;
 
 
-import io.rong.imkit.utils.StatusBarUtil;
 
 
 /**
 /**
  * 创建日期:2022/6/1 16:21
  * 创建日期:2022/6/1 16:21
@@ -93,7 +93,7 @@ public class EquipmentTestActivity extends BaseMVPActivity<ActivityEquipmentTest
     @Override
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
     }
     }
 
 
     @Override
     @Override

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/mine/FeedBackActivity.java

@@ -12,6 +12,7 @@ import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.ToastUtils;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.contract.FeedBackContract;
 import com.cooleshow.teacher.contract.FeedBackContract;
 import com.cooleshow.teacher.databinding.ActivityFeedbackBinding;
 import com.cooleshow.teacher.databinding.ActivityFeedbackBinding;
@@ -23,7 +24,6 @@ import org.json.JSONObject;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map;
 
 
-import io.rong.imkit.utils.StatusBarUtil;
 
 
 /**
 /**
  * 创建日期:2022/5/18 16:25
  * 创建日期:2022/5/18 16:25
@@ -58,7 +58,7 @@ public class FeedBackActivity extends BaseMVPActivity<ActivityFeedbackBinding, F
     @Override
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
     }
     }
 
 
     @Override
     @Override

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/mine/InputBankVCodeActivity.java

@@ -12,6 +12,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.widgets.VerifyEditText;
 import com.cooleshow.base.widgets.VerifyEditText;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.bean.ResponseBindCardBean;
 import com.cooleshow.teacher.bean.ResponseBindCardBean;
@@ -28,7 +29,6 @@ import java.util.Map;
 import java.util.Timer;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.TimerTask;
 
 
-import io.rong.imkit.utils.StatusBarUtil;
 
 
 /**
 /**
  * 创建日期:2022/5/19 14:11
  * 创建日期:2022/5/19 14:11
@@ -66,7 +66,7 @@ public class InputBankVCodeActivity extends BaseMVPActivity<ActivityInputBankVco
     @Override
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
     }
     }
 
 
     private String jsonString;
     private String jsonString;

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/mine/ModifyNickNameActivity.java

@@ -14,6 +14,7 @@ import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.ToastUtils;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.contract.ModifyNickNameContract;
 import com.cooleshow.teacher.contract.ModifyNickNameContract;
 import com.cooleshow.teacher.databinding.ActivityModifyNicknameBinding;
 import com.cooleshow.teacher.databinding.ActivityModifyNicknameBinding;
@@ -23,7 +24,6 @@ import com.cooleshow.usercenter.bean.SetDetailBean;
 import org.json.JSONException;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONObject;
 
 
-import io.rong.imkit.utils.StatusBarUtil;
 
 
 /**
 /**
  * 创建日期:2022/5/16 17:22
  * 创建日期:2022/5/16 17:22
@@ -59,7 +59,7 @@ public class ModifyNickNameActivity extends BaseMVPActivity<ActivityModifyNickna
     @Override
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
     }
     }
 
 
     @Override
     @Override

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/mine/ModifyPasswordActivity.java

@@ -17,6 +17,7 @@ import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.ToastUtils;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.widgets.dialog.ImgVerifyCodeDialog;
 import com.cooleshow.base.widgets.dialog.ImgVerifyCodeDialog;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.contract.ModifyPasswordContract;
 import com.cooleshow.teacher.contract.ModifyPasswordContract;
@@ -39,7 +40,6 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.disposables.Disposable;
-import io.rong.imkit.utils.StatusBarUtil;
 
 
 /**
 /**
  * 创建日期:2022/5/17 13:33
  * 创建日期:2022/5/17 13:33
@@ -107,7 +107,7 @@ public class ModifyPasswordActivity extends BaseMVPActivity<ActivityModifyPasswo
     @Override
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
     }
     }
 
 
     @Autowired(name = "phoneNum")
     @Autowired(name = "phoneNum")

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/mine/ModifyPhoneNumActivity.java

@@ -17,6 +17,7 @@ import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.ToastUtils;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.widgets.dialog.ImgVerifyCodeDialog;
 import com.cooleshow.base.widgets.dialog.ImgVerifyCodeDialog;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.contract.ModifyPhoneNumContract;
 import com.cooleshow.teacher.contract.ModifyPhoneNumContract;
@@ -34,7 +35,6 @@ import java.util.Map;
 import java.util.Timer;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.TimerTask;
 
 
-import io.rong.imkit.utils.StatusBarUtil;
 
 
 /**
 /**
  * 创建日期:2022/5/17 10:49
  * 创建日期:2022/5/17 10:49
@@ -77,7 +77,7 @@ public class ModifyPhoneNumActivity extends BaseMVPActivity<ActivityModifyPhonen
     @Override
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
     }
     }
 
 
     @Autowired(name = "oldPhone")
     @Autowired(name = "oldPhone")

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/mine/MyBankCardActivity.java

@@ -10,6 +10,7 @@ import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.PermissionUtils;
 import com.cooleshow.base.utils.PermissionUtils;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.ToastUtils;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.widgets.CommonDialog;
 import com.cooleshow.base.widgets.CommonDialog;
 import com.cooleshow.base.widgets.CommonTipDialog;
 import com.cooleshow.base.widgets.CommonTipDialog;
 import com.cooleshow.base.widgets.DialogUtil;
 import com.cooleshow.base.widgets.DialogUtil;
@@ -25,7 +26,6 @@ import com.cooleshow.teacher.presenter.mine.MyBankCardPresenter;
 import org.json.JSONException;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONObject;
 
 
-import io.rong.imkit.utils.StatusBarUtil;
 
 
 /**
 /**
  * 创建日期:2022/5/18 16:57
  * 创建日期:2022/5/18 16:57
@@ -73,7 +73,7 @@ public class MyBankCardActivity extends BaseMVPActivity<ActivityMyBankCardBindin
 
 
     @Override
     @Override
     protected void initView() {
     protected void initView() {
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
         initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "我的银行卡");
         initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "我的银行卡");
         viewBinding.toolbarInclude.tvRightText.setTextColor(getResources().getColor(com.cooleshow.base.R.color.common_black));
         viewBinding.toolbarInclude.tvRightText.setTextColor(getResources().getColor(com.cooleshow.base.R.color.common_black));
         viewBinding.toolbarInclude.tvRightText.setVisibility(View.GONE);
         viewBinding.toolbarInclude.tvRightText.setVisibility(View.GONE);

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/mine/NetworkMonitoringActivity.java

@@ -13,6 +13,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.NetworkUtil;
 import com.cooleshow.base.utils.NetworkUtil;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.widgets.BaseDialog;
 import com.cooleshow.base.widgets.BaseDialog;
 import com.cooleshow.base.widgets.DialogUtil;
 import com.cooleshow.base.widgets.DialogUtil;
 import com.cooleshow.base.widgets.RoundProgressBar;
 import com.cooleshow.base.widgets.RoundProgressBar;
@@ -25,7 +26,6 @@ import com.cooleshow.teacher.presenter.mine.NetworkMonitoringPresenter;
 
 
 import java.util.Random;
 import java.util.Random;
 
 
-import io.rong.imkit.utils.StatusBarUtil;
 
 
 /**
 /**
  * 创建日期:2022/6/1 14:50
  * 创建日期:2022/6/1 14:50
@@ -58,7 +58,7 @@ public class NetworkMonitoringActivity extends BaseMVPActivity<ActivityNetworkMo
     @Override
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
 
 
     }
     }
     @Override
     @Override

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/mine/PayTestActivity.java

@@ -16,6 +16,7 @@ import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.ToastUtils;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.bean.PayTestBean;
 import com.cooleshow.teacher.bean.PayTestBean;
 import com.cooleshow.teacher.bean.alipay.AuthResult;
 import com.cooleshow.teacher.bean.alipay.AuthResult;
@@ -34,7 +35,6 @@ import org.json.JSONObject;
 
 
 import java.util.Map;
 import java.util.Map;
 
 
-import io.rong.imkit.utils.StatusBarUtil;
 
 
 /**
 /**
  * 创建日期:2022/5/25 13:46
  * 创建日期:2022/5/25 13:46
@@ -89,7 +89,7 @@ public class PayTestActivity extends BaseMVPActivity<ActivityPayTestBinding, Pay
     @Override
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
         api = WXAPIFactory.createWXAPI(this, null);
         api = WXAPIFactory.createWXAPI(this, null);
         api.registerApp("wx149a928c415c137a");
         api.registerApp("wx149a928c415c137a");
     }
     }

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/mine/PersonalCertificationActivity.java

@@ -17,6 +17,7 @@ import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.SpannableStringUtils;
 import com.cooleshow.base.utils.SpannableStringUtils;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.ToastUtils;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.utils.helper.WebStartHelper;
 import com.cooleshow.base.utils.helper.WebStartHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.contract.PersonalCertificationContract;
 import com.cooleshow.teacher.contract.PersonalCertificationContract;
@@ -26,7 +27,6 @@ import com.cooleshow.teacher.presenter.mine.PersonalCertificationPresenter;
 import org.json.JSONException;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONObject;
 
 
-import io.rong.imkit.utils.StatusBarUtil;
 
 
 /**
 /**
  * 创建日期:2022/5/17 14:17
  * 创建日期:2022/5/17 14:17
@@ -73,7 +73,7 @@ public class PersonalCertificationActivity extends BaseMVPActivity<ActivityPerso
     @Override
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
     }
     }
 
 
     @Override
     @Override

+ 3 - 5
teacher/src/main/java/com/cooleshow/teacher/ui/mine/PersonalSettingActivity.java

@@ -19,6 +19,8 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.utils.MyFileUtils;
 import com.cooleshow.base.utils.MyFileUtils;
+import com.cooleshow.base.utils.helper.GlideEngine;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.usercenter.bean.TeacherUserInfo;
 import com.cooleshow.usercenter.bean.TeacherUserInfo;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
@@ -32,7 +34,6 @@ import com.cooleshow.teacher.contract.PersonalSettingContract;
 import com.cooleshow.teacher.databinding.ActivityPersonalSettingBinding;
 import com.cooleshow.teacher.databinding.ActivityPersonalSettingBinding;
 import com.cooleshow.teacher.presenter.mine.PersonalSettingPresenter;
 import com.cooleshow.teacher.presenter.mine.PersonalSettingPresenter;
 import com.cooleshow.usercenter.bean.SetDetailBean;
 import com.cooleshow.usercenter.bean.SetDetailBean;
-import com.daya.live_teaching.utils.GlideEngine;
 import com.luck.picture.lib.PictureSelector;
 import com.luck.picture.lib.PictureSelector;
 import com.luck.picture.lib.compress.CompressionPredicate;
 import com.luck.picture.lib.compress.CompressionPredicate;
 import com.luck.picture.lib.compress.Luban;
 import com.luck.picture.lib.compress.Luban;
@@ -50,9 +51,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
-import io.rong.imkit.RongIM;
-import io.rong.imkit.utils.StatusBarUtil;
-import io.rong.imlib.model.UserInfo;
 
 
 /**
 /**
  * 创建日期:2022/5/16 16:07
  * 创建日期:2022/5/16 16:07
@@ -72,7 +70,7 @@ public class PersonalSettingActivity extends BaseMVPActivity<ActivityPersonalSet
     @Override
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
 
 
     }
     }
 
 

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/mine/SettingActivity.java

@@ -15,6 +15,7 @@ import com.cooleshow.base.constanst.EventConstants;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.SPUtils;
 import com.cooleshow.base.utils.SPUtils;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.utils.helper.WebStartHelper;
 import com.cooleshow.base.utils.helper.WebStartHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.contract.SettingContract;
 import com.cooleshow.teacher.contract.SettingContract;
@@ -24,7 +25,6 @@ import com.cooleshow.teacher.presenter.mine.SettingPresenter;
 import com.cooleshow.usercenter.constants.UserConstants;
 import com.cooleshow.usercenter.constants.UserConstants;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.cooleshow.usercenter.helper.UserHelper;
 
 
-import io.rong.imkit.utils.StatusBarUtil;
 
 
 /**
 /**
  * 创建日期:2022/5/16 16:55
  * 创建日期:2022/5/16 16:55
@@ -79,7 +79,7 @@ public class SettingActivity extends BaseMVPActivity<ActivitySettingBinding, Set
     @Override
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
     }
     }
 
 
     private boolean is_detection;
     private boolean is_detection;

+ 0 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/mine/UnBindBankCardActivity.java

@@ -26,7 +26,6 @@ import com.cooleshow.usercenter.constants.UserConstants;
 import org.json.JSONException;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONObject;
 
 
-import io.rong.imkit.utils.StatusBarUtil;
 
 
 @Route(path = RouterPath.MineCenter.MINE_UNBIND_BANKCARD)
 @Route(path = RouterPath.MineCenter.MINE_UNBIND_BANKCARD)
 public class UnBindBankCardActivity extends BaseMVPActivity<ActivityUnBindBankCardBinding, MyBankCardPresenter> implements MyBankCardContract.MyBankCardView {
 public class UnBindBankCardActivity extends BaseMVPActivity<ActivityUnBindBankCardBinding, MyBankCardPresenter> implements MyBankCardContract.MyBankCardView {

+ 3 - 5
teacher/src/main/java/com/cooleshow/teacher/ui/minestyle/MineStylePageActivity.java

@@ -36,6 +36,8 @@ import com.cooleshow.base.utils.SizeUtils;
 import com.cooleshow.base.utils.SoftKeyboardUtils;
 import com.cooleshow.base.utils.SoftKeyboardUtils;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.base.utils.UiUtils;
+import com.cooleshow.base.utils.helper.GlideEngine;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.widgets.CommonItemDecoration;
 import com.cooleshow.base.widgets.CommonItemDecoration;
 import com.cooleshow.base.widgets.EmptyViewLayout;
 import com.cooleshow.base.widgets.EmptyViewLayout;
 import com.cooleshow.base.widgets.dialog.CommonDialog;
 import com.cooleshow.base.widgets.dialog.CommonDialog;
@@ -54,7 +56,6 @@ import com.cooleshow.teacher.widgets.StyleEmptyView;
 import com.cooleshow.usercenter.bean.SetDetailBean;
 import com.cooleshow.usercenter.bean.SetDetailBean;
 import com.cooleshow.usercenter.bean.TeacherUserInfo;
 import com.cooleshow.usercenter.bean.TeacherUserInfo;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.cooleshow.usercenter.helper.UserHelper;
-import com.daya.live_teaching.utils.GlideEngine;
 import com.google.android.flexbox.AlignItems;
 import com.google.android.flexbox.AlignItems;
 import com.google.android.flexbox.FlexDirection;
 import com.google.android.flexbox.FlexDirection;
 import com.google.android.flexbox.FlexWrap;
 import com.google.android.flexbox.FlexWrap;
@@ -73,9 +74,6 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
-import io.rong.imkit.utils.StatusBarUtil;
-import io.rong.imkit.utils.helper.ChatGroupHelper;
-import io.rong.imkit.utils.helper.OpenChatHelper;
 
 
 /**
 /**
  * 创建日期:2022/5/13 14:02
  * 创建日期:2022/5/13 14:02
@@ -189,7 +187,7 @@ public class MineStylePageActivity extends BaseMVPActivity<ActivityMineStylePage
                 (WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN |
                 (WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN |
                         WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
                         WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
     }
     }
 
 
     @Override
     @Override

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/minestyle/TeachableInstrumentActivity.java

@@ -13,6 +13,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.TeachableInstrumentAdapter;
 import com.cooleshow.teacher.adapter.TeachableInstrumentAdapter;
 import com.cooleshow.teacher.bean.TeachableInstrumentBean;
 import com.cooleshow.teacher.bean.TeachableInstrumentBean;
@@ -24,7 +25,6 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
-import io.rong.imkit.utils.StatusBarUtil;
 
 
 /**
 /**
  * 创建日期:2022/5/13 15:25
  * 创建日期:2022/5/13 15:25
@@ -100,7 +100,7 @@ public class TeachableInstrumentActivity extends BaseMVPActivity<ActivityTeachab
     @Override
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
     }
     }
 
 
     @Override
     @Override

+ 2 - 4
teacher/src/main/java/com/cooleshow/teacher/ui/score/MineScoreActivity.java

@@ -22,6 +22,7 @@ import com.cooleshow.base.utils.SoftKeyboardUtils;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.Utils;
 import com.cooleshow.base.utils.Utils;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.utils.helper.WebStartHelper;
 import com.cooleshow.base.utils.helper.WebStartHelper;
 import com.cooleshow.base.widgets.poplist.PopMenuBean;
 import com.cooleshow.base.widgets.poplist.PopMenuBean;
 import com.cooleshow.base.widgets.poplist.PopupListWindow;
 import com.cooleshow.base.widgets.poplist.PopupListWindow;
@@ -59,9 +60,6 @@ import java.util.List;
 
 
 import androidx.viewpager2.adapter.FragmentStateAdapter;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
 import androidx.viewpager2.widget.ViewPager2;
 import androidx.viewpager2.widget.ViewPager2;
-import io.rong.imkit.utils.StatusBarUtil;
-import io.rong.imkit.utils.helper.OpenChatHelper;
-import io.rong.imlib.model.Conversation;
 
 
 /**
 /**
  * 创建日期:2022/5/20 16:34
  * 创建日期:2022/5/20 16:34
@@ -142,7 +140,7 @@ public class MineScoreActivity extends BaseMVPActivity<ActivityMineScoreBinding,
     @Override
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
     }
     }
 
 
     @Override
     @Override

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/splash/GuideActivity.java

@@ -22,6 +22,7 @@ import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.SPUtils;
 import com.cooleshow.base.utils.SPUtils;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.ViewPagerAdapter;
 import com.cooleshow.teacher.adapter.ViewPagerAdapter;
 import com.cooleshow.teacher.databinding.ActivityGuideBinding;
 import com.cooleshow.teacher.databinding.ActivityGuideBinding;
@@ -32,7 +33,6 @@ import com.cooleshow.usercenter.helper.UserHelper;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
-import io.rong.imkit.utils.StatusBarUtil;
 
 
 /**
 /**
  * 创建日期:2022/5/24 17:53
  * 创建日期:2022/5/24 17:53
@@ -74,7 +74,7 @@ public class GuideActivity extends BaseMVPActivity<ActivityGuideBinding, GuidePr
     @Override
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
     }
     }
 
 
     private void goAction() {
     private void goAction() {

+ 2 - 4
teacher/src/main/java/com/cooleshow/teacher/ui/web/HtmlActivity.java

@@ -61,6 +61,7 @@ import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.UriUtils;
 import com.cooleshow.base.utils.UriUtils;
 import com.cooleshow.base.utils.WebParamsUtils;
 import com.cooleshow.base.utils.WebParamsUtils;
 import com.cooleshow.base.utils.helper.DialogHelper;
 import com.cooleshow.base.utils.helper.DialogHelper;
+import com.cooleshow.base.utils.helper.GlideEngine;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.utils.helper.upload.UploadHelper;
 import com.cooleshow.base.utils.helper.upload.UploadHelper;
 import com.cooleshow.base.widgets.DialogUtil;
 import com.cooleshow.base.widgets.DialogUtil;
@@ -74,12 +75,10 @@ import com.cooleshow.teacher.bean.alipay.PayResult;
 import com.cooleshow.teacher.bean.weixinpay.WeixinPayInfo;
 import com.cooleshow.teacher.bean.weixinpay.WeixinPayInfo;
 import com.cooleshow.teacher.databinding.ActivityHtml1Binding;
 import com.cooleshow.teacher.databinding.ActivityHtml1Binding;
 import com.cooleshow.teacher.helper.ShareHelper;
 import com.cooleshow.teacher.helper.ShareHelper;
-import com.cooleshow.teacher.ui.live.TeacherLiveRoomActivity;
 import com.cooleshow.base.utils.MyFileUtils;
 import com.cooleshow.base.utils.MyFileUtils;
 import com.cooleshow.teacher.widgets.LollipopFixedWebView;
 import com.cooleshow.teacher.widgets.LollipopFixedWebView;
 import com.cooleshow.teacher.widgets.helper.JsInterfaceUtils;
 import com.cooleshow.teacher.widgets.helper.JsInterfaceUtils;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.cooleshow.usercenter.helper.UserHelper;
-import com.daya.live_teaching.utils.GlideEngine;
 import com.daya.tclive.helper.TTLiveHelper;
 import com.daya.tclive.helper.TTLiveHelper;
 import com.google.gson.Gson;
 import com.google.gson.Gson;
 import com.gyf.immersionbar.ImmersionBar;
 import com.gyf.immersionbar.ImmersionBar;
@@ -122,7 +121,6 @@ import java.util.Map;
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.schedulers.Schedulers;
-import io.rong.imkit.utils.helper.OpenChatHelper;
 import okhttp3.ResponseBody;
 import okhttp3.ResponseBody;
 
 
 @Route(path = RouterPath.WebCenter.ACTIVITY_HTML)
 @Route(path = RouterPath.WebCenter.ACTIVITY_HTML)
@@ -601,7 +599,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
         if (isFinishing() || isDestroyed()) {
         if (isFinishing() || isDestroyed()) {
             return;
             return;
         }
         }
-        if (TextUtils.equals(OpenChatHelper.SINGLE_CHAT, type)) {
+        if (TextUtils.equals(ChatHelper.SINGLE_CHAT, type)) {
             ChatHelper.getInstance().goChat(id, "");
             ChatHelper.getInstance().goChat(id, "");
         } else {
         } else {
             ChatHelper.getInstance().goGroupChat(id, "");
             ChatHelper.getInstance().goGroupChat(id, "");

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/web/HtmlHorizontalScreenActivity.java

@@ -58,6 +58,7 @@ import com.cooleshow.base.utils.UriUtils;
 import com.cooleshow.base.utils.Utils;
 import com.cooleshow.base.utils.Utils;
 import com.cooleshow.base.utils.WebParamsUtils;
 import com.cooleshow.base.utils.WebParamsUtils;
 import com.cooleshow.base.utils.helper.DialogHelper;
 import com.cooleshow.base.utils.helper.DialogHelper;
+import com.cooleshow.base.utils.helper.GlideEngine;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.utils.helper.upload.UploadHelper;
 import com.cooleshow.base.utils.helper.upload.UploadHelper;
 import com.cooleshow.base.widgets.DialogUtil;
 import com.cooleshow.base.widgets.DialogUtil;
@@ -74,7 +75,6 @@ import com.cooleshow.base.utils.MyFileUtils;
 import com.cooleshow.teacher.widgets.LollipopFixedWebView;
 import com.cooleshow.teacher.widgets.LollipopFixedWebView;
 import com.cooleshow.teacher.widgets.helper.JsInterfaceUtils;
 import com.cooleshow.teacher.widgets.helper.JsInterfaceUtils;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.cooleshow.usercenter.helper.UserHelper;
-import com.daya.live_teaching.utils.GlideEngine;
 import com.google.gson.Gson;
 import com.google.gson.Gson;
 import com.gyf.immersionbar.ImmersionBar;
 import com.gyf.immersionbar.ImmersionBar;
 import com.luck.picture.lib.PictureSelector;
 import com.luck.picture.lib.PictureSelector;

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/web/WebActivity.java

@@ -38,6 +38,7 @@ import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.UriUtils;
 import com.cooleshow.base.utils.UriUtils;
 import com.cooleshow.base.utils.Utils;
 import com.cooleshow.base.utils.Utils;
+import com.cooleshow.base.utils.helper.GlideEngine;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.utils.helper.upload.UploadHelper;
 import com.cooleshow.base.utils.helper.upload.UploadHelper;
 import com.cooleshow.base.widgets.DialogUtil;
 import com.cooleshow.base.widgets.DialogUtil;
@@ -48,7 +49,6 @@ import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.databinding.ActivityHtmlBinding;
 import com.cooleshow.teacher.databinding.ActivityHtmlBinding;
 import com.cooleshow.teacher.widgets.helper.JsInterfaceHelper;
 import com.cooleshow.teacher.widgets.helper.JsInterfaceHelper;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.cooleshow.usercenter.helper.UserHelper;
-import com.daya.live_teaching.utils.GlideEngine;
 import com.luck.picture.lib.PictureSelector;
 import com.luck.picture.lib.PictureSelector;
 import com.luck.picture.lib.config.PictureConfig;
 import com.luck.picture.lib.config.PictureConfig;
 import com.luck.picture.lib.config.PictureMimeType;
 import com.luck.picture.lib.config.PictureMimeType;

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/work/HomeWorkActivity.java

@@ -10,6 +10,7 @@ import androidx.viewpager.widget.ViewPager;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.teacher.adapter.HomeWorkPagerAdapter;
 import com.cooleshow.teacher.adapter.HomeWorkPagerAdapter;
 import com.cooleshow.teacher.contract.HomeWorkActContract;
 import com.cooleshow.teacher.contract.HomeWorkActContract;
 import com.cooleshow.teacher.databinding.ActivityHomeworkBinding;
 import com.cooleshow.teacher.databinding.ActivityHomeworkBinding;
@@ -20,7 +21,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Arrays;
 import java.util.List;
 import java.util.List;
 
 
-import io.rong.imkit.utils.StatusBarUtil;
 
 
 /**
 /**
  * 创建日期:2022/5/23 10:47
  * 创建日期:2022/5/23 10:47
@@ -38,7 +38,7 @@ public class HomeWorkActivity extends BaseMVPActivity<ActivityHomeworkBinding, H
 
 
     @Override
     @Override
     protected void initView() {
     protected void initView() {
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
         initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "课后作业");
         initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "课后作业");
         tabLayout = viewBinding.tablayout;
         tabLayout = viewBinding.tablayout;
         viewPager = viewBinding.viewpager;
         viewPager = viewBinding.viewpager;

+ 0 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/work/HomeWorkFragment.java

@@ -9,7 +9,6 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView;
-import io.rong.imkit.utils.helper.OpenChatHelper;
 
 
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.bigkoo.pickerview.builder.TimePickerBuilder;
 import com.bigkoo.pickerview.builder.TimePickerBuilder;

+ 174 - 174
teacher/src/main/java/com/cooleshow/teacher/widgets/dialog/LiveMicManagerDialog.java

@@ -1,174 +1,174 @@
-package com.cooleshow.teacher.widgets.dialog;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.graphics.Typeface;
-import android.os.Bundle;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.TextView;
-
-import com.cooleshow.base.utils.LogUtils;
-import com.cooleshow.teacher.R;
-import com.cooleshow.teacher.adapter.LiveBeautyPagerAdapter;
-import com.cooleshow.teacher.ui.live.LiveApplyMicFragment;
-import com.cooleshow.teacher.ui.live.LiveOnMicFragment;
-import com.google.android.material.tabs.TabLayout;
-import com.google.android.material.tabs.TabLayoutMediator;
-import com.rong.io.live.bean.User;
-
-import java.util.ArrayList;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.viewpager2.widget.ViewPager2;
-
-/**
- * Author by pq, Date on 2022/6/11.
- */
-public class LiveMicManagerDialog extends Dialog implements View.OnClickListener {
-    private TabLayout mTabLayout;
-    private ViewPager2 mViewPager;
-    private LiveApplyMicFragment mApplyMicFragment;
-    private LiveOnMicFragment onMicFragment;
-    private OnEventListener mEventListener;
-    private FragmentActivity mFragmentActivity;
-    private String[] titles = new String[]{"连麦中", "申请中"};
-
-
-    public LiveMicManagerDialog(@NonNull Context context) {
-        super(context, R.style.MyBottomDialogStyle);
-        if (context instanceof FragmentActivity) {
-            mFragmentActivity = (FragmentActivity) context;
-        }
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.dialog_live_mic_manager_layout);
-        Window window = getWindow();
-        //设置dialog在屏幕底部
-        window.setGravity(Gravity.BOTTOM);
-        //设置dialog弹出时的动画效果,从屏幕底部向上弹出
-        window.setWindowAnimations(com.cooleshow.base.R.style.BottomAnimation);
-        window.getDecorView().setPadding(0, 0, 0, 0);
-        //获得window窗口的属性
-        WindowManager.LayoutParams lp = window.getAttributes();
-        //设置窗口宽度为充满全屏
-        lp.width = WindowManager.LayoutParams.MATCH_PARENT;
-        //设置窗口高度为包裹内容
-        lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
-        lp.horizontalMargin = 0;
-        lp.verticalMargin = 0;
-        //将设置好的属性set回去
-        window.setAttributes(lp);
-        mTabLayout = findViewById(R.id.tab_layout);
-        mViewPager = findViewById(R.id.viewPager);
-
-        TabLayoutMediator tabLayoutMediator = new TabLayoutMediator(mTabLayout, mViewPager, new TabLayoutMediator.TabConfigurationStrategy() {
-            @Override
-            public void onConfigureTab(@NonNull TabLayout.Tab tab, int position) {
-                createTab(tab, titles[position]);
-            }
-        });
-        initListener();
-        LiveBeautyPagerAdapter beautyPagerAdapter = new LiveBeautyPagerAdapter(mFragmentActivity);
-        onMicFragment = new LiveOnMicFragment();
-        mApplyMicFragment = new LiveApplyMicFragment();
-        if (mEventListener != null) {
-            mApplyMicFragment.setOnEventListener(mEventListener);
-            onMicFragment.setOnEventListener(mEventListener);
-        }
-        ArrayList<Fragment> fragments = new ArrayList();
-        fragments.add(onMicFragment);
-        fragments.add(mApplyMicFragment);
-        beautyPagerAdapter.setData(fragments);
-        mViewPager.setAdapter(beautyPagerAdapter);
-        mViewPager.setOffscreenPageLimit(2);
-        tabLayoutMediator.attach();
-    }
-
-    private void initListener() {
-        mTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
-            @Override
-            public void onTabSelected(TabLayout.Tab tab) {
-                if (tab != null && tab.getCustomView() != null) {
-                    View customView = tab.getCustomView();
-                    TextView tv_text = customView.findViewById(R.id.tv_text);
-                    tv_text.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_333333));
-                    tv_text.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
-                }
-            }
-
-            @Override
-            public void onTabUnselected(TabLayout.Tab tab) {
-                if (tab != null && tab.getCustomView() != null) {
-                    View customView = tab.getCustomView();
-                    TextView tv_text = customView.findViewById(R.id.tv_text);
-                    tv_text.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_666666));
-                    tv_text.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
-                }
-            }
-
-            @Override
-            public void onTabReselected(TabLayout.Tab tab) {
-
-            }
-        });
-    }
-
-    public void setFragmentActivity(FragmentActivity fragmentActivity) {
-        this.mFragmentActivity = fragmentActivity;
-    }
-
-    public void setOnMicListData(ArrayList<User> onMicListData) {
-        if (onMicFragment != null) {
-            onMicFragment.refresh(onMicListData);
-        }
-    }
-
-    public void setApplyListData(ArrayList<User> applyListData) {
-        if (mApplyMicFragment != null) {
-            mApplyMicFragment.refresh(applyListData);
-        }
-    }
-
-    private TabLayout.Tab createTab(TabLayout.Tab tab, String text) {
-        View view = LayoutInflater.from(getContext()).inflate(R.layout.view_live_beauty_tab_layout, null);
-        TextView tv_text = view.findViewById(R.id.tv_text);
-        tv_text.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_666666));
-        tv_text.setText(text);
-        tab.setCustomView(view);
-        return tab;
-    }
-
-
-    @Override
-    public void onClick(View v) {
-
-    }
-
-    public void setOnEventListener(OnEventListener listener) {
-        this.mEventListener = listener;
-    }
-
-    public interface OnEventListener {
-        //同意连麦申请
-        void onAgreeApply(User user);
-        //下麦操作
-        void onUnderMic(User user);
-
-        //拒绝全部连麦申请
-        void onRefuseAllMicApply();
-
-        //连麦模式控制
-        void onSwitchMicMode(boolean isEnable);
-        //全部下麦
-        void onUnderAllMic();
-    }
-}
+//package com.cooleshow.teacher.widgets.dialog;
+//
+//import android.app.Dialog;
+//import android.content.Context;
+//import android.graphics.Typeface;
+//import android.os.Bundle;
+//import android.view.Gravity;
+//import android.view.LayoutInflater;
+//import android.view.View;
+//import android.view.Window;
+//import android.view.WindowManager;
+//import android.widget.TextView;
+//
+//import com.cooleshow.base.utils.LogUtils;
+//import com.cooleshow.teacher.R;
+//import com.cooleshow.teacher.adapter.LiveBeautyPagerAdapter;
+//import com.cooleshow.teacher.ui.live.LiveApplyMicFragment;
+//import com.cooleshow.teacher.ui.live.LiveOnMicFragment;
+//import com.google.android.material.tabs.TabLayout;
+//import com.google.android.material.tabs.TabLayoutMediator;
+//import com.rong.io.live.bean.User;
+//
+//import java.util.ArrayList;
+//
+//import androidx.annotation.NonNull;
+//import androidx.fragment.app.Fragment;
+//import androidx.fragment.app.FragmentActivity;
+//import androidx.viewpager2.widget.ViewPager2;
+//
+///**
+// * Author by pq, Date on 2022/6/11.
+// */
+//public class LiveMicManagerDialog extends Dialog implements View.OnClickListener {
+//    private TabLayout mTabLayout;
+//    private ViewPager2 mViewPager;
+//    private LiveApplyMicFragment mApplyMicFragment;
+//    private LiveOnMicFragment onMicFragment;
+//    private OnEventListener mEventListener;
+//    private FragmentActivity mFragmentActivity;
+//    private String[] titles = new String[]{"连麦中", "申请中"};
+//
+//
+//    public LiveMicManagerDialog(@NonNull Context context) {
+//        super(context, R.style.MyBottomDialogStyle);
+//        if (context instanceof FragmentActivity) {
+//            mFragmentActivity = (FragmentActivity) context;
+//        }
+//    }
+//
+//    @Override
+//    protected void onCreate(Bundle savedInstanceState) {
+//        super.onCreate(savedInstanceState);
+//        setContentView(R.layout.dialog_live_mic_manager_layout);
+//        Window window = getWindow();
+//        //设置dialog在屏幕底部
+//        window.setGravity(Gravity.BOTTOM);
+//        //设置dialog弹出时的动画效果,从屏幕底部向上弹出
+//        window.setWindowAnimations(com.cooleshow.base.R.style.BottomAnimation);
+//        window.getDecorView().setPadding(0, 0, 0, 0);
+//        //获得window窗口的属性
+//        WindowManager.LayoutParams lp = window.getAttributes();
+//        //设置窗口宽度为充满全屏
+//        lp.width = WindowManager.LayoutParams.MATCH_PARENT;
+//        //设置窗口高度为包裹内容
+//        lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
+//        lp.horizontalMargin = 0;
+//        lp.verticalMargin = 0;
+//        //将设置好的属性set回去
+//        window.setAttributes(lp);
+//        mTabLayout = findViewById(R.id.tab_layout);
+//        mViewPager = findViewById(R.id.viewPager);
+//
+//        TabLayoutMediator tabLayoutMediator = new TabLayoutMediator(mTabLayout, mViewPager, new TabLayoutMediator.TabConfigurationStrategy() {
+//            @Override
+//            public void onConfigureTab(@NonNull TabLayout.Tab tab, int position) {
+//                createTab(tab, titles[position]);
+//            }
+//        });
+//        initListener();
+//        LiveBeautyPagerAdapter beautyPagerAdapter = new LiveBeautyPagerAdapter(mFragmentActivity);
+//        onMicFragment = new LiveOnMicFragment();
+//        mApplyMicFragment = new LiveApplyMicFragment();
+//        if (mEventListener != null) {
+//            mApplyMicFragment.setOnEventListener(mEventListener);
+//            onMicFragment.setOnEventListener(mEventListener);
+//        }
+//        ArrayList<Fragment> fragments = new ArrayList();
+//        fragments.add(onMicFragment);
+//        fragments.add(mApplyMicFragment);
+//        beautyPagerAdapter.setData(fragments);
+//        mViewPager.setAdapter(beautyPagerAdapter);
+//        mViewPager.setOffscreenPageLimit(2);
+//        tabLayoutMediator.attach();
+//    }
+//
+//    private void initListener() {
+//        mTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+//            @Override
+//            public void onTabSelected(TabLayout.Tab tab) {
+//                if (tab != null && tab.getCustomView() != null) {
+//                    View customView = tab.getCustomView();
+//                    TextView tv_text = customView.findViewById(R.id.tv_text);
+//                    tv_text.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_333333));
+//                    tv_text.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
+//                }
+//            }
+//
+//            @Override
+//            public void onTabUnselected(TabLayout.Tab tab) {
+//                if (tab != null && tab.getCustomView() != null) {
+//                    View customView = tab.getCustomView();
+//                    TextView tv_text = customView.findViewById(R.id.tv_text);
+//                    tv_text.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_666666));
+//                    tv_text.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
+//                }
+//            }
+//
+//            @Override
+//            public void onTabReselected(TabLayout.Tab tab) {
+//
+//            }
+//        });
+//    }
+//
+//    public void setFragmentActivity(FragmentActivity fragmentActivity) {
+//        this.mFragmentActivity = fragmentActivity;
+//    }
+//
+//    public void setOnMicListData(ArrayList<User> onMicListData) {
+//        if (onMicFragment != null) {
+//            onMicFragment.refresh(onMicListData);
+//        }
+//    }
+//
+//    public void setApplyListData(ArrayList<User> applyListData) {
+//        if (mApplyMicFragment != null) {
+//            mApplyMicFragment.refresh(applyListData);
+//        }
+//    }
+//
+//    private TabLayout.Tab createTab(TabLayout.Tab tab, String text) {
+//        View view = LayoutInflater.from(getContext()).inflate(R.layout.view_live_beauty_tab_layout, null);
+//        TextView tv_text = view.findViewById(R.id.tv_text);
+//        tv_text.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_666666));
+//        tv_text.setText(text);
+//        tab.setCustomView(view);
+//        return tab;
+//    }
+//
+//
+//    @Override
+//    public void onClick(View v) {
+//
+//    }
+//
+//    public void setOnEventListener(OnEventListener listener) {
+//        this.mEventListener = listener;
+//    }
+//
+//    public interface OnEventListener {
+//        //同意连麦申请
+//        void onAgreeApply(User user);
+//        //下麦操作
+//        void onUnderMic(User user);
+//
+//        //拒绝全部连麦申请
+//        void onRefuseAllMicApply();
+//
+//        //连麦模式控制
+//        void onSwitchMicMode(boolean isEnable);
+//        //全部下麦
+//        void onUnderAllMic();
+//    }
+//}

+ 0 - 2
teacher/src/main/java/com/cooleshow/teacher/widgets/helper/JsInterfaceAccomPanyUtils.java

@@ -22,8 +22,6 @@ import com.gyf.immersionbar.ImmersionBar;
 
 
 import org.json.JSONObject;
 import org.json.JSONObject;
 
 
-import io.rong.imkit.RongIM;
-import io.rong.imlib.model.UserInfo;
 
 
 /**
 /**
  * Description:
  * Description:

+ 0 - 2
teacher/src/main/java/com/cooleshow/teacher/widgets/helper/JsInterfaceUtils.java

@@ -24,8 +24,6 @@ import com.gyf.immersionbar.ImmersionBar;
 
 
 import org.json.JSONObject;
 import org.json.JSONObject;
 
 
-import io.rong.imkit.RongIM;
-import io.rong.imlib.model.UserInfo;
 
 
 /**
 /**
  * Description:
  * Description:

+ 152 - 152
teacher/src/main/java/com/cooleshow/teacher/widgets/helper/VideoViewManager.java

@@ -1,152 +1,152 @@
-package com.cooleshow.teacher.widgets.helper;
-
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ProgressBar;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.cooleshow.teacher.R;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import cn.rongcloud.rtc.api.stream.RCRTCVideoView;
-import cn.rongcloud.rtc.api.stream.view.RCRTCRendererEventsListener;
-import cn.rongcloud.rtc.core.RendererCommon;
-
-public class VideoViewManager {
-
-    private static final String TAG = "VideoViewManager";
-    private static final int MAX_WAIT_RENDER_TIME = 8000;
-    ArrayList<RCRTCVideoView> arrayListVideoView;
-    int mWidth, mHeight;
-    private RelativeLayout flSurfaceContainer;
-    private View mStatusView;
-    private ProgressBar mPbLoading;
-    private TextView mTvLoading;
-    private TextView mTvLiveStatusTipText;
-    private TextView mTvRetry;
-
-    private Runnable mRunnable = new Runnable() {
-        @Override
-        public void run() {
-            showRetryStatus();
-        }
-    };
-
-    public VideoViewManager(RelativeLayout surfaceContainer, int width, int height) {
-        flSurfaceContainer = surfaceContainer;
-        mWidth = width;
-        mHeight = height;
-        initStatusView();
-    }
-
-    private void initStatusView() {
-        mStatusView = LayoutInflater.from(flSurfaceContainer.getContext()).inflate(R.layout.view_live_video_status_layout, flSurfaceContainer, false);
-        mPbLoading = mStatusView.findViewById(R.id.pb_loading);
-        mTvLoading = mStatusView.findViewById(R.id.tv_loading);
-        mTvLiveStatusTipText = mStatusView.findViewById(R.id.tv_live_status_tip_text);
-        mTvRetry = mStatusView.findViewById(R.id.tv_retry);
-    }
-
-    /**
-     * 2 列多行显示 videoview
-     *
-     * @param list
-     */
-    public void update(ArrayList<RCRTCVideoView> list, boolean isShowLoading) {
-        Log.i("pq", "update" + list.size());
-        arrayListVideoView = list;
-        int row = 0;
-        row = list.size();
-        flSurfaceContainer.removeAllViews();
-        int index = 0;
-        for (int i = 0; i < row; i++) {
-            RelativeLayout.LayoutParams layoutParams;
-            layoutParams = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
-            layoutParams.addRule(RelativeLayout.CENTER_IN_PARENT);
-            if (index >= arrayListVideoView.size()) {
-                break;
-            }
-            arrayListVideoView.get(i).setRendererEventsListener(new RCRTCRendererEventsListener() {
-                @Override
-                public void onFirstFrame() {
-                    Log.i("pq", "视频第一帧渲染");
-                    hideStatusView();
-
-                }
-            });
-            arrayListVideoView.get(i).setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FILL);
-            flSurfaceContainer.addView(arrayListVideoView.get(i), layoutParams);
-            index++;
-        }
-        if (isShowLoading) {
-            showLoadStatus();
-        }
-    }
-
-    public void setRetryClickListener(View.OnClickListener retryClickListener) {
-        if (mTvRetry != null) {
-            mTvRetry.setOnClickListener(retryClickListener);
-        }
-    }
-
-    private void hideStatusView() {
-        if (mStatusView == null) {
-            return;
-        }
-        mStatusView.removeCallbacks(mRunnable);
-        mStatusView.post(new Runnable() {
-            @Override
-            public void run() {
-                if (mStatusView != null) {
-                    mStatusView.setVisibility(View.GONE);
-                }
-            }
-        });
-    }
-
-    private void showLoadStatus() {
-        if (mStatusView == null) {
-            return;
-        }
-        flSurfaceContainer.addView(mStatusView);
-        mStatusView.setVisibility(View.VISIBLE);
-        mPbLoading.setVisibility(View.VISIBLE);
-        mTvLoading.setVisibility(View.VISIBLE);
-        mTvLiveStatusTipText.setVisibility(View.GONE);
-        mTvRetry.setVisibility(View.GONE);
-        mStatusView.postDelayed(mRunnable, MAX_WAIT_RENDER_TIME);
-    }
-
-    private void showRetryStatus() {
-        if (mStatusView == null) {
-            return;
-        }
-        mStatusView.setVisibility(View.VISIBLE);
-        mPbLoading.setVisibility(View.GONE);
-        mTvLoading.setVisibility(View.GONE);
-        mTvLiveStatusTipText.setVisibility(View.VISIBLE);
-        mTvRetry.setVisibility(View.VISIBLE);
-    }
-
-    public void releaseVideoView() {
-        if (null != arrayListVideoView && 0 != arrayListVideoView.size()) {
-            for (RCRTCVideoView v : arrayListVideoView) {
-                v.release();
-            }
-        }
-    }
-
-
-    public void onRelease() {
-        releaseVideoView();
-        if (mStatusView != null && mRunnable != null) {
-            mStatusView.removeCallbacks(mRunnable);
-        }
-    }
-}
+//package com.cooleshow.teacher.widgets.helper;
+//
+//import android.util.Log;
+//import android.view.LayoutInflater;
+//import android.view.View;
+//import android.view.ViewGroup;
+//import android.widget.ProgressBar;
+//import android.widget.RelativeLayout;
+//import android.widget.TextView;
+//
+//import com.cooleshow.teacher.R;
+//
+//import java.util.ArrayList;
+//import java.util.LinkedHashMap;
+//import java.util.Map;
+//
+//import cn.rongcloud.rtc.api.stream.RCRTCVideoView;
+//import cn.rongcloud.rtc.api.stream.view.RCRTCRendererEventsListener;
+//import cn.rongcloud.rtc.core.RendererCommon;
+//
+//public class VideoViewManager {
+//
+//    private static final String TAG = "VideoViewManager";
+//    private static final int MAX_WAIT_RENDER_TIME = 8000;
+//    ArrayList<RCRTCVideoView> arrayListVideoView;
+//    int mWidth, mHeight;
+//    private RelativeLayout flSurfaceContainer;
+//    private View mStatusView;
+//    private ProgressBar mPbLoading;
+//    private TextView mTvLoading;
+//    private TextView mTvLiveStatusTipText;
+//    private TextView mTvRetry;
+//
+//    private Runnable mRunnable = new Runnable() {
+//        @Override
+//        public void run() {
+//            showRetryStatus();
+//        }
+//    };
+//
+//    public VideoViewManager(RelativeLayout surfaceContainer, int width, int height) {
+//        flSurfaceContainer = surfaceContainer;
+//        mWidth = width;
+//        mHeight = height;
+//        initStatusView();
+//    }
+//
+//    private void initStatusView() {
+//        mStatusView = LayoutInflater.from(flSurfaceContainer.getContext()).inflate(R.layout.view_live_video_status_layout, flSurfaceContainer, false);
+//        mPbLoading = mStatusView.findViewById(R.id.pb_loading);
+//        mTvLoading = mStatusView.findViewById(R.id.tv_loading);
+//        mTvLiveStatusTipText = mStatusView.findViewById(R.id.tv_live_status_tip_text);
+//        mTvRetry = mStatusView.findViewById(R.id.tv_retry);
+//    }
+//
+//    /**
+//     * 2 列多行显示 videoview
+//     *
+//     * @param list
+//     */
+//    public void update(ArrayList<RCRTCVideoView> list, boolean isShowLoading) {
+//        Log.i("pq", "update" + list.size());
+//        arrayListVideoView = list;
+//        int row = 0;
+//        row = list.size();
+//        flSurfaceContainer.removeAllViews();
+//        int index = 0;
+//        for (int i = 0; i < row; i++) {
+//            RelativeLayout.LayoutParams layoutParams;
+//            layoutParams = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+//            layoutParams.addRule(RelativeLayout.CENTER_IN_PARENT);
+//            if (index >= arrayListVideoView.size()) {
+//                break;
+//            }
+//            arrayListVideoView.get(i).setRendererEventsListener(new RCRTCRendererEventsListener() {
+//                @Override
+//                public void onFirstFrame() {
+//                    Log.i("pq", "视频第一帧渲染");
+//                    hideStatusView();
+//
+//                }
+//            });
+//            arrayListVideoView.get(i).setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FILL);
+//            flSurfaceContainer.addView(arrayListVideoView.get(i), layoutParams);
+//            index++;
+//        }
+//        if (isShowLoading) {
+//            showLoadStatus();
+//        }
+//    }
+//
+//    public void setRetryClickListener(View.OnClickListener retryClickListener) {
+//        if (mTvRetry != null) {
+//            mTvRetry.setOnClickListener(retryClickListener);
+//        }
+//    }
+//
+//    private void hideStatusView() {
+//        if (mStatusView == null) {
+//            return;
+//        }
+//        mStatusView.removeCallbacks(mRunnable);
+//        mStatusView.post(new Runnable() {
+//            @Override
+//            public void run() {
+//                if (mStatusView != null) {
+//                    mStatusView.setVisibility(View.GONE);
+//                }
+//            }
+//        });
+//    }
+//
+//    private void showLoadStatus() {
+//        if (mStatusView == null) {
+//            return;
+//        }
+//        flSurfaceContainer.addView(mStatusView);
+//        mStatusView.setVisibility(View.VISIBLE);
+//        mPbLoading.setVisibility(View.VISIBLE);
+//        mTvLoading.setVisibility(View.VISIBLE);
+//        mTvLiveStatusTipText.setVisibility(View.GONE);
+//        mTvRetry.setVisibility(View.GONE);
+//        mStatusView.postDelayed(mRunnable, MAX_WAIT_RENDER_TIME);
+//    }
+//
+//    private void showRetryStatus() {
+//        if (mStatusView == null) {
+//            return;
+//        }
+//        mStatusView.setVisibility(View.VISIBLE);
+//        mPbLoading.setVisibility(View.GONE);
+//        mTvLoading.setVisibility(View.GONE);
+//        mTvLiveStatusTipText.setVisibility(View.VISIBLE);
+//        mTvRetry.setVisibility(View.VISIBLE);
+//    }
+//
+//    public void releaseVideoView() {
+//        if (null != arrayListVideoView && 0 != arrayListVideoView.size()) {
+//            for (RCRTCVideoView v : arrayListVideoView) {
+//                v.release();
+//            }
+//        }
+//    }
+//
+//
+//    public void onRelease() {
+//        releaseVideoView();
+//        if (mStatusView != null && mRunnable != null) {
+//            mStatusView.removeCallbacks(mRunnable);
+//        }
+//    }
+//}

+ 11 - 11
teacher/src/main/res/layout/view_live_room_main_layout.xml

@@ -172,17 +172,17 @@
         </FrameLayout>
         </FrameLayout>
 
 
 
 
-        <com.rong.io.live.widget.LiveRoomMicIconView
-            android:id="@+id/ll_mic_container"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="9dp"
-            android:layout_marginBottom="9dp"
-            android:paddingStart="5dp"
-            android:paddingEnd="5dp"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/fl_time_count" />
+<!--        <com.rong.io.live.widget.LiveRoomMicIconView-->
+<!--            android:id="@+id/ll_mic_container"-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:layout_marginTop="9dp"-->
+<!--            android:layout_marginBottom="9dp"-->
+<!--            android:paddingStart="5dp"-->
+<!--            android:paddingEnd="5dp"-->
+<!--            app:layout_constraintLeft_toLeftOf="parent"-->
+<!--            app:layout_constraintRight_toRightOf="parent"-->
+<!--            app:layout_constraintTop_toBottomOf="@+id/fl_time_count" />-->
 
 
         <LinearLayout
         <LinearLayout
             android:id="@+id/ll_live_delay"
             android:id="@+id/ll_live_delay"