wgshare/lib/common/api/retrofit_client.dart

@@ -42,12 +42,6 @@ abstract class RetrofitClient {
       @Path("roomNum") String roomNum,
       );
 
-  /// 检验房间是否存在
-  @GET("/room/checkout")
-  Future<BaseStructureResult<bool>> checkout(
-      @Query("roomNum") String roomNum,
-      );
-
   /// 获取会议室所有用户
   @GET("/room/user")
   Future<BaseStructureResult<List<MeetingRoomUser>>> getMeetingRoomAllUser(

wgshare/lib/common/config/app_config.dart

@@ -21,9 +21,4 @@ class AppConfig {
   static const paddingLeft = 20.0;
   static const paddingRight = 20.0;
   static const paddingbottom = 20.0;
-
-  // 正常登录
-  static const NORMAL_LOGIN = "normal_login";
-  // 匿名登录
-  static const ANONYMOUS_LOGIN = "anonymous_login";
 }

wgshare/lib/common/models/meeting_room_msg.dart

@@ -14,9 +14,7 @@ class MeetingRoomMsg extends Object{
   // 0：别人，1：自己
   int source;
 
-  String time;
+  MeetingRoomMsg(this.uid,this.userName,this.message,this.source);
-
-  MeetingRoomMsg(this.uid,this.userName,this.message,this.source,this.time);
 
   factory MeetingRoomMsg.fromJson(Map<String, dynamic> srcJson) => _$MeetingRoomMsgFromJson(srcJson);
 

wgshare/lib/common/models/meeting_room_user.dart

@@ -39,10 +39,7 @@ class MeetingRoomUser extends Object{
   @JsonKey(name: 'volume')
   double? volume = 0.0;
 
-  @JsonKey(name: 'enableShare')
+  MeetingRoomUser(this.uid,this.connectId,this.account,this.enableMicr,this.enableCamera,this.screenShareId,this.userName,this.roleId,this.roleName,this.isRoomManager,this.volume);
-  bool? enableShare = false;
-
-  MeetingRoomUser(this.uid,this.connectId,this.account,this.enableMicr,this.enableCamera,this.screenShareId,this.userName,this.roleId,this.roleName,this.isRoomManager,this.volume,this.enableShare);
 
   factory MeetingRoomUser.fromJson(Map<String, dynamic> srcJson) => _$MeetingRoomUserFromJson(srcJson);
 

wgshare/lib/common/store/app_storage_key.dart

@@ -4,8 +4,7 @@ enum AppStorageKey {
   token(value: 'TOKEN', label: "登录用户的token"),
   userInfo(value: 'USERINFO', label: "登录用户的基本信息"),
   account(value: 'ACCOUNT', label: "用户名"),
-  pwd(value: 'PWD', label: "密码"),
+  pwd(value: 'PWD', label: "密码");
-  loginType(value: 'LOGINTYPE', label: "登录类型");
 
   final String label;
   final String value;

wgshare/lib/common/store/user_store.dart

@@ -14,14 +14,10 @@ class UserStore extends GetxController with RequestToolMixin {
   /// 是否登录
   String? token;
 
-  /// 登录类型
-  String? loginType;
-
   /// 用户信息
   Rx<UserInfoEntity?> userInfoEntity = Rx(null);
 
   UserStore init() {
-    loginType = StorageService.to.read(AppStorageKey.loginType.value);
     token = StorageService.to.read(AppStorageKey.token.value);
     try {
       var userDetail = StorageService.to.read(AppStorageKey.userInfo.value);
@@ -45,12 +41,6 @@ class UserStore extends GetxController with RequestToolMixin {
     StorageService.to.write(AppStorageKey.token.value, token);
   }
 
-  /// 保存登录类型
-  void setLoginType(String loginType) {
-    this.loginType = loginType;
-    StorageService.to.write(AppStorageKey.loginType.value, loginType);
-  }
-
   /// 保存用户信息
   void setUserDetailInfo(UserInfoEntity info) {
     userInfoEntity.value = info;
@@ -61,7 +51,6 @@ class UserStore extends GetxController with RequestToolMixin {
   void erase() {
     userInfoEntity.value = null;
     token = null;
-    loginType = null;
 
     StorageService.to.erase();
   }

wgshare/lib/main.dart

@@ -10,7 +10,6 @@ import 'package:wgshare/utils/package_info_util.dart';
 import 'package:wgshare/utils/storage.dart';
 import 'package:wgshare/utils/utils.dart';
 
-import 'common/config/app_config.dart';
 import 'common/config/colorUtils.dart';
 import 'routes/app_pages.dart';
 import 'routes/app_routes.dart';
@@ -80,9 +79,7 @@ class MyApp extends StatelessWidget {
             //默认专场动画
             defaultTransition: Transition.fade,
             //初始化路由页面
-            initialRoute: (UserStore.to.token?.isNotEmpty ?? false) && UserStore.to.userInfoEntity.value != null && UserStore.to.loginType != null && UserStore.to.loginType == AppConfig.NORMAL_LOGIN
+            initialRoute: (UserStore.to.token?.isNotEmpty ?? false) && UserStore.to.userInfoEntity.value != null ? Routes.startPage : Routes.loginPage,
-                ? Routes.startPage
-                : Routes.loginPage,
 
             /// 路由表
             getPages: AppPages.pages,

wgshare/lib/pages/homePage/home_logic.dart

@@ -1,12 +1,9 @@
-import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:signalr_core/signalr_core.dart';
 import 'package:wgshare/common/models/common/base_structure_result.dart';
 import 'package:wgshare/common/mixins/request_tool_mixin.dart';
-import 'package:wgshare/common/store/user_store.dart';
 
 import '../../common/models/meeting_room_item.dart';
-import '../../utils/toast_utils.dart';
 import 'home_state.dart';
 
 class HomeLogic extends GetxController with RequestToolMixin {
@@ -25,9 +22,8 @@ class HomeLogic extends GetxController with RequestToolMixin {
     state.refreshController.dispose();
   }
 
-  /// 获取会议列表
+  /// 直接进入会议（匿名登录）
   Future<void> doHttpGetMeetingRoomList(int pageIndex, int pageSize) async {
-    debugPrint("wgs输出===：token：${UserStore.to.token}");
     BaseStructureResult<MeetingRoomItem> res = await getClient().getMeetingRoomList(pageIndex,pageSize);
     if(null != res.data){
       if(state.pageIndex == 1){
@@ -58,20 +54,4 @@ class HomeLogic extends GetxController with RequestToolMixin {
     doHttpGetMeetingRoomList(state.pageIndex.value,state.pageSize.value);
   }
 
-  /// 返回键退出
-  bool closeOnConfirm(BuildContext context) {
-    DateTime now = DateTime.now();
-    // 物理键，两次间隔大于4秒, 退出请求无效
-    if (state.currentBackPressTime == null ||
-        now.difference(state.currentBackPressTime!) > const Duration(seconds: 4)) {
-      state.currentBackPressTime = now;
-      ToastUtils.showInfo("再按一次退出");
-      return false;
-    }
-    // 退出请求有效
-    state.currentBackPressTime = null;
-    return true;
-  }
-
-
 }

wgshare/lib/pages/homePage/home_state.dart

@@ -25,7 +25,4 @@ class HomeState {
   /// 总页数
   final RxInt totalPage = 0.obs;
 
-  /// 退出计时
-  DateTime? currentBackPressTime;
-
 }

wgshare/lib/pages/homePage/home_view.dart

@@ -19,6 +19,7 @@ class HomePage extends StatefulWidget {
 }
 
 class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
+
   final logic = Get.put(HomeLogic());
   final state = Get.find<HomeLogic>().state;
 
@@ -35,18 +36,7 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
   @override
   Widget build(BuildContext context) {
     super.build(context);
-    return PopScope(
+    return Scaffold(
-      canPop: false,
-        onPopInvoked: (bool didPop) async {
-          if (didPop) {
-            return;
-          }
-          if (logic.closeOnConfirm(context)) {
-            // 系统级别导航栈 退出程序
-            SystemNavigator.pop();
-          }
-        },
-      child: Scaffold(
         appBar: AppBar(
           surfaceTintColor: Colors.white,
           elevation: 0,
@@ -72,7 +62,8 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
                 style: TextStyle(
                     fontSize: 16.sp,
                     color: ColorUtil.Color_51_51_51,
-                      fontWeight: FontWeight.w500),
+                    fontWeight: FontWeight.w500
+                ),
               ),
             ),
             Expanded(
@@ -88,28 +79,23 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
                       return Container(
                         width: double.infinity,
                         decoration: const BoxDecoration(
-                            borderRadius:
+                          borderRadius: BorderRadius.all(Radius.circular(6)),
-                            BorderRadius.all(Radius.circular(6)),
                           color: Colors.white,
                         ),
-                          margin: EdgeInsets.only(
+                        margin: EdgeInsets.only(top: index == 0 ? 20 : 12, bottom: index == 19 ? 20 : 0, left: 16, right: 16),
-                              top: index == 0 ? 20 : 12,
-                              bottom: index == 19 ? 20 : 0,
-                              left: 16,
-                              right: 16),
                         padding: const EdgeInsets.all(12),
                         child: Column(
                           children: [
                             Row(
-                                mainAxisAlignment:
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                MainAxisAlignment.spaceBetween,
                               children: [
                                 Text(
                                   state.meetingRooms.value[index].roomName,
                                   style: TextStyle(
                                       fontSize: 14.sp,
                                       color: ColorUtil.Color_89_88_88,
-                                        fontWeight: FontWeight.w500),
+                                      fontWeight: FontWeight.w500
+                                  ),
                                 ),
                                 Row(
                                   children: [
@@ -131,14 +117,12 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
                             ),
                             SizedBox(height: 20.h),
                             Row(
-                                mainAxisAlignment:
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                MainAxisAlignment.spaceBetween,
                               children: [
                                 Row(
                                   children: [
                                     Text(
-                                        state.meetingRooms.value[index]
+                                      state.meetingRooms.value[index].roomNum,
-                                            .roomNum,
                                       style: TextStyle(
                                         fontSize: 12.sp,
                                         color: ColorUtil.Color_177_177_177,
@@ -151,10 +135,8 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
                                         width: 16.w,
                                         height: 16.h,
                                       ),
-                                        onTap: () {
+                                      onTap: (){
-                                          Clipboard.setData(ClipboardData(
+                                        Clipboard.setData(ClipboardData(text: state.meetingRooms.value[index].roomNum));
-                                              text: state.meetingRooms
-                                                  .value[index].roomNum));
                                         ToastUtils.showSuccess("复制成功");
                                       },
                                     )
@@ -165,13 +147,11 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
                                     width: 78.w,
                                     height: 30.h,
                                     decoration: BoxDecoration(
-                                        borderRadius: const BorderRadius.all(
+                                      borderRadius: const BorderRadius.all(Radius.circular(6)),
-                                            Radius.circular(6)),
                                       color: ColorUtil.Color_85_117_242,
                                     ),
                                     child: Row(
-                                        mainAxisAlignment:
+                                      mainAxisAlignment: MainAxisAlignment.center,
-                                        MainAxisAlignment.center,
                                       children: [
                                         Text(
                                           '进入',
@@ -188,12 +168,8 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
                                       ],
                                     ),
                                   ),
-                                    onTap: () {
+                                  onTap: (){
-                                      Get.toNamed(Routes.meetingMainPage,
+                                    Get.toNamed(Routes.meetingMainPage, arguments: {"roomNumber": state.meetingRooms.value[index].roomNum});
-                                          arguments: {
-                                            "roomNumber": state.meetingRooms
-                                                .value[index].roomNum
-                                          });
                                   },
                                 )
                               ],
@@ -208,7 +184,7 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
               ),
             )
           ],
-          ))),
+        ))
     );
   }
 

wgshare/lib/pages/loginPage/login_logic.dart

@@ -7,7 +7,6 @@ import 'package:wgshare/common/mixins/request_tool_mixin.dart';
 import 'package:wgshare/utils/device_info.dart';
 import 'package:wgshare/utils/toast_utils.dart';
 
-import '../../common/config/app_config.dart';
 import '../../common/models/common/base_structure_result.dart';
 import '../../common/models/user_info_entity.dart';
 import '../../common/store/app_storage_key.dart';
@@ -47,17 +46,16 @@ class LoginLogic extends GetxController with RequestToolMixin {
     }else if(state.checkAgreementBool.value != true){
       ToastUtils.showError("请阅读并勾选相关协议");
     }else{
+      try{
+        ToastUtils.showLoading();
         BaseStructureResult<UserInfoEntity> res = await getClient().login(state.userNameController.text, md5.convert(utf8.encode(state.passwordController.text)).toString());
         if (null != res.data) {
           UserStore.to.setToken(res.data!.token);
           UserStore.to.setUserDetailInfo(res.data!);
-        UserStore.to.setLoginType(AppConfig.NORMAL_LOGIN);
+          Get.toNamed(Routes.startPage);
-        Get.offAllNamed(Routes.startPage);
+        }
-        state.userNameController.text = "";
+      }finally{
-        state.passwordController.text = "";
+        ToastUtils.dismiss();
-        state.meetingCodeController.text = "";
-        state.nickNameCodeController.text = "";
-        state.checkAgreementBool.value = false;
       }
     }
   }
@@ -73,39 +71,16 @@ class LoginLogic extends GetxController with RequestToolMixin {
     }else if(state.checkAgreementBool != true){
       ToastUtils.showError("请阅读并勾选相关协议");
     }else{
+      try{
+        ToastUtils.showLoading();
         BaseStructureResult<UserInfoEntity> res = await getClient().anonLogin(await DeviceInfo.getDeviceId(),state.nickNameCodeController.text, state.meetingCodeController.text);
         if (null != res.data) {
           UserStore.to.setToken(res.data!.token);
           UserStore.to.setUserDetailInfo(res.data!);
-        UserStore.to.setLoginType(AppConfig.ANONYMOUS_LOGIN);
           Get.toNamed(Routes.meetingMainPage, arguments: {"roomNumber": state.meetingCodeController.text});
-        state.userNameController.text = "";
-        state.passwordController.text = "";
-        state.meetingCodeController.text = "";
-        state.nickNameCodeController.text = "";
-        state.checkAgreementBool.value = false;
-      }
-    }
-  }
-
-  /// 检验房间
-  Future<void> doHttpCheckMeetingRoom() async {
-    if(state.meetingCodeController.text.isEmpty){
-      ToastUtils.showError("请输入会议号");
-    }else if(state.meetingCodeController.text.length != 8){
-      ToastUtils.showError("请输入正确的会议号");
-    }else if(state.nickNameCodeController.text.isEmpty){
-      ToastUtils.showError("请输入昵称");
-    }else if(state.checkAgreementBool != true){
-      ToastUtils.showError("请阅读并勾选相关协议");
-    }else{
-      BaseStructureResult<bool> res = await getClient().checkout(state.meetingCodeController.text);
-      if (null != res.data) {
-        if(res.data == true){
-          doHttpAnonymousLogin();
-        }else{
-          ToastUtils.showError("房间不存在");
         }
+      }finally{
+        ToastUtils.dismiss();
       }
     }
   }

wgshare/lib/pages/loginPage/login_view.dart

@@ -378,7 +378,7 @@ class _LoginPageState extends State<LoginPage> {
                             if (state.pageState.value == 0) {
                               logic.doHttpLogin();
                             } else {
-                              logic.doHttpCheckMeetingRoom();
+                              logic.doHttpAnonymousLogin();
                             }
                           },
                         )

wgshare/lib/pages/metting/meeting_main_logic.dart

@@ -1,11 +1,8 @@
 import 'dart:async';
 import 'dart:convert';
-import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:agora_rtc_engine/agora_rtc_engine.dart';
-import 'package:date_format/date_format.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:get/get.dart';
 import 'package:signalr_core/signalr_core.dart';
 import 'package:wgshare/common/store/user_store.dart';
@@ -16,7 +13,6 @@ import '../../common/models/common/base_structure_result.dart';
 import '../../common/models/meeting_room_info.dart';
 import '../../common/models/meeting_room_msg.dart';
 import '../../common/models/meeting_room_user.dart';
-import '../../utils/agora/AgoraUtil.dart';
 import '../../utils/permission/PermissionService.dart';
 import '../../utils/toast_utils.dart';
 import 'meeting_main_state.dart';
@@ -54,20 +50,17 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
     state.meetingToken.value = res.data!;
 
     if (isInit == true) {
-      signalRSocket();
-    }else{
       initRtc();
+      signalRSocket();
     }
   }
 
   /// 合并请求
   /// 1.获取会议室信息
   /// 2.获取会议室所有用户
-  Future<void> mergeFetch(bool isAgain) async {
+  Future<void> mergeFetch() async {
     try {
-      if (isAgain == false) {
       ToastUtils.showLoading();
-      }
 
       var results = await Future.wait([
         getClient().getMeetingRoomInfo(state.roomNumber.value),
@@ -99,7 +92,6 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
   /// 获取会议室信息
   void getMeetingRoomInfo(MeetingRoomInfo meetingRoomInfo) async {
     state.meetingRoomInfo.value = meetingRoomInfo;
-    initRtc();
     startTime();
   }
 
@@ -107,7 +99,6 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
   void getMeetingRoomAllUser(List<MeetingRoomUser> meetingRoomUsers) async {
     state.users.value = meetingRoomUsers;
     state.cacheUsers.value = meetingRoomUsers;
-    update();
     doHttpGetTvAnchor();
   }
 
@@ -147,7 +138,6 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
     } else {
       state.users.value = state.cacheUsers.value;
     }
-    update();
   }
 
   /// ------------------------------------------------------------------------------发言权限
@@ -205,7 +195,6 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
     if (res.data!.toString().length != 9) {
       // 摄像头
       if (state.remoteUid.value == UserStore.to.userInfoEntity.value!.uid) {
-        debugPrint("wgs输出===：当前全员观看是自己");
         // 全员观看主播是自己
         // 设置主播ID为0（自己）
         state.remoteUid.value = "0";
@@ -216,22 +205,10 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
           // 有发言权限且开启了摄像头时，切换页面到视频状态
           changePageState(1);
         } else {
-          // 没有发言权限或没开启摄像头时，查看有没有其他人开摄像头，如果没有切换页面到语音状态,如果有切换到视频状态
+          // 没有发言权限或没开启摄像头时，切换页面到语音状态
-          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输出===：当前全员观看不是自己");
         // 全员观看主播不是自己
         // 判断当前会议室是否存在全员观看主播
         var isCurrentUserIsCamera = false;
@@ -245,10 +222,7 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
         if (isCurrentUserIsCamera == true) {
           // 当前会议室存在全员观看主播时，切换页面到视频状态
           debugPrint("wgs输出===：当前会议室存在全员观看主播时，切换页面到视频状态");
-          changePageState(0);
-          Future.delayed(const Duration(milliseconds: 200), () {
           changePageState(1);
-          });
         } else {
           // 当前会议室不存在全员观看主播时，设置主播ID为空并切换页面到视频状态
           debugPrint("wgs输出===：当前会议室不存在全员观看主播时，设置主播ID为空并切换页面到视频状态");
@@ -257,21 +231,15 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
         }
       }
     } else {
-      if (state.remoteUid.value ==
+      // 共享屏幕（此版本不做）
-          UserStore.to.userInfoEntity.value!.screenShareId) {
+      /*if(state.remoteUid.value == UserStore.to.userInfoEntity.value!.screenShareId){
         // 如果是自己在共享
-      } else {
+      }else{
-        // 共享不是自己
+        // 如果是别人在共享，切换页面到视频状态
-        for (var i = 0; i < state.cacheUsers.value.length; i++) {
+        changePageState(1);
-          if (state.remoteUid.value ==
+      }*/
-              state.cacheUsers.value[i].screenShareId) {
-            state.cacheUsers.value[i].enableShare = true;
     }
   }
-      }
-    }
-    update();
-  }
 
   /// 设置当前全员观看主播
   Future<void> doHttpSetTvAnchor(String id) async {
@@ -332,52 +300,14 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
               accessTokenFactory: () async =>
                   await Future.value(UserStore.to.token),
               logging: (level, message) =>
-                  debugPrint("wgs输出===：SignalR Socket-日志：$message"),
+                  debugPrint("wgs输出===：SignalR Socket-$message"),
             ))
-        // 配置断线重连策略：默认重连5次，分别间隔2秒 4秒 4秒 5秒 10秒
+        // 配置断线重连策略：默认重连4次，分别间隔10秒 4秒 10秒 10秒
-        .withAutomaticReconnect([2000, 4000, 4000, 5000, 10000]).build();
+        .withAutomaticReconnect([10000, 4000, 10000, 10000]).build();
 
     await state.hubConnection.value?.start();
 
-    // 开始重新连接时回调
+    joinMeetingToSocket();
-    state.hubConnection.value?.onreconnecting((error) {
-      debugPrint("wgs输出===：SignalR Socket-重连$error");
-      if (EasyLoading.isShow == false) {
-        ToastUtils.showLoadingToMask("网络故障，正在重连...", EasyLoadingMaskType.black);
-      }
-    });
-
-    // 重新连接成功时回调，5次重连任意一次成功就回调
-    state.hubConnection.value?.onreconnected((connectionId) {
-      debugPrint("wgs输出===：SignalR Socket-重连成功$connectionId");
-      joinMeetingToSocket(true);
-      ToastUtils.dismiss();
-      if (EasyLoading.isShow == false) {
-        ToastUtils.showSuccessToMask("重连成功！", EasyLoadingMaskType.black);
-      }
-    });
-
-    // 重新连接失败时回调，5次重连都失败才回调
-    state.hubConnection.value?.onclose((error) {
-      debugPrint("wgs输出===：SignalR Socket-重连失败$error");
-      ToastUtils.dismiss();
-
-      if (state.isNormaExit.value == false &&
-          state.isShowOkAlertDialog.value == false) {
-        showOkAlertDialog(
-          context: Get.context!,
-          title: "提示",
-          message: "网络错误，请重新加入会议室",
-          okLabel: "确定",
-          barrierDismissible: false,
-        ).then((OkCancelResult value) {
-          Get.back();
-          Get.back();
-        });
-      }
-    });
-
-    joinMeetingToSocket(false);
 
     /// ------------------------------------------------------------------------------发言权限相关回调
     /// 开启关闭发言权限
@@ -391,22 +321,13 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
         for (MeetingRoomUser mru in state.cacheUsers.value) {
           if (mru.uid == meetingRoomUser.uid) {
             mru.roleId = meetingRoomUser.roleId;
-            if(state.defaulOpenState.value == 1){
             mru.enableMicr = true;
-            }
             mru.isRoomManager = meetingRoomUser.isRoomManager;
           }
         }
         if (UserStore.to.userInfoEntity.value!.uid == meetingRoomUser.uid) {
           state.isSpeak.value = true;
-          debugPrint("wgs输出===：Socket-状态：${state.defaulOpenState.value}");
+          state.isOpenMicrophone.value = true;
-          if (state.defaulOpenState.value == 1) {
-            debugPrint("wgs输出===：Socket-状态1111111111111");
-            doHttpSetMicr(true);
-          } else if (state.defaulOpenState.value == 2) {
-            debugPrint("wgs输出===：Socket-状态2222222222222");
-            doHttpSetCamer(true);
-          }
           // 设置声网SDK角色为主播
           setClientRole("主播");
           debugPrint("wgs输出===：Socket-开启发言权限：主播");
@@ -417,20 +338,16 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
           if (mru.uid == meetingRoomUser.uid) {
             mru.roleId = meetingRoomUser.roleId;
             mru.enableMicr = false;
-            mru.enableCamera = false;
             mru.isRoomManager = meetingRoomUser.isRoomManager;
           }
         }
         if (UserStore.to.userInfoEntity.value!.uid == meetingRoomUser.uid) {
           state.isSpeak.value = false;
-          state.defaulOpenState.value = 0;
           state.isOpenMicrophone.value = false;
           state.isOpenCamera.value = false;
           state.isOpenShare.value = false;
+          state.remoteUid.value = "";
 
-          // 关闭麦克风视频
-          doHttpSetMicr(false);
-          doHttpSetCamer(false);
           // 设置声网SDK角色为观众
           setClientRole("观众");
           // 取消发布视频流
@@ -439,18 +356,14 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
           stopPreview();
           // 关闭本地预览悬浮窗
           state.floating.value?.close();
-          // 当前全员观看主播是自己时
+          // 切换页面状态
-          if (state.remoteUid.value == "0") {
-            state.remoteUid.value = "";
           changePageState(0);
-          }
           // 停止共享屏幕（此版本不做）
           // stopScreenCapture();
 
           debugPrint("wgs输出===：Socket-关闭发言权限：观众");
         }
       }
-      update();
     });
 
     /// ------------------------------------------------------------------------------麦克风相关回调
@@ -466,7 +379,6 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
       }
       state.users.value = state.cacheUsers.value;
       state.isOpenMicrophone.value = e?[0];
-      update();
     });
 
     /// 用户单独开闭麦回调
@@ -504,7 +416,6 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
           muteLocalAudioStream(true);
         }
       }
-      update();
     });
 
     /// ------------------------------------------------------------------------------会议室进出相关回调
@@ -518,7 +429,6 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
           .toList();
       state.cacheUsers.value.addAll(meetingRoomUsers);
       state.users.value = state.cacheUsers.value;
-      update();
       debugPrint("wgs输出===：Socket-远端用户或主播加入会议室：$jsonStr");
     });
 
