Browse Source

修复bug

Pq 3 years ago
parent
commit
2773a7cd36

+ 15 - 10
live_teaching/src/main/java/com/daya/live_teaching/ui/LiveActivity.java

@@ -141,6 +141,7 @@ public class LiveActivity extends BaseActivity<ActivityLiveBinding> {
     private FrameLayout accompanimentListFragmentLayout;
     private FrameLayout accompanimentListFragmentLayout;
     private AccompanimentListFragment accompanimentListFragment;
     private AccompanimentListFragment accompanimentListFragment;
     private AudioMngHelper audioMngHelper;
     private AudioMngHelper audioMngHelper;
+    private LiveCommonDialog mLiveInviteCommonDialog;
 
 
     @Override
     @Override
     protected void initView() {
     protected void initView() {
@@ -1011,23 +1012,27 @@ public class LiveActivity extends BaseActivity<ActivityLiveBinding> {
         int contentMessage = R.string.class_dialog_request_invite_camera_connect;
         int contentMessage = R.string.class_dialog_request_invite_camera_connect;
         String toast = "老师开启了你的摄像头";
         String toast = "老师开启了你的摄像头";
         int finalContentMessage = contentMessage;
         int finalContentMessage = contentMessage;
-        LiveCommonDialog dialog = new LiveCommonDialog(this);
-        dialog.show();
-        dialog.setTitle("提示");
-        dialog.setConfirmBtnText("同意");
-        dialog.setCancelBtnText("拒绝");
-        dialog.setContent(getString(finalContentMessage));
-        dialog.setOnConfirmClickListener(new View.OnClickListener() {
+        if (mLiveInviteCommonDialog == null) {
+            mLiveInviteCommonDialog = new LiveCommonDialog(this);
+        }
+        if (!mLiveInviteCommonDialog.isShowing()) {
+            mLiveInviteCommonDialog.show();
+        }
+        mLiveInviteCommonDialog.setTitle("提示");
+        mLiveInviteCommonDialog.setConfirmBtnText("同意");
+        mLiveInviteCommonDialog.setCancelBtnText("拒绝");
+        mLiveInviteCommonDialog.setContent(getString(finalContentMessage));
+        mLiveInviteCommonDialog.setOnConfirmClickListener(new View.OnClickListener() {
             @Override
             @Override
             public void onClick(View v) {
             public void onClick(View v) {
-                dialog.dismiss();
+                mLiveInviteCommonDialog.dismiss();
                 deviceApprove(roomId, ClassRepository.PARAM_CAMERA_TYPE);
                 deviceApprove(roomId, ClassRepository.PARAM_CAMERA_TYPE);
             }
             }
         });
         });
-        dialog.setOnCancelClickListener(new View.OnClickListener() {
+        mLiveInviteCommonDialog.setOnCancelClickListener(new View.OnClickListener() {
             @Override
             @Override
             public void onClick(View v) {
             public void onClick(View v) {
-                dialog.dismiss();
+                mLiveInviteCommonDialog.dismiss();
                 deviceReject(roomId, ClassRepository.PARAM_CAMERA_TYPE);
                 deviceReject(roomId, ClassRepository.PARAM_CAMERA_TYPE);
             }
             }
         });
         });

+ 1 - 2
live_teaching/src/main/java/com/daya/live_teaching/ui/fragmnet/OnlineMembersFragment.java

@@ -61,7 +61,7 @@ public class OnlineMembersFragment extends BaseFragment<FragmentNotOnlineMembers
             dialog.setOnConfirmClickListener(new View.OnClickListener() {
             dialog.setOnConfirmClickListener(new View.OnClickListener() {
                 @Override
                 @Override
                 public void onClick(View v) {
                 public void onClick(View v) {
-                    classViewModel.batchControlMicrophone(roomId, true);
+                    classViewModel.batchControlMicrophone(roomId, false);
                     dialog.dismiss();
                     dialog.dismiss();
                 }
                 }
             });
             });
@@ -92,7 +92,6 @@ public class OnlineMembersFragment extends BaseFragment<FragmentNotOnlineMembers
                     dialog.dismiss();
                     dialog.dismiss();
                 }
                 }
             });
             });
-            classViewModel.batchControlMicrophone(roomId, false);
         });
         });
     }
     }