marking
/
WGShare.Mobile.Flutter
19
0
Fork 0
Code Pull Requests Actions Releases Activity

Compare commits

base: marking:363fd0b77cafee9e14823ceb5a12c6f1d6ad4dce
Branches Tags
marking:master
marking:dev1.7
marking:dev
..
compare: marking:045c730899d12ec12bbb5bd524cc1838579e6495
Branches Tags
marking:dev1.7
marking:master
marking:dev

No commits in common. "363fd0b77cafee9e14823ceb5a12c6f1d6ad4dce" and "045c730899d12ec12bbb5bd524cc1838579e6495" have entirely different histories.
363fd0b77c ... 045c730899

12 changed files with 512 additions and 701 deletions
Show Stats Expand all files Collapse all files

6
wgshare/lib/common/api/retrofit_client.dart
View File

@ -103,10 +103,4 @@ abstract class RetrofitClient {
@Query("enableCamera") bool enableCamera, @Query("enableCamera") bool enableCamera,
@Query("uid") String uid, @Query("uid") String uid,
); );
/// 刷新登录Token
@POST("/auth/refresh")
Future<BaseStructureResult<UserInfoEntity>> refreshToken(
@Query("refreshToken") String refreshToken,
);
} }

55
wgshare/lib/common/request/rest_dio.dart
View File