@@ -535,8 +445,6 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
         }
       }
       state.users.value = state.cacheUsers.value;
-      update();
-      doHttpGetTvAnchor();
       debugPrint("wgs输出===：Socket-远端用户或主播离开会议室：$jsonStr");
     });
 
@@ -545,21 +453,15 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
       // var jsonStr = const Utf8Decoder().convert(json.encode(e).runes.toList());
       var jsonStr = json.encode(e);
       debugPrint("wgs输出===：Socket-被移除会议：$jsonStr");
-      state.isNormaExit.value = true;
-      ToastUtils.showSuccess("你已被移除会议");
-      Future.delayed(const Duration(seconds: 1), () {
       Get.back();
-      });
+      ToastUtils.showSuccess("你已被移除会议");
     });
 
     /// 全员结束会议回调
     state.hubConnection.value?.on("AllLeave", (e) {
       debugPrint("wgs输出===：Socket-全员结束会议");
-      state.isNormaExit.value = true;
-      ToastUtils.showSuccess("会议已结束");
-      Future.delayed(const Duration(seconds: 1), () {
       Get.back();
-      });
+      ToastUtils.showSuccess("会议已结束");
     });
 
     /// ------------------------------------------------------------------------------会议室聊天相关回调
@@ -568,9 +470,8 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
       // var jsonStr = const Utf8Decoder().convert(json.encode(e).runes.toList());
       var jsonStr = json.encode(e);
       List list = json.decode(jsonStr);
