diff --git a/wgshare/lib/pages/metting/meeting_main_logic.dart b/wgshare/lib/pages/metting/meeting_main_logic.dart index 1e1e663..d5b6778 100644 --- a/wgshare/lib/pages/metting/meeting_main_logic.dart +++ b/wgshare/lib/pages/metting/meeting_main_logic.dart @@ -216,8 +216,19 @@ class MeetingMainLogic extends GetxController with RequestToolMixin { // 有发言权限且开启了摄像头时,切换页面到视频状态 changePageState(1); } else { - // 没有发言权限或没开启摄像头时,切换页面到语音状态 - changePageState(0); + // 没有发言权限或没开启摄像头时,查看有没有其他人开摄像头,如果没有切换页面到语音状态,如果有切换到视频状态 + var isOtherOpenCamera = false; + for (var i = 0; i < state.cacheUsers.value.length; i++) { + if (state.cacheUsers.value[i].enableCamera == true) { + isOtherOpenCamera = true; + } + } + if(isOtherOpenCamera == false){ + changePageState(0); + }else{ + state.remoteUid.value = ""; + changePageState(1); + } } } else { debugPrint("wgs输出===:当前全员观看不是自己"); @@ -380,7 +391,9 @@ class MeetingMainLogic extends GetxController with RequestToolMixin { for (MeetingRoomUser mru in state.cacheUsers.value) { if (mru.uid == meetingRoomUser.uid) { mru.roleId = meetingRoomUser.roleId; - mru.enableMicr = true; + if(state.defaulOpenState.value == 1){ + mru.enableMicr = true; + } mru.isRoomManager = meetingRoomUser.isRoomManager; } } @@ -388,8 +401,10 @@ class MeetingMainLogic extends GetxController with RequestToolMixin { state.isSpeak.value = true; debugPrint("wgs输出===:Socket-状态:${state.defaulOpenState.value}"); if (state.defaulOpenState.value == 1) { + debugPrint("wgs输出===:Socket-状态1111111111111"); doHttpSetMicr(true); } else if (state.defaulOpenState.value == 2) { + debugPrint("wgs输出===:Socket-状态2222222222222"); doHttpSetCamer(true); } // 设置声网SDK角色为主播 diff --git a/wgshare/lib/pages/metting/meeting_main_view.dart b/wgshare/lib/pages/metting/meeting_main_view.dart index d9fde7d..bc00413 100644 --- a/wgshare/lib/pages/metting/meeting_main_view.dart +++ b/wgshare/lib/pages/metting/meeting_main_view.dart @@ -276,7 +276,8 @@ class MeetingMainPageState extends State { ], ) : Container( - child: Text('加载反馈:是否成功加入会议室${state.isJoinSuccess.value}-会议室对象${state.rctEngine.value}-成员列表${state.users.value.length}-全员观看ID${state.remoteUid.value}'), + color: ColorUtil.Color_0_0_0_0, + /*child: Text('加载反馈:是否成功加入会议室${state.isJoinSuccess.value}-会议室对象${state.rctEngine.value}-成员列表${state.users.value.length}-全员观看ID${state.remoteUid.value}'),*/ )), Row(