修改网络教室部分问题

classRoom/src/main/java/com/dayayuemeng/classroom/ui/TeacherNetClassRoomActivity.java

@@ -1323,10 +1323,13 @@ public class TeacherNetClassRoomActivity extends BaseMVPActivity<AcNetClassRoomT
         //空是播放全部伴奏
         if (isPlay) {
             if (null != memberList && memberList.size() >= 2) {
-                ClassMember classMember = memberList.get(1);
-                if (isDisplayOwner()) {
-                    classViewModel.switchDisplay(getRoomId(), ScreenDisplay.Display.STUDENT, classMember.getUserId(), false);
-                    presenter.changeRemoteAudioVolume(classMember.getUserId(), memberList, false);
+//                ClassMember classMember = memberList.get(1);
+                if (isNeedChangeDisplay()) {
+                    ClassMember fristStudent = getFristStudent(memberList);
+                    if (fristStudent != null) {
+                        classViewModel.switchDisplay(getRoomId(), ScreenDisplay.Display.STUDENT, fristStudent.getUserId(), false);
+                        presenter.changeRemoteAudioVolume(fristStudent.getUserId(), memberList, false);
+                    }
                 } else {
                     ScreenDisplay value = classViewModel.getDisplay().getValue();
                     if (value != null) {
@@ -1339,17 +1342,34 @@ public class TeacherNetClassRoomActivity extends BaseMVPActivity<AcNetClassRoomT
         }
     }
 
-    private boolean isDisplayOwner() {
+
+    private ClassMember getFristStudent(List<ClassMember> memberList){
+        for (int i = 0; i < memberList.size(); i++) {
+            ClassMember classMember = memberList.get(i);
+            if(classMember.getRole() == Role.STUDENT){
+                return classMember;
+            }
+        }
+        return null;
+    }
+
+    private boolean isNeedChangeDisplay() {
         ScreenDisplay value = classViewModel.getDisplay().getValue();
         if (value != null) {
-            if (value.getType() == ScreenDisplay.Display.LECTURER && TextUtils.equals(value.getUserId(), mUserId)) {
-                return true;
+            if(value.getType() == ScreenDisplay.Display.STUDENT){
+                return false;
             }
+//            Log.i("pq","isDisplayOwner:"+value.getType().getType());
+//            if(value.getType() == ScreenDisplay.Display.WHITEBOARD || value.getType() == ScreenDisplay.Display.NONE){
+//                return true;
+//            }
+//            if (value.getType() == ScreenDisplay.Display.LECTURER && TextUtils.equals(value.getUserId(), mUserId)) {
+//                return true;
+//            }
         }
-        return false;
+        return true;
     }
 
-
     @Override
     public void onMessageOrMember(RightOperate rightOperate) {
         if (RightOperate.MESSAGE == rightOperate) {