-      DateTime dateTime = DateTime.now();
+      MeetingRoomMsg meetingRoomMsg =
-      MeetingRoomMsg meetingRoomMsg = MeetingRoomMsg(list[0], list[1], list[2],
+          MeetingRoomMsg(list[0], list[1], list[2], 0);
-          0, formatDate(dateTime, [HH, ':', nn, ':', ss]));
       state.meetingRoomMsgs.value.add(meetingRoomMsg);
       update();
       Future.delayed(const Duration(milliseconds: 100), () {
@@ -632,7 +533,7 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
           stopPreview();
           // 当前全员观看主播是自己时
           if (state.remoteUid.value == "0") {
-            state.remoteUid.value = "";
+            changePageState(0);
           }
           // 关闭本地预览悬浮窗
           if (state.floating.value?.isShowing == true) {
@@ -640,7 +541,6 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
           }
         }
       }
-      update();
     });
 
     /// 设置新的全员观看视频主播回调
@@ -654,17 +554,10 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
   }
 
   /// 加入会议室
-  /// isAgain：是否重新加入
+  Future<void> joinMeetingToSocket() async {
-  Future<void> joinMeetingToSocket(bool isAgain) async {
     await state.hubConnection.value?.invoke("joinChannel",
         args: [state.roomNumber.value, false, false, false]);
-    mergeFetch(isAgain);
+    mergeFetch();
-    /*if(isAgain == false){
-      mergeFetch(isAgain);
-      initRtc(false);
-    }else{
-      mergeFetch(true);
-    }*/
   }
 
   /// 离开会议室
@@ -676,13 +569,11 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
 
   /// 会议室发送消息
   Future<void> sendMsg(String msg) async {
-    DateTime dateTime = DateTime.now();
     MeetingRoomMsg meetingRoomMsg = MeetingRoomMsg(
         UserStore.to.userInfoEntity.value!.uid,
         UserStore.to.userInfoEntity.value!.userName,
         msg,
-        1,
+        1);
-        formatDate(dateTime, [HH, ':', nn, ':', ss]));
     state.meetingRoomMsgs.value.add(meetingRoomMsg);
     update();
     Future.delayed(const Duration(milliseconds: 100), () {
@@ -717,9 +608,6 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
     // 打开用户音量回调
     await state.rctEngine.value?.enableAudioVolumeIndication(
         interval: 200, smooth: 3, reportVad: true);
-    // 在发送端设置双流模式并设置视频小流
-    await state.rctEngine.value
-        ?.setDualStreamMode(mode: SimulcastStreamMode.enableSimulcastStream);
 
     joinMeetingToRtc();
 
@@ -728,7 +616,6 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
       RtcEngineEventHandler(
         // 成功加入会议室回调
         onJoinChannelSuccess: (RtcConnection connection, int elapsed) {
-            state.isJoinSuccess.value = true;
           debugPrint("wgs输出===：RTC-自己加入会议室，ID：${connection.localUid}");
         },
 
@@ -745,16 +632,6 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
         // 远端用户或主播离开当前会议室回调-主播角色才能接收该回调
         onUserOffline: (RtcConnection connection, int remoteUid,
             UserOfflineReasonType reason) async {
-        // 判断是否用户取消了共享
-        if (remoteUid.toString().length == 9) {
-          for (var i = 0; i < state.cacheUsers.value.length; i++) {
-            if (remoteUid.toString() ==
-                state.cacheUsers.value[i].screenShareId) {
-              state.cacheUsers.value[i].enableShare = false;
-            }
-          }
-        }
-        update();
           debugPrint("wgs输出===：RTC-远端用户或主播离开会议室，用户或主机的ID：$remoteUid");
         },
 
@@ -835,10 +712,8 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
         },
 
         // 切换用户角色回调
-          onClientRoleChanged: (RtcConnection connection,
+        onClientRoleChanged: (RtcConnection connection, ClientRoleType oldRole,
-              ClientRoleType oldRole,
+            ClientRoleType newRole, ClientRoleOptions newRoleOptions) {
-              ClientRoleType newRole,
-              ClientRoleOptions newRoleOptions) {
           debugPrint(
               "wgs输出===：RTC-切换用户角色为：${newRole == ClientRoleType.clientRoleBroadcaster ? "主播" : "观众"}");
         },
@@ -854,47 +729,6 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
           debugPrint("wgs输出===：RTC-本地视频状态发生改变：$source--$state--$reason");
         },
 
-          // 网络连接状态回调
-          onConnectionStateChanged: (RtcConnection connection,
-              ConnectionStateType stateType,
-              ConnectionChangedReasonType reason) {
-        debugPrint("wgs输出===：RTC-网络连接状态发生改变："
-            "会议室编号（${connection.channelId}），"
-            "网络状态（$stateType-${AgoraUtil.getConnectionStateChangedType(stateType)}），"
-            "网络改变原因（$reason-${AgoraUtil.getConnectionChangedReasonType(reason)}）");
-        if (stateType == ConnectionStateType.connectionStateReconnecting) {
-          if (EasyLoading.isShow == false) {
-            ToastUtils.showLoadingToMask(
-                "网络故障，正在重连...", EasyLoadingMaskType.black);
-          }
-        } else if (stateType == ConnectionStateType.connectionStateConnected &&
-            reason ==
-                ConnectionChangedReasonType.connectionChangedRejoinSuccess) {
-          ToastUtils.dismiss();
-          if (EasyLoading.isShow == false) {
-            ToastUtils.showSuccessToMask("重连成功！", EasyLoadingMaskType.black);
-          }
-        } else if (reason ==
-            ConnectionChangedReasonType.connectionChangedLost) {
-          // 和服务器失去连接后，再延迟15秒（和signalR Socket一致），让SDK继续重连，如果重连不上则告知用户需要重新加入
-          Future.delayed(const Duration(milliseconds: 15000), () {
-            ToastUtils.dismiss();
-            if (state.isShowOkAlertDialog.value == false) {
-              showOkAlertDialog(
-                context: Get.context!,
-                title: "提示",
-                message: "网络错误，请重新加入会议室",
-                okLabel: "确定",
-                barrierDismissible: false,
-              ).then((OkCancelResult value) {
-                Get.back();
-                Get.back();
-              });
-            }
-          });
-        }
-      }
-
         // 获取设备权限出错回调
         /*onPermissionError: (PermissionType permissionType){
             debugPrint("wgs输出===：RTC-获取设备权限出错：$permissionType");

wgshare/lib/pages/metting/meeting_main_state.dart

@@ -46,10 +46,6 @@ class MeetingMainState {
 
   /// 会议室信息
   late Rx<MeetingRoomInfo?> meetingRoomInfo = Rx(null);
-  /// 是否弹出showOkAlertDialog
-  late RxBool isShowOkAlertDialog = false.obs;
-  /// 是否正常退出（点击仅自己退出、全员结束、被移除）
-  late RxBool isNormaExit = false.obs;
 
   /// 会议室计时相关
   late RxString duration = "".obs;
@@ -64,8 +60,6 @@ class MeetingMainState {
 
   /// 是否被允许发言
   late RxBool isSpeak = false.obs;
-  /// 允许发言后默认开启麦克风还是摄像头，0都关闭，1麦克风，2摄像头
-  late RxInt defaulOpenState = 0.obs;
   /// 是否打开麦克风
   late RxBool isOpenMicrophone = false.obs;
   /// 麦克风音量
@@ -76,8 +70,6 @@ class MeetingMainState {
   late RxBool isOpenShare = false.obs;
   /// 当前视频主播ID
   late RxString remoteUid = "".obs;
-  /// 是否成功加入会议室
-  late RxBool isJoinSuccess = false.obs;
 
   /// 当前谁在说话
   late RxString spokesman = "".obs;

wgshare/lib/pages/metting/meeting_main_view.dart

@@ -3,14 +3,12 @@ import 'dart:ui';
 import 'package:agora_rtc_engine/agora_rtc_engine.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_floating/floating/assist/floating_slide_type.dart';
 import 'package:flutter_floating/floating/floating.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:liquid_progress_indicator_v2/liquid_progress_indicator.dart';
 import 'package:preload_page_view/preload_page_view.dart';
-import 'package:wgshare/common/config/app_config.dart';
 import 'package:wgshare/common/store/user_store.dart';
 import 'package:wgshare/utils/toast_utils.dart';
 
@@ -48,10 +46,7 @@ class MeetingMainPageState extends State<MeetingMainPage> {
   @override
   Widget build(BuildContext context) {
     state.context.value = context;
-    return PopScope(
+    return Scaffold(
-        canPop: false,
-      child: FlutterEasyLoading(
-        child: Scaffold(
         appBar: AppBar(
           surfaceTintColor: ColorUtil.Color_41_41_41,
           elevation: 0,
@@ -169,6 +164,22 @@ class MeetingMainPageState extends State<MeetingMainPage> {
                             child: Row(
                               mainAxisAlignment: MainAxisAlignment.end,
                               children: [
+                                /// 结束发言
+                                Visibility(
+                                  visible: state.isSpeak.value,
+                                  child: GestureDetector(
+                                    child: Image.asset(
+                                      'assets/images/meeting_main_hang_up.png',
+                                      width: 22.w,
+                                      height: 22.h,
+                                    ),
+                                    onTap: () {
+                                      logic.cancelSpeak();
+                                    },
+                                  ),
+                                ),
+                                SizedBox(width: 16.w),
+
                                 /// 退出会议
                                 GestureDetector(
                                   child: Image.asset(
@@ -203,7 +214,7 @@ class MeetingMainPageState extends State<MeetingMainPage> {
                           // 视频-共享
                           Visibility(
                               visible: state.pageState.value == 1,
-                              child: state.isJoinSuccess.value == true && null != state.rctEngine.value && null != state.users.value && state.users.value.isNotEmpty
+                              child: null != state.rctEngine.value
                                   ? Stack(
                                       alignment: Alignment.center,
                                       children: [
@@ -275,20 +286,14 @@ class MeetingMainPageState extends State<MeetingMainPage> {
                                         ),
                                       ],
                                     )
-                                  : Container(
+                                  : Container()),
-                                color: ColorUtil.Color_0_0_0_0,
-                                /*child: Text('加载反馈：是否成功加入会议室${state.isJoinSuccess.value}-会议室对象${state.rctEngine.value}-成员列表${state.users.value.length}-全员观看ID${state.remoteUid.value}'),*/
-                              )),
 
-                          Row(
-                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                            children: [
                           GestureDetector(
                             child: Container(
-                                  width: 200.w,
+                              width: 180.w,
                               height: 40.h,
-                                  margin: const EdgeInsets.only(
+                              margin:
-                                      left: 20, bottom: 40),
+                                  const EdgeInsets.only(left: 20, bottom: 40),
                               padding: const EdgeInsets.only(left: 20),
                               decoration: BoxDecoration(
                                 borderRadius: const BorderRadius.only(
@@ -301,8 +306,7 @@ class MeetingMainPageState extends State<MeetingMainPage> {
                                     color: ColorUtil.Color_99_111_158),
                               ),
                               child: Row(
-                                    crossAxisAlignment:
+                                crossAxisAlignment: CrossAxisAlignment.center,
-                                    CrossAxisAlignment.center,
                                 mainAxisAlignment: MainAxisAlignment.start,
                                 children: [
                                   Image.asset(
@@ -324,41 +328,12 @@ class MeetingMainPageState extends State<MeetingMainPage> {
                               Get.bottomSheet(
                                   isScrollControlled: true,
                                   chatBottomSheet(context));
-                                  Future.delayed(
+                              Future.delayed(const Duration(milliseconds: 100),
-                                      const Duration(milliseconds: 100), () {
+                                  () {
                                 state.chatController.jumpTo(state
-                                        .chatController
+                                    .chatController.position.maxScrollExtent);
-                                        .position
-                                        .maxScrollExtent);
                               });
                             },
-                              ),
-                              Visibility(
-                                visible: state.isSpeak.value,
-                                child: GestureDetector(
-                                  child: Container(
-                                    width: 82.w,
-                                    height: 40.h,
-                                    margin: const EdgeInsets.only(
-                                        left: 12, bottom: 40, right: 20),
-                                    alignment: Alignment.center,
-                                    decoration: const BoxDecoration(
-                                        borderRadius: BorderRadius.all(
-                                            Radius.circular(99)),
-                                        color: ColorUtil.Color_255_69_69),
-                                    child: Text(
-                                      '结束发言',
-                                      style: TextStyle(
-                                          fontSize: 14.sp,
-                                          color: ColorUtil.Color_255_255_255),
-                                    ),
-                                  ),
-                                  onTap: () {
-                                    logic.cancelSpeak();
-                                  },
-                                ),
-                              )
-                            ],
                           )
                         ],
                       ),
@@ -428,8 +403,7 @@ class MeetingMainPageState extends State<MeetingMainPage> {
                               if (state.isSpeak.value == false) {
                                 Get.bottomSheet(
                                     isScrollControlled: true,
-                                    applySpeakPermissionBottomSheet(
+                                    applySpeakPermissionBottomSheet(context));
-                                        context, 1));
                               } else {
                                 if (state.isOpenMicrophone.value == false) {
                                   logic.doHttpSetMicr(true);
@@ -456,9 +430,6 @@ class MeetingMainPageState extends State<MeetingMainPage> {
                                 ),
                                 SizedBox(height: 4.h),
                                 Text(
-                                  /*state.isSpeak.value == false
-                                      ? '申请发言'
-                                      : */
                                   state.isOpenCamera.value == true
                                       ? "关闭视频"
                                       : "开启视频",
@@ -469,12 +440,7 @@ class MeetingMainPageState extends State<MeetingMainPage> {
                               ],
                             ),
                             onTap: () {
-                              if (state.isSpeak.value == false) {
+                              if (state.isSpeak.value == true) {
-                                Get.bottomSheet(
-                                    isScrollControlled: true,
-                                    applySpeakPermissionBottomSheet(
-                                        context, 2));
-                              } else {
                                 if (state.isOpenCamera.value == true) {
                                   logic.doHttpSetCamer(false);
                                 } else {
@@ -552,9 +518,7 @@ class MeetingMainPageState extends State<MeetingMainPage> {
                 meetingInfoFloatingLayer(),
                 meetingAudioFloatingLayer(),
               ],
-            ))),
+            )));
-      )
-    );
   }
 
   /// 退出会议底部弹窗
@@ -582,7 +546,6 @@ class MeetingMainPageState extends State<MeetingMainPage> {
               ),
             ),
             onTap: () {
-              state.isNormaExit.value = true;
               Get.back();
               Get.back();
             },
@@ -779,13 +742,8 @@ class MeetingMainPageState extends State<MeetingMainPage> {
             ),
           ),
           Expanded(
-              child: GestureDetector(
               child: Container(
             color: ColorUtil.Color_57_57_57_08,
-            ),
-            onTap: () {
-              logic.changeMeetingInfoState(false);
-            },
           ))
         ],
       ),
