Compare commits

..

No commits in common. "9e9528685508ac467ed9fcccb0b649076400b40e" and "85a475b19b06624e262328bd0e82f0360bb00f16" have entirely different histories.

4 changed files with 5 additions and 37 deletions

View File

@ -42,12 +42,6 @@ abstract class RetrofitClient {
@Path("roomNum") String roomNum, @Path("roomNum") String roomNum,
); );
///
@GET("/room/checkout")
Future<BaseStructureResult<bool>> checkout(
@Query("roomNum") String roomNum,
);
/// ///
@GET("/room/user") @GET("/room/user")
Future<BaseStructureResult<List<MeetingRoomUser>>> getMeetingRoomAllUser( Future<BaseStructureResult<List<MeetingRoomUser>>> getMeetingRoomAllUser(

View File

@ -87,26 +87,4 @@ class LoginLogic extends GetxController with RequestToolMixin {
} }
} }
} }
///
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("房间不存在");
}
}
}
}
} }

View File

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

View File

@ -55,8 +55,6 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
if (isInit == true) { if (isInit == true) {
signalRSocket(); signalRSocket();
}else{
initRtc();
} }
} }
@ -99,7 +97,6 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
/// ///
void getMeetingRoomInfo(MeetingRoomInfo meetingRoomInfo) async { void getMeetingRoomInfo(MeetingRoomInfo meetingRoomInfo) async {
state.meetingRoomInfo.value = meetingRoomInfo; state.meetingRoomInfo.value = meetingRoomInfo;
initRtc();
startTime(); startTime();
} }
@ -640,13 +637,11 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
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, false, false, false]); args: [state.roomNumber.value, false, false, false]);
mergeFetch(isAgain); if(isAgain == false){
/*if(isAgain == false){
mergeFetch(isAgain);
initRtc(false); initRtc(false);
}else{ }else{
mergeFetch(true); mergeFetch(true);
}*/ }
} }
/// ///
@ -677,7 +672,7 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
/// ------------------------------------------------------------------------------SDK相关 /// ------------------------------------------------------------------------------SDK相关
/// SDK /// SDK
Future<void> initRtc() async { Future<void> initRtc(bool isAgain) async {
// //
PermissionService.requestPermissions(); PermissionService.requestPermissions();
@ -711,6 +706,7 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
// //
onJoinChannelSuccess: (RtcConnection connection, int elapsed) { onJoinChannelSuccess: (RtcConnection connection, int elapsed) {
state.isJoinSuccess.value = true; state.isJoinSuccess.value = true;
mergeFetch(isAgain);
debugPrint("wgs输出===RTC-自己加入会议室ID${connection.localUid}"); debugPrint("wgs输出===RTC-自己加入会议室ID${connection.localUid}");
}, },