From 23f4b1177b0058bd1322cab88ef0450f21999b03 Mon Sep 17 00:00:00 2001 From: fengshuo <963787902@qq.com> Date: Tue, 21 Jun 2022 16:19:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=81=E7=A4=BC=E7=89=A9=E5=85=A8=E6=9C=8D?= =?UTF-8?q?=E6=A8=AA=E5=B9=85=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=88=BF=E4=B8=BB?= =?UTF-8?q?id=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Model/XPRoomGiftBroadCastModel.h | 2 ++ .../AnimationView/XPRoomGiftBroadcastView.m | 22 ++++++++++++++++++- xplan-ios/Main/Room/View/ThemeColor+Room.m | 2 +- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/xplan-ios/Main/Room/View/AnimationView/Model/XPRoomGiftBroadCastModel.h b/xplan-ios/Main/Room/View/AnimationView/Model/XPRoomGiftBroadCastModel.h index 307c0dd2..87ec1230 100644 --- a/xplan-ios/Main/Room/View/AnimationView/Model/XPRoomGiftBroadCastModel.h +++ b/xplan-ios/Main/Room/View/AnimationView/Model/XPRoomGiftBroadCastModel.h @@ -39,6 +39,8 @@ typedef NS_ENUM(NSInteger, BroadCastLevel) { @property (nonatomic, copy) NSString *sendUserNick; ///跳转的房间的uid @property (nonatomic,assign) NSInteger roomUid; +///平台id +@property (nonatomic,copy) NSString *roomErbanNo; @end NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Room/View/AnimationView/XPRoomGiftBroadcastView.m b/xplan-ios/Main/Room/View/AnimationView/XPRoomGiftBroadcastView.m index 9c2b02bb..a995b23d 100644 --- a/xplan-ios/Main/Room/View/AnimationView/XPRoomGiftBroadcastView.m +++ b/xplan-ios/Main/Room/View/AnimationView/XPRoomGiftBroadcastView.m @@ -118,6 +118,8 @@ @property (nonatomic,strong) UILabel *countLabel; ///关闭 @property (nonatomic,strong) UIButton *closeButton; +///房间iD +@property (nonatomic,strong) UILabel *roomIdLabel; @end @implementation XPRoomGiftBroadcastView @@ -155,6 +157,7 @@ [self.backImageView addSubview:self.receiveView]; [self.backImageView addSubview:self.giftImageView]; [self.backImageView addSubview:self.countLabel]; + [self.backImageView addSubview:self.roomIdLabel]; } - (void)initSubViewConstraints { @@ -200,6 +203,11 @@ make.top.mas_equalTo(13); 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 { @@ -226,6 +234,7 @@ nickBackImageName = @"room_gift_broadcast_normal_nick_bg"; nickColor = [ThemeColor mainTextColor]; bgImageName = @"room_gift_broadcast_low_bg"; + self.roomIdLabel.hidden = YES; } break; case BroadCastLevel_Middle: @@ -243,6 +252,7 @@ nickBackImageName = @"room_gift_broadcast_higher_nick_bg"; nickColor = [ThemeColor giftBroadcastNickColor]; bgImageName = @"room_gift_broadcast_middle_bg"; + self.roomIdLabel.hidden = YES; } break; case BroadCastLevel_High: @@ -260,6 +270,7 @@ nickBackImageName = @"room_gift_broadcast_higher_nick_bg"; nickColor = [ThemeColor giftBroadcastNickColor]; bgImageName = @"room_gift_broadcast_high_bg"; + self.roomIdLabel.hidden = NO; } break; default: @@ -298,7 +309,7 @@ self.giftImageView.imageUrl = broadcastModel.giftUrl; self.countLabel.text = [NSString stringWithFormat:@"x%ld", broadcastModel.giftNum]; - + self.roomIdLabel.text = [NSString stringWithFormat:@"ID:%@", broadcastModel.roomErbanNo]; [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 diff --git a/xplan-ios/Main/Room/View/ThemeColor+Room.m b/xplan-ios/Main/Room/View/ThemeColor+Room.m index f9b6272a..006ea823 100644 --- a/xplan-ios/Main/Room/View/ThemeColor+Room.m +++ b/xplan-ios/Main/Room/View/ThemeColor+Room.m @@ -77,7 +77,7 @@ ///礼物广播 显示的名字的颜色 #2F0060 + (UIColor *)giftBroadcastNickColor { - return UIColorFromRGB(0x2F0060); + return UIColorFromRGB(0xFFFFFF); } ///礼物广播显示 个数的颜色 #FEF563