@@ -799,13 +757,8 @@ class MeetingMainPageState extends State<MeetingMainPage> {
       child: Column(
         children: [
           Expanded(
-              child: GestureDetector(
               child: Container(
             color: ColorUtil.Color_57_57_57_08,
-            ),
-            onTap: () {
-              logic.changeMeetingAudioState(false);
-            },
           )),
           Container(
             color: ColorUtil.Color_57_57_57_08,
@@ -824,13 +777,8 @@ class MeetingMainPageState extends State<MeetingMainPage> {
             ),
           ),
           Expanded(
-              child: GestureDetector(
               child: Container(
             color: ColorUtil.Color_57_57_57_08,
-            ),
-            onTap: () {
-              logic.changeMeetingAudioState(false);
-            },
           ))
         ],
       ),
@@ -890,8 +838,7 @@ class MeetingMainPageState extends State<MeetingMainPage> {
   }
 
   /// 申请发言权限底部弹窗
-  Widget applySpeakPermissionBottomSheet(
+  Widget applySpeakPermissionBottomSheet(BuildContext context) {
-      BuildContext context, int defaulOpenState) {
     return Container(
       height: 240.h,
       color: ColorUtil.Color_7_9_11,
@@ -989,7 +936,6 @@ class MeetingMainPageState extends State<MeetingMainPage> {
                       ),
                     ),
                     onTap: () {
-                      state.defaulOpenState.value = defaulOpenState;
                       logic.doHttpApplySpeak();
                       Get.back();
                     },
@@ -1087,15 +1033,13 @@ class MeetingMainPageState extends State<MeetingMainPage> {
           Container(
             margin:
                 const EdgeInsets.only(top: 18, left: 16, right: 16, bottom: 16),
-            child: GetBuilder<MeetingMainLogic>(builder: (controll) {
+            child: Text(
-              return Text(
               '会议中（${state.users.value.length}）',
               style: TextStyle(
                   fontSize: 14.sp,
                   fontWeight: FontWeight.w500,
                   color: ColorUtil.Color_85_117_242),
-              );
+            ),
-            }),
           ),
           Expanded(
             child: ScrollConfiguration(
@@ -1146,19 +1090,13 @@ class MeetingMainPageState extends State<MeetingMainPage> {
                                                   ColorUtil.Color_244_244_244),
                                         ),
                                       ),
-                                      Container(
+                                      Text(
-                                        width: 76,
-                                        margin: const EdgeInsets.only(left: 6),
-                                        child: Text(
                                         state.users.value[index].userName,
-                                          maxLines: 1,
-                                          overflow: TextOverflow.ellipsis,
                                         style: TextStyle(
                                             fontSize: 14.sp,
                                             fontWeight: FontWeight.w600,
                                             color: ColorUtil.Color_243_243_243),
                                       ),
-                                      ),
                                       SizedBox(width: 8.w),
                                       Visibility(
                                         visible:
@@ -1200,10 +1138,7 @@ class MeetingMainPageState extends State<MeetingMainPage> {
                                     children: [
                                       Container(
                                         child: Image.asset(
-                                          state.users.value[index].enableShare ==
+                                          'assets/images/meeting_main_share_currently.png',
-                                              true
-                                          ? 'assets/images/meeting_main_share_currently.png'
-                                          : 'assets/images/meeting_main_share_currently_n.png',
                                           width: 17.w,
                                           height: 17.h,
                                         ),
@@ -1387,23 +1322,10 @@ class MeetingMainPageState extends State<MeetingMainPage> {
             children: [
               Container(
                 margin: const EdgeInsets.only(left: 6),
-                child: Text.rich(
+                child: Text(
-                  TextSpan(
+                  state.meetingRoomMsgs.value[index].userName,
-                    children: [
-                      TextSpan(
-                        text: state.meetingRoomMsgs.value[index].userName,
                   style: TextStyle(
-                            fontSize: 12.sp, color: ColorUtil.Color_202_202_202),
+                      fontSize: 10.sp, color: ColorUtil.Color_202_202_202),
-                      ),
-                      TextSpan(
-                        text: "  ${state.meetingRoomMsgs.value[index].time}",
-                        style: TextStyle(
-                            fontSize: 10.sp, color: ColorUtil.Color_202_202_202
-                        ),
-                      ),
-                    ],
-                  ),
-                  textAlign: TextAlign.left,
                 ),
               ),
               Container(
@@ -1412,9 +1334,9 @@ class MeetingMainPageState extends State<MeetingMainPage> {
                     left: 18, right: 18, top: 10, bottom: 10),
                 decoration: const BoxDecoration(
                   borderRadius: BorderRadius.only(
-                      bottomLeft: Radius.circular(30),
+                      bottomLeft: Radius.circular(99),
-                      topRight: Radius.circular(30),
+                      topRight: Radius.circular(99),
-                      bottomRight: Radius.circular(30)),
+                      bottomRight: Radius.circular(99)),
                   color: ColorUtil.Color_53_53_53,
                 ),
                 child: Text(
@@ -1446,23 +1368,10 @@ class MeetingMainPageState extends State<MeetingMainPage> {
             children: [
               Container(
                 margin: const EdgeInsets.only(right: 6),
-                child: Text.rich(
+                child: Text(
-                  TextSpan(
+                  state.meetingRoomMsgs.value[index].userName,
-                    children: [
-                      TextSpan(
-                        text: "${state.meetingRoomMsgs.value[index].time} ",
                   style: TextStyle(
-                            fontSize: 10.sp, color: ColorUtil.Color_202_202_202
+                      fontSize: 10.sp, color: ColorUtil.Color_202_202_202),
-                        ),
-                      ),
-                      TextSpan(
-                        text: state.meetingRoomMsgs.value[index].userName,
-                        style: TextStyle(
-                            fontSize: 12.sp, color: ColorUtil.Color_202_202_202),
-                      ),
-                    ],
-                  ),
-                  textAlign: TextAlign.right,
                 ),
               ),
               Container(
@@ -1471,9 +1380,9 @@ class MeetingMainPageState extends State<MeetingMainPage> {
                     left: 18, right: 18, top: 10, bottom: 10),
                 decoration: const BoxDecoration(
                   borderRadius: BorderRadius.only(
-                      topLeft: Radius.circular(30),
+                      topLeft: Radius.circular(99),
-                      bottomLeft: Radius.circular(30),
+                      bottomLeft: Radius.circular(99),
-                      bottomRight: Radius.circular(30)),
+                      bottomRight: Radius.circular(99)),
                   color: ColorUtil.Color_85_117_242,
                 ),
                 child: Text(
@@ -1561,8 +1470,7 @@ class MeetingMainPageState extends State<MeetingMainPage> {
     var pageList = [];
 
     /// 大屏
-    pageList.add(GetBuilder<MeetingMainLogic>(builder: (controll) {
+    pageList.add(Stack(
-      return Stack(
       alignment: Alignment.center,
       children: [
         state.remoteUid.value != ""
@@ -1571,10 +1479,7 @@ class MeetingMainPageState extends State<MeetingMainPage> {
                   rtcEngine: state.rctEngine.value!,
                   canvas: VideoCanvas(
                       uid: int.tryParse(state.remoteUid.value),
-                  setupMode: VideoViewSetupMode.videoViewSetupAdd,
+                      setupMode: VideoViewSetupMode.videoViewSetupAdd),
-                  renderMode: state.remoteUid.value.length == 9
-                      ? RenderModeType.renderModeFit
-                      : RenderModeType.renderModeHidden),
                 ),
               )
             : Container(
@@ -1634,12 +1539,10 @@ class MeetingMainPageState extends State<MeetingMainPage> {
           ),
         ),
       ],
-      );
+    ));
-    }));
 
     /// gridview
-    pageList.add(GetBuilder<MeetingMainLogic>(builder: (controll){
+    pageList.add(Container(
-      return Container(
       color: ColorUtil.Color_57_57_57,
       child: GridView.builder(
           gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
@@ -1649,7 +1552,8 @@ class MeetingMainPageState extends State<MeetingMainPage> {
             return Stack(
               children: [
                 state.cacheUsers.value[index].enableCamera == true
-                      ? state.cacheUsers.value[index].uid == UserStore.to.userInfoEntity.value!.uid
+                    ? state.cacheUsers.value[index].uid ==
+                            UserStore.to.userInfoEntity.value!.uid
                         ? AgoraVideoView(
                             controller: VideoViewController(
                                 rtcEngine: state.rctEngine.value!,
@@ -1735,17 +1639,12 @@ class MeetingMainPageState extends State<MeetingMainPage> {
                                         shapePath:
                                             ViewSvgPath.getMicrpphonePath()),
                                   ),
-                              SizedBox(
+                                  Text(
-                                  width: 70,
-                                  child: Text(
                                     state.cacheUsers.value[index].userName,
-                                    maxLines: 1,
-                                    overflow: TextOverflow.ellipsis,
                                     style: TextStyle(
                                         fontSize: 12.sp,
                                         color: ColorUtil.Color_255_255_255),
                                   )
-                              )
                                 ],
                               )
                             : Row(
@@ -1757,17 +1656,12 @@ class MeetingMainPageState extends State<MeetingMainPage> {
                                     width: 20.w,
                                     height: 20.h,
                                   ),
-                              SizedBox(
+                                  Text(
-                                  width: 70,
-                                  child: Text(
                                     state.cacheUsers.value[index].userName,
-                                    maxLines: 1,
-                                    overflow: TextOverflow.ellipsis,
                                     style: TextStyle(
                                         fontSize: 12.sp,
                                         color: ColorUtil.Color_255_255_255),
                                   )
-                              )
                                 ],
                               ),
                       )
@@ -1777,9 +1671,7 @@ class MeetingMainPageState extends State<MeetingMainPage> {
               ],
             );
           }),
-      );
+    ));
-    }));
-
     return pageList[position];
   }
 }

wgshare/lib/pages/metting/voice/meeting_main_voice_view.dart

@@ -72,16 +72,11 @@ class MeetingMainVoiceComponent extends StatelessWidget {
                               shapePath: ViewSvgPath.getMicrpphonePath()
                           ),
                         ),
-                        SizedBox(
+                        Text(
-                          width: 70,
-                          child: Text(
                           users[index].userName,
-                            maxLines: 1,
-                            overflow: TextOverflow.ellipsis,
                           style: TextStyle(
                               fontSize: 12.sp,
                               color: ColorUtil.Color_255_255_255),
-                          ),
                         )
                       ],
                     )
@@ -94,16 +89,11 @@ class MeetingMainVoiceComponent extends StatelessWidget {
                             width: 20.w,
                             height: 20.h,
                           ),
-                          SizedBox(
+                          Text(
-                            width: 70,
-                            child: Text(
                             users[index].userName,
-                              maxLines: 1,
-                              overflow: TextOverflow.ellipsis,
                             style: TextStyle(
                                 fontSize: 12.sp,
                                 color: ColorUtil.Color_255_255_255),
-                            ),
                           )
                         ],
                     ),

wgshare/lib/pages/userPage/user_logic.dart

@@ -11,6 +11,6 @@ class UserLogic extends GetxController with RequestToolMixin {
   /// 退出登录
   void logout(){
     UserStore.to.erase();
-    Get.toNamed(Routes.loginPage);
+    Get.offAllNamed(Routes.loginPage);
   }
 }

wgshare/lib/pages/userPage/user_view.dart

@@ -77,7 +77,7 @@ class UserPageState extends State<UserPage>  {
                           alignment: Alignment.center,
                           child: Text(
                               UserStore.to.userInfoEntity.value!.userName.length >= 3
-                                  ? UserStore.to.userInfoEntity.value!.userName.substring(UserStore.to.userInfoEntity.value!.userName.length - 2,UserStore.to.userInfoEntity.value!.userName.length)
+                                  ? UserStore.to.userInfoEntity.value!.userName.substring(1,UserStore.to.userInfoEntity.value!.userName.length)
                                   : UserStore.to.userInfoEntity.value!.userName,
                               style: TextStyle(
                                 fontSize: 30.sp,

wgshare/lib/utils/agora/AgoraUtil.dart

@@ -1,110 +0,0 @@
-import 'package:agora_rtc_engine/agora_rtc_engine.dart';
-
-/// 声网SDK相关工具类
-class AgoraUtil{
-  /// 获取网络连接状态
-  static String getConnectionStateChangedType(ConnectionStateType type){
-    var returnTypeStr = "";
-    switch(type){
-      case ConnectionStateType.connectionStateDisconnected:
-        returnTypeStr = "网络连接断开";
-        break;
-      case ConnectionStateType.connectionStateConnecting:
-        returnTypeStr = "网络连接中";
-        break;
-      case ConnectionStateType.connectionStateConnected:
-        returnTypeStr = "网络已连接";
-        break;
-      case ConnectionStateType.connectionStateReconnecting:
-        returnTypeStr = "网络重新连接中";
-        break;
-      case ConnectionStateType.connectionStateFailed:
-        returnTypeStr = "网络连接失败";
-        break;
-    }
-    return returnTypeStr;
-  }
-
-  /// 获取网络连接状态发生变化的原因
-  static String getConnectionChangedReasonType(ConnectionChangedReasonType type){
-    var returnTypeStr = "";
-    switch(type){
-      case ConnectionChangedReasonType.connectionChangedConnecting:
-        returnTypeStr = "建立网络连接中";
-        break;
-      case ConnectionChangedReasonType.connectionChangedJoinSuccess:
-        returnTypeStr = "成功加入频道";
-        break;
-      case ConnectionChangedReasonType.connectionChangedInterrupted:
-        returnTypeStr = "网络连接中断";
-        break;
-      case ConnectionChangedReasonType.connectionChangedBannedByServer:
-        returnTypeStr = "网络连接被服务器禁止";
-        break;
-      case ConnectionChangedReasonType.connectionChangedJoinFailed:
-        returnTypeStr = "加入频道失败";
-        break;
-      case ConnectionChangedReasonType.connectionChangedLeaveChannel:
-        returnTypeStr = "离开频道";
-        break;
-      case ConnectionChangedReasonType.connectionChangedInvalidAppId:
-        returnTypeStr = "App ID 无效";
-        break;
-      case ConnectionChangedReasonType.connectionChangedInvalidChannelName:
-        returnTypeStr = "频道名无效";
-        break;
-      case ConnectionChangedReasonType.connectionChangedInvalidToken:
-        returnTypeStr = "Token 无效";
-        break;
-      case ConnectionChangedReasonType.connectionChangedTokenExpired:
-        returnTypeStr = "当前使用的 Token 已过期";
-        break;
-      case ConnectionChangedReasonType.connectionChangedRejectedByServer:
-        returnTypeStr = "此用户被服务器禁止";
-        break;
-      case ConnectionChangedReasonType.connectionChangedSettingProxyServer:
-        returnTypeStr = "设置了代理服务器";
-        break;
-      case ConnectionChangedReasonType.connectionChangedRenewToken:
-        returnTypeStr = "更新 Token 引起网络连接状态改变";
-        break;
-      case ConnectionChangedReasonType.connectionChangedClientIpAddressChanged:
-        returnTypeStr = "客户端 IP 地址变更";
-        break;
-      case ConnectionChangedReasonType.connectionChangedKeepAliveTimeout:
-        returnTypeStr = "SDK 和服务器连接保活超时";
-        break;
-      case ConnectionChangedReasonType.connectionChangedRejoinSuccess:
-        returnTypeStr = "重新加入频道成功";
-        break;
-      case ConnectionChangedReasonType.connectionChangedLost:
-        returnTypeStr = "SDK 和服务器失去连接";
-        break;
-      case ConnectionChangedReasonType.connectionChangedEchoTest:
-        returnTypeStr = "连接状态变化由回声测试引起";
-        break;
-      case ConnectionChangedReasonType.connectionChangedClientIpAddressChangedByUser:
-        returnTypeStr = "本地 IP 地址被用户更改";
-        break;
-      case ConnectionChangedReasonType.connectionChangedSameUidLogin:
-        returnTypeStr = "使用相同的 UID 从不同的设备加入同一频道";
-        break;
-      case ConnectionChangedReasonType.connectionChangedTooManyBroadcasters:
-        returnTypeStr = "频道内主播人数已达上限";
-        break;
-      case ConnectionChangedReasonType.connectionChangedLicenseValidationFailure:
-        returnTypeStr = "连接已更改许可证验证失败";
-        break;
-      case ConnectionChangedReasonType.connectionChangedCertificationVeryfyFailure:
-        returnTypeStr = "连接已更改认证版本失败";
-        break;
-      case ConnectionChangedReasonType.connectionChangedStreamChannelNotAvailable:
-        returnTypeStr = "连接已更改流通道不可用";
-        break;
-      case ConnectionChangedReasonType.connectionChangedInconsistentAppid:
-        returnTypeStr = "连接已更改不一致Appid";
-        break;
-    }
-    return returnTypeStr;
-  }
-}

wgshare/lib/utils/color_util.dart

@@ -71,8 +71,6 @@ class ColorUtil {
 
   static const Color_16_19_13 = Color.fromRGBO(16, 19, 13, 1);
 
-  static const Color_255_69_69 = Color.fromRGBO(255, 69, 69, 1);
-
   /// 十六进制颜色，
   /// hex, 十六进制值，例如：0xffffff,
   /// alpha, 透明度 [0.0,1.0]

wgshare/lib/utils/toast_utils.dart

@@ -51,10 +51,6 @@ class ToastUtils {
     EasyLoading.showError(showMsg, duration: duration);
   }
 
-  static showLoadingToMask(String str, EasyLoadingMaskType maskType) {
-    EasyLoading.show(status: str, maskType: maskType);
-  }
-
   static showLoading() {
     EasyLoading.show(status: 'loading...');
   }
@@ -67,10 +63,6 @@ class ToastUtils {
     EasyLoading.showInfo(showMsg, duration: Duration(microseconds: microseconds));
   }
 
-  static showSuccessToMask(String showMsg, EasyLoadingMaskType maskType, {Duration? duration}) {
-    EasyLoading.showSuccess(showMsg, maskType: maskType, duration: duration);
-  }
-
   static showSuccess(String showMsg, {Duration? duration}) {
     EasyLoading.showSuccess(showMsg, duration: duration);
   }

wgshare/linux/flutter/generated_plugin_registrant.cc

@@ -6,10 +6,6 @@
 
 #include "generated_plugin_registrant.h"
 
-#include <dynamic_color/dynamic_color_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
-  g_autoptr(FlPluginRegistrar) dynamic_color_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "DynamicColorPlugin");
-  dynamic_color_plugin_register_with_registrar(dynamic_color_registrar);
 }

wgshare/linux/flutter/generated_plugins.cmake

@@ -3,7 +3,6 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
-  dynamic_color
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST

wgshare/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -6,28 +6,20 @@ import FlutterMacOS
 import Foundation
 
 import agora_rtc_engine
-import appkit_ui_element_colors
 import device_info_plus
-import dynamic_color
 import flutter_inappwebview_macos
 import geolocator_apple
 import iris_method_channel
-import macos_ui
-import macos_window_utils
 import package_info_plus
 import path_provider_foundation
 import sqflite_darwin
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   AgoraRtcNgPlugin.register(with: registry.registrar(forPlugin: "AgoraRtcNgPlugin"))
-  AppkitUiElementColorsPlugin.register(with: registry.registrar(forPlugin: "AppkitUiElementColorsPlugin"))
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
-  DynamicColorPlugin.register(with: registry.registrar(forPlugin: "DynamicColorPlugin"))
   InAppWebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "InAppWebViewFlutterPlugin"))
   GeolocatorPlugin.register(with: registry.registrar(forPlugin: "GeolocatorPlugin"))
   IrisMethodChannelPlugin.register(with: registry.registrar(forPlugin: "IrisMethodChannelPlugin"))
-  MacOSUiPlugin.register(with: registry.registrar(forPlugin: "MacOSUiPlugin"))
-  MacOSWindowUtilsPlugin.register(with: registry.registrar(forPlugin: "MacOSWindowUtilsPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))

wgshare/pubspec.lock

@@ -14,14 +14,6 @@ packages:
     description: dart
     source: sdk
     version: "0.3.2"
-  adaptive_dialog:
-    dependency: "direct main"
-    description:
-      name: adaptive_dialog
-      sha256: a87f9e13fdbe0b11d353733a90796129ee79fc0654a27855fa2c9c0a3633a362
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.3.0"
   agora_rtc_engine:
     dependency: "direct main"
     description:
@@ -38,22 +30,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "6.7.0"
-  animations:
-    dependency: transitive
-    description:
-      name: animations
-      sha256: d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.0.11"
-  appkit_ui_element_colors:
-    dependency: transitive
-    description:
-      name: appkit_ui_element_colors
-      sha256: c3e50f900aae314d339de489535736238627071457c4a4a2dbbb1545b4f04f22
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.0.0"
   args:
     dependency: transitive
     description:
@@ -238,14 +214,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.3.7"
-  date_format:
-    dependency: "direct main"
-    description:
-      name: date_format
-      sha256: a48254e60bdb7f1d5a15cac7f86e37491808056c0a99dbdc850841def4754ddc
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.0.9"
   device_info_plus:
     dependency: "direct main"
     description:
@@ -278,14 +246,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
-  dynamic_color:
-    dependency: transitive
-    description:
-      name: dynamic_color
-      sha256: eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.7.0"
   easy_debounce:
     dependency: "direct main"
     description:
@@ -586,14 +546,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.2"
-  gradient_borders:
-    dependency: transitive
-    description:
-      name: gradient_borders
-      sha256: b1cd969552c83f458ff755aa68e13a0327d09f06c3f42f471b423b01427f21f8
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.0.1"
   graphs:
     dependency: transitive
     description:
@@ -634,14 +586,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.0.2"
-  intersperse:
-    dependency: transitive
-    description:
-      name: intersperse
-      sha256: "2f8a905c96f6cbba978644a3d5b31b8d86ddc44917662df7d27a61f3df66a576"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.0.0"
   intl:
     dependency: transitive
     description:
@@ -746,22 +690,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.3.0"
-  macos_ui:
-    dependency: transitive
-    description:
-      name: macos_ui
-      sha256: "80f6539aba5a3a1182d5225a6c27969a780bcb1d2d8135b4ffb708570cf0c854"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.0.9"
-  macos_window_utils:
-    dependency: transitive
-    description:
-      name: macos_window_utils
-      sha256: "3534f2af024f2f24112ca28789a44e6750083f8c0065414546c6593ee48a5009"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.6.1"
   macros:
     dependency: transitive
     description:

wgshare/pubspec.yaml

@@ -33,6 +33,8 @@ dependencies:
   flutter_localizations:
     sdk: flutter
 
+
+
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.8
@@ -84,14 +86,9 @@ dependencies:
   preload_page_view: ^0.2.0
 
   # webview
+  #webview_flutter: ^3.0.4
   flutter_inappwebview: ^6.1.5
 
-  # 时间组件
-  date_format: ^2.0.9
-
-  # 弹窗
-  adaptive_dialog: ^2.3.0
-
 dev_dependencies:
   flutter_test:
     sdk: flutter

wgshare/windows/flutter/generated_plugin_registrant.cc

@@ -7,7 +7,6 @@
 #include "generated_plugin_registrant.h"
 
 #include <agora_rtc_engine/agora_rtc_engine_plugin.h>
-#include <dynamic_color/dynamic_color_plugin_c_api.h>
 #include <flutter_inappwebview_windows/flutter_inappwebview_windows_plugin_c_api.h>
 #include <geolocator_windows/geolocator_windows.h>
 #include <iris_method_channel/iris_method_channel_plugin_c_api.h>
@@ -16,8 +15,6 @@
 void RegisterPlugins(flutter::PluginRegistry* registry) {
   AgoraRtcEnginePluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("AgoraRtcEnginePlugin"));
-  DynamicColorPluginCApiRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("DynamicColorPluginCApi"));
   FlutterInappwebviewWindowsPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("FlutterInappwebviewWindowsPluginCApi"));
   GeolocatorWindowsRegisterWithRegistrar(

wgshare/windows/flutter/generated_plugins.cmake

@@ -4,7 +4,6 @@
 
 list(APPEND FLUTTER_PLUGIN_LIST
   agora_rtc_engine
-  dynamic_color
   flutter_inappwebview_windows
   geolocator_windows
   iris_method_channel