@ -11,13 +11,8 @@ import 'package:wgshare/utils/toast_utils.dart';
import 'package:wgshare/routes/app_routes.dart'; import 'package:wgshare/routes/app_routes.dart';
import 'package:package_info_plus/package_info_plus.dart'; import 'package:package_info_plus/package_info_plus.dart';
import '../mixins/request_tool_mixin.dart';
import '../models/common/base_structure_result.dart';
import '../models/user_info_entity.dart';
class RequestTool { class RequestTool {
static late Dio _dio; static late Dio _dio;
// 初始化请求配置 // 初始化请求配置
static _init() { static _init() {
// 自定义 HttpClient // 自定义 HttpClient
@ -25,21 +20,16 @@ class RequestTool {
BaseOptions options = BaseOptions( BaseOptions options = BaseOptions(
baseUrl: RequestConfig().baseUrl, baseUrl: RequestConfig().baseUrl,
connectTimeout: connectTimeout: const Duration(milliseconds: RequestConfig.connectTimeout),
const Duration(milliseconds: RequestConfig.connectTimeout), receiveTimeout: const Duration(milliseconds: RequestConfig.receiveTimeout),
receiveTimeout:
const Duration(milliseconds: RequestConfig.receiveTimeout),
); );
_dio = Dio(options) _dio = Dio(options)..httpClientAdapter = IOHttpClientAdapter(createHttpClient: () => httpClient);
..httpClientAdapter =
IOHttpClientAdapter(createHttpClient: () => httpClient);
_dio.interceptors.add(AuthInterceptor()); // 添加 token _dio.interceptors.add(AuthInterceptor()); // 添加 token
_dio.interceptors.add(ResponseHandle()); // 添加 数据返回拦截 _dio.interceptors.add(ResponseHandle()); // 添加 数据返回拦截
_dio.interceptors.add(TheError()); // 添加 数据返回拦截 _dio.interceptors.add(TheError()); // 添加 数据返回拦截
const isProd = bool.fromEnvironment('dart.vm.product'); const isProd = bool.fromEnvironment('dart.vm.product');
if (!isProd && RequestConfig.requestDataPrinting) { if (!isProd && RequestConfig.requestDataPrinting) {
_dio.interceptors _dio.interceptors.add(LogInterceptor(responseBody: true, requestBody: true)); //添加日志
.add(LogInterceptor(responseBody: true, requestBody: true)); //添加日志
} }
return RetrofitClient(_dio, baseUrl: RequestConfig().baseUrl); return RetrofitClient(_dio, baseUrl: RequestConfig().baseUrl);
@ -118,10 +108,8 @@ class ResponseHandle extends Interceptor {
var data = response.data; var data = response.data;
var flag = data != null && var flag = data != null &&
((data['code'] != null && ((data['code'] != null && (data['code'] == 401 || data['code'] == '401')) ||
(data['code'] == 401 || data['code'] == '401')) || (data['Code'] != null && (data['Code'] == 401 || data['Code'] == '401')));
(data['Code'] != null &&
(data['Code'] == 401 || data['Code'] == '401')));
if (statusCode == 401 || flag) { if (statusCode == 401 || flag) {
Future.delayed(const Duration(seconds: 2), () { Future.delayed(const Duration(seconds: 2), () {
@ -130,7 +118,7 @@ class ResponseHandle extends Interceptor {
}); });
} }
if (data['code'] != 200) { if(data['code'] != 200){
ToastUtils.showError(data['message']); ToastUtils.showError(data['message']);
} }
@ -138,14 +126,12 @@ class ResponseHandle extends Interceptor {
} }
} }
class TheError extends Interceptor with RequestToolMixin { class TheError extends Interceptor {
// late getx.Rx<UserInfoDetail?> userInfo = UserStore.to.userDetailInfo; // late getx.Rx<UserInfoDetail?> userInfo = UserStore.to.userDetailInfo;
@override @override
Future<void> onError( void onError(DioException err, ErrorInterceptorHandler handler) {
DioException err, ErrorInterceptorHandler handler) async {
var message = '请求错误，请重试'; var message = '请求错误，请重试';
int? statusCode;
switch (err.type) { switch (err.type) {
case DioExceptionType.connectionTimeout: case DioExceptionType.connectionTimeout:
@ -166,7 +152,7 @@ class TheError extends Interceptor with RequestToolMixin {
} else { } else {
Response? response = err.response; Response? response = err.response;
if (response != null) { if (response != null) {
statusCode = response.statusCode; int? statusCode = response.statusCode;
var errorMap = response.data; var errorMap = response.data;
// var runtimeType = errorMap.runtimeType; // var runtimeType = errorMap.runtimeType;
@ -177,11 +163,12 @@ class TheError extends Interceptor with RequestToolMixin {
switch (statusCode) { switch (statusCode) {
case 401: case 401:
message = '用户登录失效，请重新登录'; message = '用户登录失效，请重新登录';
/*Future.delayed(const Duration(seconds: 2), () {
Future.delayed(const Duration(seconds: 2), () {
// UserStore.to.erase(); // UserStore.to.erase();
StorageService.to.erase(); StorageService.to.erase();
getx.Get.offAllNamed(Routes.loginPage); getx.Get.offAllNamed(Routes.loginPage);
});*/ });
break; break;
case 404: case 404:
message = '无效地址'; message = '无效地址';
@ -203,17 +190,11 @@ class TheError extends Interceptor with RequestToolMixin {
default: default:
message = '请求错误'; message = '请求错误';
} }
if (statusCode == 401) { /* if (message == '用户登录失效，请重新登录' && userInfo.value?.id == null) {
BaseStructureResult<UserInfoEntity> res = await getClient() return handler.next(error);
.refreshToken(UserStore.to.userInfoEntity.value!.refreshToken); }*/
if (null != res.data) {
UserStore.to.setToken(res.data!.token); ToastUtils.showError(message);
UserStore.to.setRefreshToken(res.data!.refreshToken);
UserStore.to.setUserDetailInfo(res.data!);
}
} else {
ToastUtils.showError(message);
}
return handler.next(err); return handler.next(err);
} }
} }

1
wgshare/lib/common/store/app_storage_key.dart
View File

@ -2,7 +2,6 @@
enum AppStorageKey { enum AppStorageKey {
token(value: 'TOKEN', label: "登录用户的token"), token(value: 'TOKEN', label: "登录用户的token"),
refreshToken(value: 'REFRESHTOKEN', label: "刷新用的token"),
userInfo(value: 'USERINFO', label: "登录用户的基本信息"), userInfo(value: 'USERINFO', label: "登录用户的基本信息"),
account(value: 'ACCOUNT', label: "用户名"), account(value: 'ACCOUNT', label: "用户名"),
pwd(value: 'PWD', label: "密码"), pwd(value: 'PWD', label: "密码"),

12
wgshare/lib/common/store/user_store.dart
View File

@ -14,9 +14,6 @@ class UserStore extends GetxController with RequestToolMixin {
/// 是否登录 /// 是否登录
String? token; String? token;
/// 刷新用的token
String? refreshToken;
/// 登录类型 /// 登录类型
String? loginType; String? loginType;
@ -26,7 +23,6 @@ class UserStore extends GetxController with RequestToolMixin {
UserStore init() { UserStore init() {
loginType = StorageService.to.read(AppStorageKey.loginType.value); loginType = StorageService.to.read(AppStorageKey.loginType.value);
token = StorageService.to.read(AppStorageKey.token.value); token = StorageService.to.read(AppStorageKey.token.value);
refreshToken = StorageService.to.read(AppStorageKey.refreshToken.value);
try { try {
var userDetail = StorageService.to.read(AppStorageKey.userInfo.value); var userDetail = StorageService.to.read(AppStorageKey.userInfo.value);
if (userDetail != null) { if (userDetail != null) {
@ -49,12 +45,6 @@ class UserStore extends GetxController with RequestToolMixin {
StorageService.to.write(AppStorageKey.token.value, token); StorageService.to.write(AppStorageKey.token.value, token);
} }
/// 保存refreshToken
void setRefreshToken(String refreshToken) {
this.refreshToken = refreshToken;
StorageService.to.write(AppStorageKey.refreshToken.value, refreshToken);
}
/// 保存登录类型 /// 保存登录类型
void setLoginType(String loginType) { void setLoginType(String loginType) {
this.loginType = loginType; this.loginType = loginType;
@ -71,12 +61,10 @@ class UserStore extends GetxController with RequestToolMixin {
void erase() { void erase() {
userInfoEntity.value = null; userInfoEntity.value = null;
token = null; token = null;
refreshToken = null;
loginType = null; loginType = null;
StorageService.to.write(AppStorageKey.userInfo.value, null); StorageService.to.write(AppStorageKey.userInfo.value, null);
StorageService.to.write(AppStorageKey.token.value, null); StorageService.to.write(AppStorageKey.token.value, null);
StorageService.to.write(AppStorageKey.refreshToken.value, null);
StorageService.to.write(AppStorageKey.loginType.value, null); StorageService.to.write(AppStorageKey.loginType.value, null);
// StorageService.to.erase(); // StorageService.to.erase();
} }

2
wgshare/lib/pages/loginPage/login_logic.dart
View File

@ -60,7 +60,6 @@ class LoginLogic extends GetxController with RequestToolMixin {
BaseStructureResult<UserInfoEntity> res = await getClient().login(state.userNameController.text, md5.convert(utf8.encode(state.passwordController.text)).toString()); BaseStructureResult<UserInfoEntity> res = await getClient().login(state.userNameController.text, md5.convert(utf8.encode(state.passwordController.text)).toString());
if (null != res.data) { if (null != res.data) {
UserStore.to.setToken(res.data!.token); UserStore.to.setToken(res.data!.token);
UserStore.to.setRefreshToken(res.data!.refreshToken);
UserStore.to.setUserDetailInfo(res.data!); UserStore.to.setUserDetailInfo(res.data!);
UserStore.to.setLoginType(AppConfig.NORMAL_LOGIN); UserStore.to.setLoginType(AppConfig.NORMAL_LOGIN);
Get.offAllNamed(Routes.startPage); Get.offAllNamed(Routes.startPage);
@ -87,7 +86,6 @@ class LoginLogic extends GetxController with RequestToolMixin {
BaseStructureResult<UserInfoEntity> res = await getClient().anonLogin(await DeviceInfo.getDeviceId(),state.nickNameCodeController.text, state.meetingCodeController.text); BaseStructureResult<UserInfoEntity> res = await getClient().anonLogin(await DeviceInfo.getDeviceId(),state.nickNameCodeController.text, state.meetingCodeController.text);
if (null != res.data) { if (null != res.data) {
UserStore.to.setToken(res.data!.token); UserStore.to.setToken(res.data!.token);
UserStore.to.setRefreshToken(res.data!.refreshToken);
UserStore.to.setUserDetailInfo(res.data!); UserStore.to.setUserDetailInfo(res.data!);
UserStore.to.setLoginType(AppConfig.ANONYMOUS_LOGIN); UserStore.to.setLoginType(AppConfig.ANONYMOUS_LOGIN);
Get.toNamed(Routes.meetingMainPage, arguments: {"roomNumber": state.meetingCodeController.text}); Get.toNamed(Routes.meetingMainPage, arguments: {"roomNumber": state.meetingCodeController.text});

73
wgshare/lib/pages/metting/meeting_main_logic.dart
View File

@ -9,7 +9,6 @@ import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:permission_handler/permission_handler.dart'; import 'package:permission_handler/permission_handler.dart';
import 'package:signalr_core/signalr_core.dart'; import 'package:signalr_core/signalr_core.dart';
import 'package:wakelock_plus/wakelock_plus.dart';
import 'package:wgshare/common/store/user_store.dart'; import 'package:wgshare/common/store/user_store.dart';
import 'package:wgshare/utils/count_microphone_volume.dart'; import 'package:wgshare/utils/count_microphone_volume.dart';
import '../../common/config/request_config.dart'; import '../../common/config/request_config.dart';
@ -19,7 +18,6 @@ import '../../common/models/meeting_room_info.dart';
import '../../common/models/meeting_room_msg.dart'; import '../../common/models/meeting_room_msg.dart';
import '../../common/models/meeting_room_user.dart'; import '../../common/models/meeting_room_user.dart';
import '../../common/store/business_store.dart'; import '../../common/store/business_store.dart';
import '../../routes/app_routes.dart';
import '../../utils/agora/AgoraUtil.dart'; import '../../utils/agora/AgoraUtil.dart';
import '../../utils/permission/PermissionService.dart'; import '../../utils/permission/PermissionService.dart';
import '../../utils/toast_utils.dart'; import '../../utils/toast_utils.dart';
@ -36,9 +34,6 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
var data = Get.arguments; var data = Get.arguments;
state.roomNumber.value = data["roomNumber"]; state.roomNumber.value = data["roomNumber"];
// 开启屏幕常亮
WakelockPlus.enable();
doHttpGetMeetingToken(true); doHttpGetMeetingToken(true);
} }
@ -50,10 +45,6 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
state.sendMsgController.dispose(); state.sendMsgController.dispose();
state.pageController.dispose(); state.pageController.dispose();
stopTime(); stopTime();
// 关闭屏幕常亮
WakelockPlus.disable();
leaveMeetingToRtc(); leaveMeetingToRtc();
leaveMeetingToSocket(); leaveMeetingToSocket();
} }
@ -161,24 +152,6 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
update(); update();
} }
/// 点击grid切换大屏
void checkLargeScreen(String uid){
ToastUtils.showSuccess("切换用户成功");
if(uid == UserStore.to.userInfoEntity.value!.uid) {
state.remoteUid.value = "0";
}else{
if(state.isSpeak.value == true && state.isOpenCamera.value == true){
state.floating.value?.open(Get.context!);
}
state.remoteUid.value = uid;
}
changePageState(0);
Future.delayed(const Duration(milliseconds: 200), () {
changePageState(1);
});
update();
}
/// ------------------------------------------------------------------------------发言权限 /// ------------------------------------------------------------------------------发言权限
/// 申请发言权限 /// 申请发言权限
Future<void> doHttpApplySpeak() async { Future<void> doHttpApplySpeak() async {
@ -208,10 +181,6 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
/// ------------------------------------------------------------------------------麦克风相关（操作） /// ------------------------------------------------------------------------------麦克风相关（操作）
/// 用户开闭麦 /// 用户开闭麦
Future<void> doHttpSetMicr(bool isOpenMicrophone) async { Future<void> doHttpSetMicr(bool isOpenMicrophone) async {
if(isOpenMicrophone == false){
state.spokesman.value = "";
state.spokesmanVolume.value = 0;
}
await getClient().setMicr(state.roomNumber.value, isOpenMicrophone, await getClient().setMicr(state.roomNumber.value, isOpenMicrophone,
UserStore.to.userInfoEntity.value!.uid); UserStore.to.userInfoEntity.value!.uid);
} }
@ -233,7 +202,6 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
BaseStructureResult res = BaseStructureResult res =
await getClient().getTvAnchor(state.roomNumber.value); await getClient().getTvAnchor(state.roomNumber.value);
state.remoteUid.value = res.data!.toString(); state.remoteUid.value = res.data!.toString();
state.remoteAssistantUid.value = res.data!.toString();
debugPrint("wgs输出===：获取当前全员观看主播${res.data}"); debugPrint("wgs输出===：获取当前全员观看主播${res.data}");
if (res.data!.toString().length != 9) { if (res.data!.toString().length != 9) {
@ -270,7 +238,8 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
// 判断当前会议室是否存在全员观看主播 // 判断当前会议室是否存在全员观看主播
var isCurrentUserIsCamera = false; var isCurrentUserIsCamera = false;
for (var i = 0; i < state.cacheUsers.value.length; i++) { for (var i = 0; i < state.cacheUsers.value.length; i++) {
if (state.remoteUid.value == state.cacheUsers.value[i].uid && state.cacheUsers.value[i].enableCamera == true) { if (state.remoteUid.value == state.cacheUsers.value[i].uid &&
state.cacheUsers.value[i].enableCamera == true) {
isCurrentUserIsCamera = true; isCurrentUserIsCamera = true;
} }
} }
@ -285,13 +254,11 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
} else { } else {
// 当前会议室不存在全员观看主播时，设置主播ID为空并切换页面到视频状态 // 当前会议室不存在全员观看主播时，设置主播ID为空并切换页面到视频状态
debugPrint("wgs输出===：当前会议室不存在全员观看主播时，设置主播ID为空并切换页面到视频状态"); debugPrint("wgs输出===：当前会议室不存在全员观看主播时，设置主播ID为空并切换页面到视频状态");
// state.remoteUid.value = ""; state.remoteUid.value = "";
state.remoteAssistantUid.value = "";
changePageState(1); changePageState(1);
} }
} }
} else { } else {
debugPrint("wgs输出===：当前全员观看是共享类型");
if (state.remoteUid.value == if (state.remoteUid.value ==
UserStore.to.userInfoEntity.value!.screenShareId) { UserStore.to.userInfoEntity.value!.screenShareId) {
// 如果是自己在共享 // 如果是自己在共享
@ -303,7 +270,6 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
state.cacheUsers.value[i].enableShare = true; state.cacheUsers.value[i].enableShare = true;
} }
} }
changePageState(1);
} }
} }
update(); update();
@ -572,9 +538,7 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
} }
state.users.value = state.cacheUsers.value; state.users.value = state.cacheUsers.value;
update(); update();
if(listDynamic[0] != UserStore.to.userInfoEntity.value!.uid){ doHttpGetTvAnchor();
doHttpGetTvAnchor();
}
debugPrint("wgs输出===：Socket-远端用户或主播离开会议室：$jsonStr"); debugPrint("wgs输出===：Socket-远端用户或主播离开会议室：$jsonStr");
}); });
@ -600,20 +564,6 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
}); });
}); });
/// 强制退出
state.hubConnection.value?.on("ForceLogout", (e) {
// var jsonStr = const Utf8Decoder().convert(json.encode(uid).runes.toList());
var jsonStr = json.encode(e);
List listDynamic = jsonDecode(jsonStr);
debugPrint("wgs输出===：Socket-强制退出：${listDynamic[0]}");
state.isNormaExit.value = true;
ToastUtils.showSuccess("${listDynamic[0]}");
Future.delayed(const Duration(seconds: 1), () {
UserStore.to.erase();
Get.offAllNamed(Routes.loginPage);
});
});
/// ------------------------------------------------------------------------------会议室聊天相关回调 /// ------------------------------------------------------------------------------会议室聊天相关回调
/// 会议室接收消息回调 /// 会议室接收消息回调
state.hubConnection.value?.on("ReceiveMessage", (e) { state.hubConnection.value?.on("ReceiveMessage", (e) {
@ -624,12 +574,10 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
MeetingRoomMsg meetingRoomMsg = MeetingRoomMsg(list[0], list[1], list[2], MeetingRoomMsg meetingRoomMsg = MeetingRoomMsg(list[0], list[1], list[2],
0, formatDate(dateTime, [HH, ':', nn, ':', ss])); 0, formatDate(dateTime, [HH, ':', nn, ':', ss]));
state.meetingRoomMsgs.value.add(meetingRoomMsg); state.meetingRoomMsgs.value.add(meetingRoomMsg);
state.msgNum.value = state.msgNum.value += 1;
update(); update();
Future.delayed(const Duration(milliseconds: 100), () { Future.delayed(const Duration(milliseconds: 100), () {
state.chatController state.chatController
.jumpTo(state.chatController.position.maxScrollExtent); .jumpTo(state.chatController.position.maxScrollExtent);
state.msgNum.value = 0;
}); });
debugPrint("wgs输出===：Socket-会议室接收消息：$jsonStr"); debugPrint("wgs输出===：Socket-会议室接收消息：$jsonStr");
}); });
@ -642,17 +590,13 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
var listDynamic = jsonDecode(jsonStr); var listDynamic = jsonDecode(jsonStr);
MeetingRoomUser meetingRoomUser = MeetingRoomUser.fromJson(listDynamic); MeetingRoomUser meetingRoomUser = MeetingRoomUser.fromJson(listDynamic);
if (meetingRoomUser.enableCamera == true) { if (meetingRoomUser.enableCamera == true) {
debugPrint("wgs输出===：Socket-用户单独开摄像头${jsonStr}"); debugPrint("wgs输出===：Socket-用户单独开摄像头");
// 遍历会议室用户列表，更改摄像头状态 // 遍历会议室用户列表，更改摄像头状态
for (MeetingRoomUser mru in state.cacheUsers.value) { for (MeetingRoomUser mru in state.cacheUsers.value) {
if (mru.uid == meetingRoomUser.uid) { if (mru.uid == meetingRoomUser.uid) {
mru.enableCamera = true; mru.enableCamera = true;
} }
debugPrint("wgs输出===：Socket-用户单独开摄像头---${state.remoteUid.value}--${meetingRoomUser.uid}");
if(state.remoteUid.value == meetingRoomUser.uid){
doHttpGetTvAnchor();
}
} }
if (meetingRoomUser.uid == UserStore.to.userInfoEntity.value!.uid) { if (meetingRoomUser.uid == UserStore.to.userInfoEntity.value!.uid) {
@ -715,7 +659,7 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
/// isAgain：是否重新加入 /// isAgain：是否重新加入
Future<void> joinMeetingToSocket(bool isAgain) async { Future<void> joinMeetingToSocket(bool isAgain) async {
await state.hubConnection.value?.invoke("joinChannel", await state.hubConnection.value?.invoke("joinChannel",
args: [state.roomNumber.value, state.isOpenMicrophone.value, state.isOpenCamera.value, state.isSpeak.value]); args: [state.roomNumber.value, false, false, false]);
mergeFetch(isAgain); mergeFetch(isAgain);
/*if(isAgain == false){ /*if(isAgain == false){
mergeFetch(isAgain); mergeFetch(isAgain);
@ -865,14 +809,13 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
for (MeetingRoomUser mru in state.cacheUsers.value) { for (MeetingRoomUser mru in state.cacheUsers.value) {
// 用于更改语音布局里的用户列表麦克风 // 用于更改语音布局里的用户列表麦克风
if (avi.uid == 0) { if (avi.uid == 0) {
// debugPrint("wgs输出===：RTC-用户音量提示（自己）：${CountMicrophoneVolume.getVolume(avi.volume!)}"); //debugPrint("wgs输出===：RTC-用户音量提示（自己）：${CountMicrophoneVolume.getVolume(avi.volume!)}");
mru.volume = CountMicrophoneVolume.getVolume(avi.volume!); mru.volume = CountMicrophoneVolume.getVolume(avi.volume!);
state.microphoneVolume.value = state.microphoneVolume.value =
CountMicrophoneVolume.getVolume(avi.volume!); CountMicrophoneVolume.getVolume(avi.volume!);
} else { } else {
debugPrint("wgs输出===：RTC-用户音量提示：${avi.uid}--${mru.uid}");
if (avi.uid.toString() == mru.uid) { if (avi.uid.toString() == mru.uid) {
debugPrint("wgs输出===：RTC-用户音量提示（远端用户）：${speakers[0].uid}--${speakers[0].volume}"); //debugPrint("wgs输出===：RTC-用户音量提示（远端用户）：${speakers[0].uid}--${speakers[0].volume}");
mru.volume = CountMicrophoneVolume.getVolume(avi.volume!); mru.volume = CountMicrophoneVolume.getVolume(avi.volume!);
if (avi.volume != 0) { if (avi.volume != 0) {

5
wgshare/lib/pages/metting/meeting_main_state.dart
View File

@ -79,8 +79,6 @@ class MeetingMainState {
late RxBool isOpenShare = false.obs; late RxBool isOpenShare = false.obs;
/// 当前视频主播ID /// 当前视频主播ID
late RxString remoteUid = "".obs; late RxString remoteUid = "".obs;
/// 当前视频主播ID-辅助判断用
late RxString remoteAssistantUid = "".obs;
/// 是否成功加入会议室 /// 是否成功加入会议室
late RxBool isJoinSuccess = false.obs; late RxBool isJoinSuccess = false.obs;
@ -92,9 +90,6 @@ class MeetingMainState {
/// 聊天数据 /// 聊天数据
late RxList<MeetingRoomMsg> meetingRoomMsgs = RxList([]); late RxList<MeetingRoomMsg> meetingRoomMsgs = RxList([]);
/// 聊天消息未读数量
late RxInt msgNum = 0.obs;
/// signalR 长连接相关 /// signalR 长连接相关
late RxString serviceUrl = "http://192.168.2.9:5192/session-manage".obs; late RxString serviceUrl = "http://192.168.2.9:5192/session-manage".obs;
late Rx<HubConnection?> hubConnection = Rx(null); late Rx<HubConnection?> hubConnection = Rx(null);

510
wgshare/lib/pages/metting/meeting_main_view.dart
View File

@ -303,13 +303,13 @@ class MeetingMainPageState extends State<MeetingMainPage> {
MainAxisAlignment.spaceBetween, MainAxisAlignment.spaceBetween,
children: [ children: [
GestureDetector( GestureDetector(
child: Container( child: Container(
width: 200.w, width: 200.w,
height: 40.h, height: 40.h,
margin: const EdgeInsets.only( margin: const EdgeInsets.only(
left: 20, bottom: 40), left: 20, bottom: 40),
padding: padding:
const EdgeInsets.only(left: 20), const EdgeInsets.only(left: 20),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: const BorderRadius.only( borderRadius: const BorderRadius.only(
bottomLeft: Radius.circular(56), bottomLeft: Radius.circular(56),
@ -319,50 +319,26 @@ class MeetingMainPageState extends State<MeetingMainPage> {
border: Border.all( border: Border.all(
width: 1.w, width: 1.w,
color: color:
ColorUtil.Color_99_111_158), ColorUtil.Color_99_111_158),
), ),
child: Row( child: Row(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.center, CrossAxisAlignment.center,
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.spaceBetween, MainAxisAlignment.start,
children: [ children: [
Row( Image.asset(
children: [ 'assets/images/meeting_main_chat.png',
Image.asset( width: 18.w,
'assets/images/meeting_main_chat.png', height: 18.h,
width: 18.w,
height: 18.h,
),
SizedBox(width: 6.w),
Text(
'说点什么...',
style: TextStyle(
fontSize: 14.sp,
color: ColorUtil
.Color_156_156_156),
)
],
), ),
Visibility( SizedBox(width: 6.w),
visible: state.msgNum.value > 0 ? true : false, Text(
child: Container( '说点什么...',
width: 18.w, style: TextStyle(
height: 18.h, fontSize: 14.sp,
alignment: Alignment.center, color: ColorUtil
margin: const EdgeInsets.only(right: 12), .Color_156_156_156),
decoration: const BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(20)),
color: ColorUtil.Color_255_69_69,
),
child: Text(
"${state.msgNum.value}",
style: TextStyle(
fontSize: 12.sp,
color: ColorUtil
.Color_255_255_255),
)
),
) )
], ],
), ),
@ -371,9 +347,6 @@ class MeetingMainPageState extends State<MeetingMainPage> {
Get.bottomSheet( Get.bottomSheet(
isScrollControlled: true, isScrollControlled: true,
chatBottomSheet(context)); chatBottomSheet(context));
state.msgNum.value = 0;
Future.delayed( Future.delayed(
const Duration(milliseconds: 100), const Duration(milliseconds: 100),
() { () {
@ -427,61 +400,57 @@ class MeetingMainPageState extends State<MeetingMainPage> {
children: [ children: [
/// 音频 /// 音频
GestureDetector( GestureDetector(
child: Container( child: Column(
padding: const EdgeInsets.only(left: 6,right: 6), mainAxisAlignment: MainAxisAlignment.center,
color: ColorUtil.Color_0_0_0_0, children: [
child: Column( state.isSpeak.value == false
mainAxisAlignment: MainAxisAlignment.center, ? Image.asset(
children: [ state.isSpeak.value == false
? 'assets/images/meeting_main_sqfy.png'
: state.isOpenMicrophone
.value ==
true
? 'assets/images/meeting_main_microphone_default.png'
: 'assets/images/meeting_main_sqfy.png',
width: 20.w,
height: 20.h,
)
: state.isOpenMicrophone.value == true
? Container(
width: 20.w,
height: 20.h,
child: LiquidCustomProgressIndicator(
value: state
.microphoneVolume
.value,
valueColor:
const AlwaysStoppedAnimation(
ColorUtil
.Color_2_177_136),
backgroundColor: ColorUtil
.Color_255_255_255,
direction: Axis.vertical,
shapePath: ViewSvgPath
.getMicrpphonePath()),
)
: Image.asset(
'assets/images/meeting_main_sqfy.png',
width: 20.w,
height: 20.h,
),
SizedBox(height: 4.h),
Text(
state.isSpeak.value == false state.isSpeak.value == false
? Image.asset( ? '申请发言'
state.isSpeak.value == false : state.isOpenMicrophone.value ==
? 'assets/images/meeting_main_sqfy.png' true
: state.isOpenMicrophone ? "手动静音"
.value == : "解除静音",
true style: TextStyle(
? 'assets/images/meeting_main_microphone_default.png' fontSize: 12.sp,
: 'assets/images/meeting_main_sqfy.png', color: ColorUtil.Color_202_202_202),
width: 20.w, )
height: 20.h, ],
)
: state.isOpenMicrophone.value == true
? Container(
width: 20.w,
height: 20.h,
child: LiquidCustomProgressIndicator(
value: state
.microphoneVolume
.value,
valueColor:
const AlwaysStoppedAnimation(
ColorUtil
.Color_2_177_136),
backgroundColor: ColorUtil
.Color_255_255_255,
direction: Axis.vertical,
shapePath: ViewSvgPath
.getMicrpphonePath()),
)
: Image.asset(
'assets/images/meeting_main_sqfy.png',
width: 20.w,
height: 20.h,
),
SizedBox(height: 4.h),
Text(
state.isSpeak.value == false
? '申请发言'
: state.isOpenMicrophone.value ==
true
? "手动静音"
: "解除静音",
style: TextStyle(
fontSize: 12.sp,
color: ColorUtil.Color_202_202_202),
)
],
),
), ),
onTap: () { onTap: () {
if (state.isSpeak.value == false) { if (state.isSpeak.value == false) {
@ -502,35 +471,31 @@ class MeetingMainPageState extends State<MeetingMainPage> {
/// 视频 /// 视频
GestureDetector( GestureDetector(
child: Container( child: Column(
padding: const EdgeInsets.only(left: 6,right: 6), mainAxisAlignment: MainAxisAlignment.center,
color: ColorUtil.Color_0_0_0_0, children: [
child: Column( Image.asset(
mainAxisAlignment: MainAxisAlignment.center, state.isSpeak.value == true
children: [ ? state.isOpenCamera.value == true
Image.asset( ? 'assets/images/meeting_main_camera_open.png'
state.isSpeak.value == true : 'assets/images/meeting_main_camera_default.png'
? state.isOpenCamera.value == true : 'assets/images/meeting_main_sp.png',
? 'assets/images/meeting_main_camera_open.png' width: 22.w,
: 'assets/images/meeting_main_camera_default.png' height: 22.h,
: 'assets/images/meeting_main_sp.png', ),
width: 22.w, SizedBox(height: 4.h),
height: 22.h, Text(
), /*state.isSpeak.value == false
SizedBox(height: 4.h),
Text(
/*state.isSpeak.value == false
? '申请发言' ? '申请发言'
: */ : */
state.isOpenCamera.value == true state.isOpenCamera.value == true
? "关闭视频" ? "关闭视频"
: "开启视频", : "开启视频",
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
color: ColorUtil.Color_202_202_202), color: ColorUtil.Color_202_202_202),
) )
], ],
),
), ),
onTap: () { onTap: () {
if (state.isSpeak.value == false) { if (state.isSpeak.value == false) {
@ -584,26 +549,22 @@ class MeetingMainPageState extends State<MeetingMainPage> {
/// 成员 /// 成员
GestureDetector( GestureDetector(
child: Container( child: Column(
padding: const EdgeInsets.only(left: 6,right: 6), mainAxisAlignment: MainAxisAlignment.center,
color: ColorUtil.Color_0_0_0_0, children: [
child: Column( Image.asset(
mainAxisAlignment: MainAxisAlignment.center, 'assets/images/meeting_main_member_default.png',
children: [ width: 22.w,
Image.asset( height: 22.h,
'assets/images/meeting_main_member_default.png', ),
width: 22.w, SizedBox(height: 4.h),
height: 22.h, Text(
), ' 成员 ',
SizedBox(height: 4.h), style: TextStyle(
Text( fontSize: 12.sp,
' 成员 ', color: ColorUtil.Color_202_202_202),
style: TextStyle( )
fontSize: 12.sp, ],
color: ColorUtil.Color_202_202_202),
)
],
),
), ),
onTap: () { onTap: () {
Get.bottomSheet( Get.bottomSheet(
@ -1665,7 +1626,7 @@ class MeetingMainPageState extends State<MeetingMainPage> {
return Stack( return Stack(
alignment: Alignment.center, alignment: Alignment.center,
children: [ children: [
state.remoteAssistantUid.value != "" state.remoteUid.value != ""
? AgoraVideoView( ? AgoraVideoView(
controller: VideoViewController( controller: VideoViewController(
rtcEngine: state.rctEngine.value!, rtcEngine: state.rctEngine.value!,
@ -1747,148 +1708,139 @@ class MeetingMainPageState extends State<MeetingMainPage> {
crossAxisCount: 2, childAspectRatio: 0.8, crossAxisSpacing: 0), crossAxisCount: 2, childAspectRatio: 0.8, crossAxisSpacing: 0),
itemCount: state.cacheUsers.value.length, itemCount: state.cacheUsers.value.length,
itemBuilder: (BuildContext ctx, index) { itemBuilder: (BuildContext ctx, index) {
return GestureDetector( return Stack(
child: Stack( children: [
children: [ state.cacheUsers.value[index].enableCamera == true
state.cacheUsers.value[index].enableCamera == true ? state.cacheUsers.value[index].uid ==
? state.cacheUsers.value[index].uid == UserStore.to.userInfoEntity.value!.uid
UserStore.to.userInfoEntity.value!.uid ? AgoraVideoView(
? AgoraVideoView( controller: VideoViewController(
controller: VideoViewController( rtcEngine: state.rctEngine.value!,
rtcEngine: state.rctEngine.value!, canvas: const VideoCanvas(
canvas: const VideoCanvas( uid: 0,
uid: 0, setupMode: VideoViewSetupMode
setupMode: VideoViewSetupMode .videoViewSetupAdd)),
.videoViewSetupAdd)),
)
: AgoraVideoView(
controller: VideoViewController.remote(
rtcEngine: state.rctEngine.value!,
canvas: VideoCanvas(
uid: int.tryParse(
state.cacheUsers.value[index].uid),
setupMode:
VideoViewSetupMode.videoViewSetupAdd),
connection: RtcConnection(
channelId: state.roomNumber.value),
),
)
: Container(
color: ColorUtil.Color_16_19_13,
child: SizedBox(
width: double.infinity,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Image.asset(
'assets/images/metting_main_no_person.png',
width: 78.w,
height: 84.h,
),
const SizedBox(height: 12),
Text(
'该用户未开启摄像头...',
style: TextStyle(
color: ColorUtil.Color_255_255_255,
fontSize: 10.sp),
) )
], : AgoraVideoView(
), controller: VideoViewController.remote(
), rtcEngine: state.rctEngine.value!,
), canvas: VideoCanvas(
Positioned( uid: int.tryParse(
left: 4, state.cacheUsers.value[index].uid),
bottom: 4, setupMode:
child: Row( VideoViewSetupMode.videoViewSetupAdd),
children: [ connection: RtcConnection(
Visibility( channelId: state.roomNumber.value),
visible: state.cacheUsers.value[index].uid == ),
UserStore.to.userInfoEntity.value!.uid,
child: Image.asset(
'assets/images/meeting_main_own.png',
width: 24.w,
height: 24.h,
),
),
Container(
height: 20,
margin: const EdgeInsets.only(left: 4),
padding: const EdgeInsets.only(left: 4, right: 4),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(2),
color: ColorUtil.Color_0_0_0_96),
child: state.cacheUsers.value[index].enableMicr ==
true
? Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
width: 20.w,
height: 20.h,
child: LiquidCustomProgressIndicator(
value: state.cacheUsers.value[index]
.volume ??
0.0,
valueColor:
const AlwaysStoppedAnimation(
ColorUtil.Color_2_177_136),
backgroundColor:
ColorUtil.Color_255_255_255,
direction: Axis.vertical,
shapePath:
ViewSvgPath.getMicrpphonePath()),
),
SizedBox(
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( : Container(
color: ColorUtil.Color_16_19_13,
child: SizedBox(
width: double.infinity,
child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Image.asset( Image.asset(
'assets/images/meeting_main_microphone_open.png', 'assets/images/metting_main_no_person.png',
width: 20.w, width: 78.w,
height: 20.h, height: 84.h,
), ),
SizedBox( const SizedBox(height: 12),
width: 70, Text(
child: Text( '该用户未开启摄像头...',
state style: TextStyle(
.cacheUsers.value[index].userName, color: ColorUtil.Color_255_255_255,
maxLines: 1, fontSize: 10.sp),
overflow: TextOverflow.ellipsis, )
style: TextStyle(
fontSize: 12.sp,
color:
ColorUtil.Color_255_255_255),
))
], ],
), ),
) ),
], ),
), Positioned(
) left: 4,
], bottom: 4,
), child: Row(
onTap: (){ children: [
if(state.cacheUsers.value[index].enableCamera == true){ Visibility(
logic.checkLargeScreen(state.cacheUsers.value[index].uid); visible: state.cacheUsers.value[index].uid ==
}else{ UserStore.to.userInfoEntity.value!.uid,
ToastUtils.showError("该用户暂未开启摄像头"); child: Image.asset(
} 'assets/images/meeting_main_own.png',
}, width: 24.w,
height: 24.h,
),
),
Container(
height: 20,
margin: const EdgeInsets.only(left: 4),
padding: const EdgeInsets.only(left: 4, right: 4),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(2),
color: ColorUtil.Color_0_0_0_96),
child: state.cacheUsers.value[index].enableMicr ==
true
? Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
width: 20.w,
height: 20.h,
child: LiquidCustomProgressIndicator(
value: state.cacheUsers.value[index]
.volume ??
0.0,
valueColor:
const AlwaysStoppedAnimation(
ColorUtil.Color_2_177_136),
backgroundColor:
ColorUtil.Color_255_255_255,
direction: Axis.vertical,
shapePath:
ViewSvgPath.getMicrpphonePath()),
),
SizedBox(
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(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Image.asset(
'assets/images/meeting_main_microphone_open.png',
width: 20.w,
height: 20.h,
),
SizedBox(
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),
))
],
),
)
],
),
)
],
); );
}), }),
); );

6
wgshare/lib/pages/userPage/user_logic.dart
View File

@ -7,4 +7,10 @@ import 'user_state.dart';
class UserLogic extends GetxController with RequestToolMixin { class UserLogic extends GetxController with RequestToolMixin {
final UserState state = UserState(); final UserState state = UserState();
/// 退出登录
void logout(){
UserStore.to.erase();
Get.toNamed(Routes.loginPage);
}
} }

2
wgshare/macos/Flutter/GeneratedPluginRegistrant.swift
View File

@ -17,7 +17,6 @@ import macos_window_utils
import package_info_plus import package_info_plus
import path_provider_foundation import path_provider_foundation
import sqflite_darwin import sqflite_darwin
import wakelock_plus
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
AgoraRtcNgPlugin.register(with: registry.registrar(forPlugin: "AgoraRtcNgPlugin")) AgoraRtcNgPlugin.register(with: registry.registrar(forPlugin: "AgoraRtcNgPlugin"))
@ -32,5 +31,4 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin")) SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin"))
} }

538
wgshare/pubspec.lock
View File

File diff suppressed because it is too large Load Diff

3
wgshare/pubspec.yaml
View File

@ -101,9 +101,6 @@ dependencies:
# 后台下载 # 后台下载
al_downloader: ^1.8.2 al_downloader: ^1.8.2
# 屏幕常亮
wakelock_plus: ^1.2.10
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:
sdk: flutter sdk: flutter