MIDI/midi_ios
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改完成

Browse Source
This commit is contained in:
启星
2025-09-11 18:25:41 +08:00
parent 349cab1499
commit 35709d4e8e
67 changed files with 1344 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
QXLive/HomePage(声播)/Controlller/房间/QXRoomViewController.m
View File

@@ -278,7 +278,6 @@ QXRoomUserInfoViewDelegate
}
-(void)resetSubviews{
[UIApplication sharedApplication].idleTimerDisabled = NO;
if (self.roomModel.room_info.type_id.intValue != 6) {
[self.roomBgImageView sd_setImageWithURL:[NSURL URLWithString:self.roomModel.room_info.room_background]];
}else{
@@ -774,6 +773,9 @@ QXRoomUserInfoViewDelegate
-(void)roomClearCharm{
[self.seatContentView clearCharm];
}
-(void)roomClearUserCharmWithUserId:(NSString *)userId{
[self.seatContentView roomClearUserCharmWithUserId:userId];
}
/// 收到礼物设置魅力
-(void)didRecieveGiftWithWithUserInfo:(QXUserHomeModel *)userInfo{
[self.seatContentView setSeatCharmWithUser:userInfo];
@@ -1196,12 +1198,12 @@ QXRoomUserInfoViewDelegate
if (md.user_id.longValue > 0 && ![QXGlobal.shareGlobal.loginModel.user_id isEqualToString:md.user_id]) {
[pitArr addObject:md];
QXRoomPitModel *lastMd = self.roomModel.room_info.pit_list[9];
if (lastMd.user_id.longValue > 0) {
if (lastMd.user_id.longValue > 0 && ![QXGlobal.shareGlobal.loginModel.user_id isEqualToString:lastMd.user_id]) {
[pitArr addObject:lastMd];
}
}else{
QXRoomPitModel *lastMd = self.roomModel.room_info.pit_list[9];
if (lastMd.user_id.longValue > 0) {
if (lastMd.user_id.longValue > 0 && ![QXGlobal.shareGlobal.loginModel.user_id isEqualToString:lastMd.user_id]) {
[pitArr addObject:lastMd];
}
}
@@ -1224,8 +1226,11 @@ QXRoomUserInfoViewDelegate
for (int i = 0; i < self.roomModel.room_info.pit_list.count;i++) {
QXRoomPitModel *md = self.roomModel.room_info.pit_list[i];
md.isSelected = NO;
if (md.user_id.longValue > 0 && ![md.user_id isEqualToString:[QXGlobal shareGlobal].loginModel.user_id]) {
[pitArr addObject:md];
if ([self.roomModel.room_info.type_id isEqualToString:@"2"]) {
/// 拍卖房主持位和拍卖为可能为同一个人
if ([md.user_id isEqualToString:self.roomModel.room_auction.auction_user.user_id]) {
continue;
}
}
if (md.pit_number.intValue == 9) {
compereModel = md;
@@ -1234,6 +1239,9 @@ QXRoomUserInfoViewDelegate
guestModel = md;
continue;
}
if (md.user_id.longValue > 0 && ![md.user_id isEqualToString:[QXGlobal shareGlobal].loginModel.user_id]) {
[pitArr addObject:md];
}
}
}
@@ -1597,9 +1605,9 @@ QXRoomUserInfoViewDelegate
// [_sendGiftView reloadData];
MJWeakSelf
_sendGiftView.roomSendSuccessBlock = ^(QXSendGiftViewType sendType, QXGiftModel * _Nonnull giftModel, NSString * _Nonnull userId, NSString * _Nonnull optionId) {
if (self->_continuousView == nil) {
// if (self->_continuousView == nil) {
[weakSelf.view addSubview:weakSelf.continuousView];
}
// }
weakSelf.continuousView.giftModel = giftModel;
weakSelf.continuousView.sendType = sendType;
weakSelf.continuousView.userId = userId;
@@ -1624,18 +1632,21 @@ QXRoomUserInfoViewDelegate
weakSelf.skyView.giftModel = gift;
weakSelf.skyView.roomId = weakSelf.roomId;
weakSelf.skyView.userIds = userIds;
weakSelf.skyView.heartId = weakSelf.sendGiftView.heartId;
[weakSelf.sendGiftView hide];
[weakSelf.skyView showInView:weakSelf.view];
}else if(gift.gift_bag.intValue == 11) {
weakSelf.ageView.giftModel = gift;
weakSelf.ageView.roomId = weakSelf.roomId;
weakSelf.ageView.userIds = userIds;
weakSelf.ageView.heartId = weakSelf.sendGiftView.heartId;
[weakSelf.sendGiftView hide];
[weakSelf.ageView showInView:weakSelf.view];
}else if(gift.gift_bag.intValue == 12) {
weakSelf.timeView.giftModel = gift;
weakSelf.timeView.roomId = weakSelf.roomId;
weakSelf.timeView.userIds = userIds;
weakSelf.timeView.heartId = weakSelf.sendGiftView.heartId;
[weakSelf.sendGiftView hide];
[weakSelf.timeView showInView:weakSelf.view];
}