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

送礼物全服横幅不显示房主id的问题

Browse Source
This commit is contained in:
fengshuo
2022-06-21 16:19:46 +08:00
parent a8d6812cc1
commit 23f4b1177b
3 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xplan-ios/Main/Room/View/AnimationView/Model/XPRoomGiftBroadCastModel.h
View File

@@ -39,6 +39,8 @@ typedef NS_ENUM(NSInteger, BroadCastLevel) {
@property (nonatomic, copy) NSString *sendUserNick; @property (nonatomic, copy) NSString *sendUserNick;
///跳转的房间的uid ///跳转的房间的uid
@property (nonatomic,assign) NSInteger roomUid; @property (nonatomic,assign) NSInteger roomUid;
///平台id
@property (nonatomic,copy) NSString *roomErbanNo;
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END

22
xplan-ios/Main/Room/View/AnimationView/XPRoomGiftBroadcastView.m
View File

@@ -118,6 +118,8 @@
@property (nonatomic,strong) UILabel *countLabel; @property (nonatomic,strong) UILabel *countLabel;
///关闭 ///关闭
@property (nonatomic,strong) UIButton *closeButton; @property (nonatomic,strong) UIButton *closeButton;
///房间iD
@property (nonatomic,strong) UILabel *roomIdLabel;
@end @end
@implementation XPRoomGiftBroadcastView @implementation XPRoomGiftBroadcastView
@@ -155,6 +157,7 @@
[self.backImageView addSubview:self.receiveView]; [self.backImageView addSubview:self.receiveView];
[self.backImageView addSubview:self.giftImageView]; [self.backImageView addSubview:self.giftImageView];
[self.backImageView addSubview:self.countLabel]; [self.backImageView addSubview:self.countLabel];
[self.backImageView addSubview:self.roomIdLabel];
} }
- (void)initSubViewConstraints { - (void)initSubViewConstraints {
@@ -200,6 +203,11 @@
make.top.mas_equalTo(13); make.top.mas_equalTo(13);
make.size.mas_equalTo(CGSizeMake(28, 22)); make.size.mas_equalTo(CGSizeMake(28, 22));
}]; }];
[self.roomIdLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self.backImageView);
make.top.mas_equalTo(self.backImageView).offset(10);
}];
} }
- (void)initEvents { - (void)initEvents {
@@ -226,6 +234,7 @@
nickBackImageName = @"room_gift_broadcast_normal_nick_bg"; nickBackImageName = @"room_gift_broadcast_normal_nick_bg";
nickColor = [ThemeColor mainTextColor]; nickColor = [ThemeColor mainTextColor];
bgImageName = @"room_gift_broadcast_low_bg"; bgImageName = @"room_gift_broadcast_low_bg";
self.roomIdLabel.hidden = YES;
} }
break; break;
case BroadCastLevel_Middle: case BroadCastLevel_Middle:
@@ -243,6 +252,7 @@
nickBackImageName = @"room_gift_broadcast_higher_nick_bg"; nickBackImageName = @"room_gift_broadcast_higher_nick_bg";
nickColor = [ThemeColor giftBroadcastNickColor]; nickColor = [ThemeColor giftBroadcastNickColor];
bgImageName = @"room_gift_broadcast_middle_bg"; bgImageName = @"room_gift_broadcast_middle_bg";
self.roomIdLabel.hidden = YES;
} }
break; break;
case BroadCastLevel_High: case BroadCastLevel_High:
@@ -260,6 +270,7 @@
nickBackImageName = @"room_gift_broadcast_higher_nick_bg"; nickBackImageName = @"room_gift_broadcast_higher_nick_bg";
nickColor = [ThemeColor giftBroadcastNickColor]; nickColor = [ThemeColor giftBroadcastNickColor];
bgImageName = @"room_gift_broadcast_high_bg"; bgImageName = @"room_gift_broadcast_high_bg";
self.roomIdLabel.hidden = NO;
} }
break; break;
default: default:
@@ -298,7 +309,7 @@
self.giftImageView.imageUrl = broadcastModel.giftUrl; self.giftImageView.imageUrl = broadcastModel.giftUrl;
self.countLabel.text = [NSString stringWithFormat:@"x%ld", broadcastModel.giftNum]; self.countLabel.text = [NSString stringWithFormat:@"x%ld", broadcastModel.giftNum];
self.roomIdLabel.text = [NSString stringWithFormat:@"ID:%@", broadcastModel.roomErbanNo];
[self updateSubviews:broadcastModel.levelNum]; [self updateSubviews:broadcastModel.levelNum];
} }
} }
@@ -363,5 +374,14 @@
} }
- (UILabel *)roomIdLabel {
if (!_roomIdLabel) {
_roomIdLabel = [[UILabel alloc] init];
_roomIdLabel.font = [UIFont systemFontOfSize:12];
_roomIdLabel.textColor = [ThemeColor giftBroadcastNickColor];
}
return _roomIdLabel;
}
@end @end

2
xplan-ios/Main/Room/View/ThemeColor+Room.m
View File

@@ -77,7 +77,7 @@
///礼物广播 显示的名字的颜色 #2F0060 ///礼物广播 显示的名字的颜色 #2F0060
+ (UIColor *)giftBroadcastNickColor { + (UIColor *)giftBroadcastNickColor {
return UIColorFromRGB(0x2F0060); return UIColorFromRGB(0xFFFFFF);
} }
///礼物广播显示 个数的颜色 #FEF563 ///礼物广播显示 个数的颜色 #FEF563