moliparty/peko-ios
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修正部分问题

Browse Source
This commit is contained in:
eggmanQQQ
2024-10-17 16:05:02 +08:00
parent e72f39ffde
commit c9cacb388b
17 changed files with 104 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
YuMi/Modules/YMRoom/View/XPRoomViewController.m
View File

@@ -296,12 +296,15 @@ XPCandyTreeInsufficientBalanceViewDelegate>
[XPSkillCardPlayerManager shareInstance].isInRoomFirstRecharge = NO;
[XPSkillCardPlayerManager shareInstance].isInRoom = NO;
[XPSkillCardPlayerManager shareInstance].roomUid = @"";
if([[XPRoomMiniManager shareManager] getRoomInfo]==nil){
[XPSkillCardPlayerManager shareInstance].isMineInMic = NO;
}
[[CountDownHelper shareHelper] stopCountDown];
[CountDownHelper shareHelper].delegate = nil;
[[NIMSDK sharedSDK].chatroomManager removeDelegate:self];
[[NIMSDK sharedSDK].chatManager removeDelegate:self];
[[NIMSDK sharedSDK].loginManager removeDelegate:self];
@@ -370,6 +373,7 @@ XPCandyTreeInsufficientBalanceViewDelegate>
}];
});
[self.presenter getBoomDetail:self.roomUid];
} target:self];
[[RoomBoomManager sharedManager] registerBoomGiftDisplay:^(id _Nonnull sth) {
@@ -734,13 +738,18 @@ XPCandyTreeInsufficientBalanceViewDelegate>
- (void)exitOldRoom {
NSString * roomUid = [NSString stringWithFormat:@"%ld", [XPRoomMiniManager shareManager].getRoomInfo.uid];
if (roomUid.integerValue > 0 && roomUid.integerValue != self.roomUid.integerValue) {
//有最小化房间 并且要进入的房间和最小化的房间不一样的话 就先退掉 最小化的房间
NSString * roomId = [NSString stringWithFormat:@"%ld", [XPRoomMiniManager shareManager].getRoomInfo.roomId];
[self.presenter exitNIMRoom:roomId];
[[RtcManager instance] exitRoom];
[[XPRoomMiniManager shareManager] resetLocalMessage];
[self.presenter reportUserOutRoom:roomUid];
if (roomUid.integerValue > 0) {
if ([roomUid isEqualToString:self.roomUid]) {
self.isMiniEnter = YES;
} else {
//有最小化房间 并且要进入的房间和最小化的房间不一样的话 就先退掉 最小化的房间
NSString * roomId = [NSString stringWithFormat:@"%ld", [XPRoomMiniManager shareManager].getRoomInfo.roomId];
[self.presenter exitNIMRoom:roomId];
[[RtcManager instance] exitRoom];
[[XPRoomMiniManager shareManager] resetLocalMessage];
[self.presenter reportUserOutRoom:roomUid];
[XPSkillCardPlayerManager shareInstance].micState = MICState_None;
}
}
}
-(BOOL)getIsMiniEnter{
@@ -1136,20 +1145,21 @@ XPCandyTreeInsufficientBalanceViewDelegate>
[self changeStageViewOnRoomUpdate];
[self.roomHeaderView onRoomEntered];
[self.activityContainerView onRoomEntered];
[self.menuContainerView onRoomEntered];
[self.backContainerView onRoomEntered];
[self.littleGameView onRoomEntered];
if ([XPRoomMiniManager shareManager].getRoomInfo.uid != self.roomUid.integerValue) {// 最小化进房 还是原来的房间的话 不需要重新进入云信 因为压根没退
[self.presenter enterNIMRoom:[NSString stringWithFormat:@"%ld", self.roomInfo.roomId] user:self.userInfo];
[self.functionView onRoomEntered];
[self.messageContainerView onRoomEntered];
[self.menuContainerView onRoomEntered];
} else {
//虽然没退出房间 但是队列还是要拿的
[self.stageView onRoomMiniEntered];
[self.messageContainerView onRoomMiniEntered];
[self.functionView onRoomMiniEntered];
[self.functionView onRoomEntered];
[[RtcManager instance] setLocalMuted:YES];
[self.menuContainerView onRoomMiniEntered];
}
[[XPRoomMiniManager shareManager] configRoomInfo:nil];
[[XPRoomMiniManager shareManager] configUserInfo:nil];
@@ -1207,20 +1217,21 @@ XPCandyTreeInsufficientBalanceViewDelegate>
[self.roomHeaderView onRoomEntered];
[self.activityContainerView onRoomEntered];
[self.menuContainerView onRoomEntered];
[self.backContainerView onRoomEntered];
[self.littleGameView onRoomEntered];
if ([XPRoomMiniManager shareManager].getRoomInfo.uid != self.roomUid.integerValue) {// 最小化进房 还是原来的房间的话 不需要重新进入云信 因为压根没退
[self.presenter enterNIMRoom:[NSString stringWithFormat:@"%ld", self.roomInfo.roomId] user:self.userInfo];
[self.functionView onRoomEntered];
[self.messageContainerView onRoomEntered];
[self.menuContainerView onRoomEntered];
} else {
//虽然没退出房间 但是队列还是要拿的
[self.stageView onRoomMiniEntered];
[self.messageContainerView onRoomMiniEntered];
[self.functionView onRoomMiniEntered];
[self.functionView onRoomEntered];
[[RtcManager instance] setLocalMuted:YES];
[self.menuContainerView onRoomMiniEntered];
}
[[XPRoomMiniManager shareManager] configRoomInfo:nil];
[[XPRoomMiniManager shareManager] configUserInfo:nil];
@@ -1289,7 +1300,7 @@ XPCandyTreeInsufficientBalanceViewDelegate>
[self.roomHeaderView onRoomEntered];
[self.activityContainerView onRoomEntered];
[self.menuContainerView onRoomEntered];
[self.backContainerView onRoomEntered];
[self.littleGameView onRoomEntered];
@@ -1298,6 +1309,7 @@ XPCandyTreeInsufficientBalanceViewDelegate>
if ([XPRoomMiniManager shareManager].getRoomInfo.uid != self.roomUid.integerValue) {
[self.functionView onRoomEntered];
[self.messageContainerView onRoomEntered];
[self.menuContainerView onRoomEntered];
// 通知云信重新进房
[self.presenter enterNIMRoom:@(self.roomInfo.roomId).stringValue
@@ -1308,16 +1320,15 @@ XPCandyTreeInsufficientBalanceViewDelegate>
[self.functionView onRoomMiniEntered];
[self.functionView onRoomEntered];
// PK 状态下，从最小化进房需要模仿出事化房间，丢 2 次 roominfo 进去 functionView
// [self.menuContainerView onRoomMiniEntered];
// PK 状态下，从最小化进房需要模仿初始化房间，丢 2 次 roominfo 进去 functionView
if (self.roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode ||
self.roomInfo.roomModeType == RoomModeType_Open_PK_Mode) {
[self.functionView onRoomEntered];
}
[self.messageContainerView onRoomMiniEntered];
[[RtcManager instance] setLocalMuted:YES];
}
[self cleanMiniRoomStatues];
}
@@ -1402,6 +1413,8 @@ XPCandyTreeInsufficientBalanceViewDelegate>
} }
break;
}
[self.menuContainerView recheckMicState];
}
- (void)openRoomSuccess:(RoomInfoModel *)roomInfo {
@@ -1599,20 +1612,21 @@ XPCandyTreeInsufficientBalanceViewDelegate>
[self.roomHeaderView onRoomEntered];
[self.activityContainerView onRoomEntered];
[self.menuContainerView onRoomEntered];
[self.backContainerView onRoomEntered];
[self.littleGameView onRoomEntered];
if ([XPRoomMiniManager shareManager].getRoomInfo.uid != self.roomUid.integerValue) {// 最小化进房 还是原来的房间的话 不需要重新进入云信 因为压根没退
[self.presenter enterNIMRoom:[NSString stringWithFormat:@"%ld", self.roomInfo.roomId] user:self.userInfo];
[self.functionView onRoomEntered];
[self.messageContainerView onRoomEntered];
[self.menuContainerView onRoomEntered];
} else {
//虽然没退出房间 但是队列还是要拿的
[self.stageView onRoomMiniEntered];
[self.messageContainerView onRoomMiniEntered];
[self.functionView onRoomMiniEntered];
[self.functionView onRoomEntered];
[[RtcManager instance] setLocalMuted:YES];
[self.menuContainerView onRoomMiniEntered];
}
[self cleanMiniRoomStatues];
@@ -2208,6 +2222,8 @@ XPCandyTreeInsufficientBalanceViewDelegate>
}
- (void)exitRoom {
[XPSkillCardPlayerManager shareInstance].micState = MICState_None;
[self.stageView exitRoom];
[self.menuContainerView menuResignFirstResponder];
[self.animationView resumeTimer];
@@ -2326,8 +2342,6 @@ XPCandyTreeInsufficientBalanceViewDelegate>
[XPRoomMiniManager shareManager].curState = self.freeModel.curStage;
}
[[XPRoomMiniManager shareManager] saveMicState:[self.menuContainerView micState]];
[self.menuContainerView menuResignFirstResponder];
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(showRoomFirstChargeWindow) object:nil];
NSDictionary *roomInfoDic = self.roomInfo.model2dictionary != nil ? self.roomInfo.model2dictionary : @{};
@@ -2509,7 +2523,7 @@ XPCandyTreeInsufficientBalanceViewDelegate>
[self.roomHeaderView onRoomEntered];
[self.activityContainerView onRoomEntered];
[self.menuContainerView onRoomEntered];
[self.backContainerView onRoomEntered];
[self.littleGameView onRoomEntered];
[self.littleGameView onRoomEntered];
@@ -2517,13 +2531,14 @@ XPCandyTreeInsufficientBalanceViewDelegate>
[self.presenter enterNIMRoom:[NSString stringWithFormat:@"%ld", self.roomInfo.roomId] user:self.userInfo];
[self.functionView onRoomEntered];
[self.messageContainerView onRoomEntered];
[self.menuContainerView onRoomEntered];
} else {
//虽然没退出房间 但是队列还是要拿的
[self.stageView onRoomMiniEntered];
[self.messageContainerView onRoomMiniEntered];
[self.functionView onRoomMiniEntered];
[self.functionView onRoomEntered];
[[RtcManager instance] setLocalMuted:YES];
[self.menuContainerView onRoomMiniEntered];
}
[[XPRoomMiniManager shareManager] configRoomInfo:nil];
[[XPRoomMiniManager shareManager] configUserInfo:nil];