yinmeng/yinmeng-ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

个播PK面板大小修改

Browse Source
This commit is contained in:
chenguilong
2022-04-15 18:32:20 +08:00
parent 6b434219c2
commit adb4420b2b
3 changed files with 5 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xplan-ios/Main/Room/View/AnchorPK/View/SubViews/XPAnchorPkPanelView.m
View File

@@ -181,7 +181,7 @@
- (void)initSubViewConstraints {
[self mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(KScreenWidth);
make.height.mas_equalTo(330);
make.height.mas_equalTo(330 - 87);
}];
[self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -271,7 +271,7 @@
///对方信息
[self.otherAvatarImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo((KScreenWidth + 64) * 0.5 + 26 - 2.5);
make.top.mas_equalTo(87);
make.top.mas_equalTo(0);
make.width.height.mas_equalTo(90);
}];
[self.otherResultImageView mas_makeConstraints:^(MASConstraintMaker *make) {

6
xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m
View File

@@ -338,7 +338,7 @@
[self addSubview:self.anchorPKPanelView];
[self.anchorPKPanelView mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self);
make.top.mas_equalTo(kNavigationHeight);
make.top.mas_equalTo(kNavigationHeight + 87);
}];
}
self.anchorPKPanelView.pkPanelInfo = acrossPKPanelInfo;
@@ -583,7 +583,7 @@
[self addSubview:self.anchorPKPanelView];
[self.anchorPKPanelView mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self);
make.top.mas_equalTo(kNavigationHeight);
make.top.mas_equalTo(kNavigationHeight + 87);
}];
}
AcrossRoomPKPanelModel * acrossPKPanelInfo = [AcrossRoomPKPanelModel modelWithJSON:attachment.data];
@@ -596,7 +596,7 @@
[self addSubview:self.anchorPKPanelView];
[self.anchorPKPanelView mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self);
make.top.mas_equalTo(kNavigationHeight);
make.top.mas_equalTo(kNavigationHeight + 87);
}];
}
AcrossRoomPKPanelModel * acrossPKPanelInfo = [AcrossRoomPKPanelModel modelWithJSON:attachment.data];

30
xplan-ios/Main/Room/View/StageView/AnchorPKStageView.m
View File

@@ -144,36 +144,6 @@
NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject;
NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content;
switch (content.eventType) {
case NIMChatroomEventTypeInfoUpdated: // 麦序状态更新
{
NSDictionary *data = [content.notifyExt toJSONObject];
int type = [data[@"type"] intValue];
NSArray* microStates;
switch (type) {
case 2:
microStates = @[[MicroStateModel modelWithJSON:data[@"micInfo"]]];
break;
case 3:
microStates = [MicroStateModel modelsWithArray:data[@"micInfo"]];
break;
}
BOOL selfNeedBroadcast = NO;
if (microStates && microStates.count > 0) {
for (MicroStateModel *microState in microStates) {
MicroQueueModel *micSequence = [self.getMicroQueue objectForKey:[NSString stringWithFormat:@"%d", microState.position]];
micSequence.microState = microState;
if (micSequence.userInfo.uid == [AccountInfoStorage instance].getUid.integerValue && micSequence.microState.micState == MicroMicStateType_Open) {
selfNeedBroadcast = YES;
}
}
if (selfNeedBroadcast) {
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{//延迟1s，等待rtc角色变为主播才可发起跨房通话
[[RtcManager instance] connectOtherRoom:self.hostDelegate.getRoomInfo.pkRoomId userId:self.hostDelegate.getRoomInfo.pkUid];
});
}
}
}
break;
case NIMChatroomEventTypeQueueChange: // 麦序上下麦
{
NSDictionary* data = (NSDictionary *)content.ext;