diff --git a/xplan-ios/Main/Room/View/StageView/AnchorStageView.m b/xplan-ios/Main/Room/View/StageView/AnchorStageView.m index 06c78021..966f2682 100644 --- a/xplan-ios/Main/Room/View/StageView/AnchorStageView.m +++ b/xplan-ios/Main/Room/View/StageView/AnchorStageView.m @@ -35,7 +35,7 @@ #define mcWidth (40 + 5) #define mcHeight (mcWidth + 6 + 12) // 底部3 个坑位顶部距房主坑位距离 padding 30 -#define paddingH 28 +#define paddingH 35 // 下边坑位的左右间距 #define marginW 50 @@ -72,7 +72,7 @@ } - (CGFloat)hightForStageView { - return 306; + return topMargin + ownerHeight + paddingH + mcHeight + 10; } - (CGPoint)animationPointAtStageViewByUid:(NSString *)uid { diff --git a/xplan-ios/Main/Room/View/StageView/MicroView/Anchor/AnchorPKMicroView.m b/xplan-ios/Main/Room/View/StageView/MicroView/Anchor/AnchorPKMicroView.m index 1f0dd8df..0ffa45c8 100644 --- a/xplan-ios/Main/Room/View/StageView/MicroView/Anchor/AnchorPKMicroView.m +++ b/xplan-ios/Main/Room/View/StageView/MicroView/Anchor/AnchorPKMicroView.m @@ -41,6 +41,11 @@ #pragma mark - MicroViewProtocol - (void)showGiftValueMode:(BOOL)isGiftValue { self.giftValueView.hidden = YES; + if (self.position != -1) { + self.giftValueView.hidden = YES; + } else { + self.giftValueView.hidden = !isGiftValue; + } } ///重写父类方法,个播房默认一直为离开模式,不在此处处理离开模式蒙层 @@ -114,6 +119,15 @@ - (void)configUser:(UserInfoModel *)userInfo { [super configUser:userInfo]; self.sexImageView.hidden = YES; + if (self.position == -1) { + [self.giftValueView removeFromSuperview]; + } + [self addSubview:self.giftValueView]; + [self.giftValueView mas_makeConstraints:^(MASConstraintMaker *make) { + make.height.mas_equalTo(16); + make.top.mas_equalTo(self.stackView.mas_bottom).mas_offset(10); + make.centerX.mas_equalTo(self.avatarImageView); + }]; } #pragma mark - getter diff --git a/xplan-ios/Main/Room/View/StageView/MicroView/MicroView.m b/xplan-ios/Main/Room/View/StageView/MicroView/MicroView.m index bae3b99a..28c22a78 100644 --- a/xplan-ios/Main/Room/View/StageView/MicroView/MicroView.m +++ b/xplan-ios/Main/Room/View/StageView/MicroView/MicroView.m @@ -451,7 +451,11 @@ if (self.userInfo && self.userInfo.uid > 0) { XPWebViewController * webVC = [[XPWebViewController alloc] init]; webVC.roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; - webVC.url = [NSString stringWithFormat:@"%@?uid=%ld", URLWithType(kRoomCharmRankURL), self.microModel.userInfo.uid]; + if (self.roomInfo.leaveMode && self.userInfo.uid == self.roomInfo.uid) { ///离开模式 + webVC.url = [NSString stringWithFormat:@"%@?uid=%ld", URLWithType(kRoomCharmRankURL), self.microModel.userInfo.uid ? self.microModel.userInfo.uid : self.roomInfo.uid]; + } else { + webVC.url = [NSString stringWithFormat:@"%@?uid=%ld", URLWithType(kRoomCharmRankURL), self.microModel.userInfo.uid]; + } [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:webVC animated:YES]; } } diff --git a/xplan-ios/Main/Room/View/StageView/StageView.m b/xplan-ios/Main/Room/View/StageView/StageView.m index 1a8e7e8f..51757c1f 100644 --- a/xplan-ios/Main/Room/View/StageView/StageView.m +++ b/xplan-ios/Main/Room/View/StageView/StageView.m @@ -192,7 +192,13 @@ [view configMicQueue:self.micQueue]; [view configMicroView:model]; [view showLeaveMode:i == 0 && leaveMode]; - if (model.userInfo == nil || !roomInfo.showGiftValue) [view resetGiftValue]; + if (leaveMode && i == 0) { + if (!roomInfo.showGiftValue) {//离开模式,大头位在隐藏礼物值时才重设礼物值 + [view resetGiftValue]; + } + } else { + if (model.userInfo == nil || !roomInfo.showGiftValue) [view resetGiftValue]; + } [view showGiftValueMode:roomInfo.showGiftValue]; if (self.hostDelegate.getUserInfo.uid && model.userInfo.uid == self.hostDelegate.getUserInfo.uid) { selfNeedBroadcast = model.microState.micState == MicroMicStateType_Open; @@ -292,6 +298,7 @@ } microQueueChanged = YES; } + [self initGiftValue]; } break;