瀏覽代碼

修改老师端和学生端直播间部分问题

Pq 2 年之前
父節點
當前提交
3b55105ca9

+ 27 - 5
student/src/main/java/com/cooleshow/student/ui/live/LiveRoomActivity.java

@@ -232,6 +232,10 @@ public class LiveRoomActivity extends BaseMVPActivity<ActivityLiveroomLayoutBind
                 //其他状态的时候需要重新刷新房间信息
                 isNeedRefresh = true;
             }
+            if(status == ConnectionStatus.NETWORK_UNAVAILABLE){
+                //网络不可用
+                ToastUtil.getInstance().showShort("您的网络已断开,请检查网络~");
+            }
             if (status == ConnectionStatus.SUSPEND) {
                 connectStatusIsPaused = true;
             }
@@ -691,6 +695,14 @@ public class LiveRoomActivity extends BaseMVPActivity<ActivityLiveroomLayoutBind
         }
     }
 
+    private boolean isOnApplyMic() {
+        return currentSeatStatus == LiveRoomMsgConstants.MIC_STATUS_CONNECTING;
+    }
+
+    private boolean isOnMic() {
+        return currentSeatStatus == LiveRoomMsgConstants.MIC_STATUS_CONNECT_SUCCESS;
+    }
+
     private void updateMicIcon(int micStatus) {
         //主线程更新
         iv_mic.post(new Runnable() {
@@ -1137,6 +1149,9 @@ public class LiveRoomActivity extends BaseMVPActivity<ActivityLiveroomLayoutBind
         ToastUtil.getInstance().show(this, "直播已结束");
         this.liveIsFinish = true;
         //取消连麦
+        if (mMicManagerDialog != null) {
+            mMicManagerDialog.dismiss();
+        }
         handleCloseMicEvent();
         notifyMicDelAll();
         showLiveStatusView(LIVE_STATUS_IS_OFFLINE);
@@ -1249,8 +1264,13 @@ public class LiveRoomActivity extends BaseMVPActivity<ActivityLiveroomLayoutBind
         if (isFinishing() || isDestroyed()) {
             return;
         }
-        updateMicIcon(LiveRoomMsgConstants.MIC_STATUS_NORMAL);
-        ToastUtil.getInstance().show(LiveRoomActivity.this, getString(R.string.create_refuse_seat_tip));
+        if (mMicManagerDialog != null) {
+            mMicManagerDialog.dismiss();
+        }
+        if (isOnApplyMic()) {
+            updateMicIcon(LiveRoomMsgConstants.MIC_STATUS_NORMAL);
+            ToastUtil.getInstance().show(LiveRoomActivity.this, getString(R.string.create_refuse_seat_tip));
+        }
     }
 
     @Override
@@ -1258,10 +1278,12 @@ public class LiveRoomActivity extends BaseMVPActivity<ActivityLiveroomLayoutBind
         if (isFinishing() || isDestroyed()) {
             return;
         }
-        if (presenter != null) {
-            presenter.exitMic();
+        if (isOnMic()) {
+            if (presenter != null) {
+                presenter.exitMic();
+            }
+            ToastUtil.getInstance().show(LiveRoomActivity.this, getString(R.string.down_mic_by_create_tip));
         }
-        ToastUtil.getInstance().show(LiveRoomActivity.this, getString(R.string.down_mic_by_create_tip));
     }
 
     @Override

+ 5 - 0
teacher/src/main/java/com/cooleshow/teacher/ui/live/TeacherLiveRoomActivity.java

@@ -170,6 +170,11 @@ public class TeacherLiveRoomActivity extends BaseMVPActivity<ActivityTeacherLive
                 //其他状态的时候需要重新刷新房间信息
                 isNeedRefresh = true;
             }
+
+            if(status == ConnectionStatus.NETWORK_UNAVAILABLE){
+                //网络不可用
+                ToastUtil.getInstance().showShort("您的网络已断开,请检查网络~");
+            }
         }
     };