YUSHENG/featherVoice
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

爵位完成

Browse Source
This commit is contained in:
启星
2025-11-11 17:19:21 +08:00
parent 406c481ba4
commit 7ac937ddbf
136 changed files with 3492 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
QXLive/Room(房间)/Controller/QXRoomViewController.m
View File

@@ -850,6 +850,7 @@ QXRoomUserInfoViewDelegate
self.titleView.isCompere = NO;
}
self.seatContentView.myPitNumber = toPitNumber;
[self configBottomTools];
}
}
// 踢出房间

2
QXLive/Room(房间)/Model/QXEmojiTypeModel.h
View File

@@ -26,6 +26,8 @@ NS_ASSUME_NONNULL_BEGIN
/// 动图表情动画
@property (nonatomic,strong)NSString *animate_image;
@property (nonatomic,strong)NSArray<QXEmojiChirldModel*> *children;
@property (nonatomic,strong)NSString *is_lock;
/// 是否已经动画过了
@property (nonatomic,assign)BOOL isAnimated;
@end

5
QXLive/Room(房间)/View/QXRoomChatListView.h
View File

@@ -12,6 +12,7 @@
#import "QXRoomSeatDelegate.h"
#import "QXRoomFriendRelationModel.h"
#import "QXEmojiTypeModel.h"
#import "QXSeatHeaderView.h"
NS_ASSUME_NONNULL_BEGIN
typedef NS_ENUM(NSInteger) {
@@ -37,7 +38,7 @@ typedef NS_ENUM(NSInteger) {
@interface QXRoomChatListCell : UITableViewCell
@property(nonatomic,strong)UIView *bgView;
@property(nonatomic,strong)UIImageView *headerImageView;
@property(nonatomic,strong)QXSeatHeaderView *headerImageView;
@property(nonatomic,strong)UIView *iconBgView;
@property(nonatomic,strong)NSMutableArray *iconViewArray;
@property(nonatomic,strong)UILabel *nameLabel;
@@ -69,7 +70,7 @@ typedef NS_ENUM(NSInteger) {
@interface QXRoomEmojiListCell : UITableViewCell
@property(nonatomic,strong)UIView *bgView;
@property(nonatomic,strong)UIImageView *headerImageView;
@property(nonatomic,strong)QXSeatHeaderView *headerImageView;
@property(nonatomic,strong)UIView *iconBgView;
/// 礼物图片
@property(nonatomic,strong)UIImageView *giftImageView;

42
QXLive/Room(房间)/View/QXRoomChatListView.m
View File

@@ -485,7 +485,13 @@ NSInteger maxMessageCount = 20;
}
self.titleLabel.attributedText = attr;
self.nameLabel.text = message.FromUserInfo.nickname;
[self.headerImageView sd_setImageWithURL:[NSURL URLWithString:message.FromUserInfo.avatar]];
if ([message.FromUserInfo.nickname_color isExist]) {
self.nameLabel.textColor = [UIColor colorWithHexString:message.FromUserInfo.nickname_color];
}else{
self.nameLabel.textColor = RGB16(0xDED6ED);
}
[self.headerImageView setHeadIcon:message.FromUserInfo.avatar dress:@""];
[self.headerImageView.nobilityImageView sd_setImageWithURL:[NSURL URLWithString:message.FromUserInfo.nobility_image]];
self.iconBgView.hidden = YES;
for (int i = 0;i < message.FromUserInfo.icon.count;i++) {
if (i < 3) {
@@ -521,16 +527,14 @@ NSInteger maxMessageCount = 20;
make.bottom.mas_equalTo(4);
}];
self.headerImageView = [[UIImageView alloc] init];
self.headerImageView.contentMode = UIViewContentModeScaleAspectFill;
self.headerImageView.backgroundColor = [UIColor whiteColor];
[self.headerImageView addRoundedCornersWithRadius:14];
self.headerImageView = [[QXSeatHeaderView alloc] init];
[self.bgView addSubview:self.headerImageView];
[self.headerImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(16);
make.top.mas_equalTo(19);
make.size.mas_equalTo(CGSizeMake(28, 28));
make.width.mas_equalTo(28);
make.height.mas_equalTo(34);
}];
UIButton *headerBtn = [[UIButton alloc] init];
@@ -552,6 +556,14 @@ NSInteger maxMessageCount = 20;
}];
self.iconBgView = [[UIView alloc] init];
[self.bgView addSubview:self.iconBgView];
[self.iconBgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.nameLabel);
make.width.mas_equalTo(UserIconWidth*2+6);
make.height.mas_equalTo(16);
make.top.equalTo(self.nameLabel.mas_bottom).offset(2);
}];
self.titleLabel = [[UILabel alloc] init];
self.titleLabel.textColor = [UIColor whiteColor];
@@ -560,7 +572,7 @@ NSInteger maxMessageCount = 20;
[self.bgView addSubview:self.titleLabel];
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.nameLabel).offset(0);
make.top.equalTo(self.headerImageView.mas_bottom).offset(13);
make.top.equalTo(self.iconBgView.mas_bottom).offset(10);
make.right.mas_lessThanOrEqualTo(-18);
}];
@@ -898,7 +910,13 @@ NSInteger maxMessageCount = 20;
-(void)setMessage:(QXRoomChatListModel *)message{
_message = message;
self.nameLabel.text = message.FromUserInfo.nickname;
[self.headerImageView sd_setImageWithURL:[NSURL URLWithString:message.FromUserInfo.avatar]];
if ([message.FromUserInfo.nickname_color isExist]) {
self.nameLabel.textColor = [UIColor colorWithHexString:message.FromUserInfo.nickname_color];
}else{
self.nameLabel.textColor = RGB16(0xDED6ED);
}
[self.headerImageView setHeadIcon:message.FromUserInfo.avatar dress:@""];
[self.headerImageView.nobilityImageView sd_setImageWithURL:[NSURL URLWithString:message.FromUserInfo.nobility_image]];
self.iconBgView.hidden = YES;
for (int i = 0;i < message.FromUserInfo.icon.count;i++) {
if (i < 3) {
@@ -964,16 +982,14 @@ NSInteger maxMessageCount = 20;
make.bottom.mas_equalTo(4);
}];
self.headerImageView = [[UIImageView alloc] init];
self.headerImageView.contentMode = UIViewContentModeScaleAspectFill;
self.headerImageView.backgroundColor = [UIColor whiteColor];
[self.headerImageView addRoundedCornersWithRadius:14];
self.headerImageView = [[QXSeatHeaderView alloc] init];
[self.bgView addSubview:self.headerImageView];
[self.headerImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(16);
make.top.mas_equalTo(19);
make.size.mas_equalTo(CGSizeMake(28, 28));
make.width.mas_equalTo(28);
make.height.mas_equalTo(34);
}];
UIButton *headerBtn = [[UIButton alloc] init];

22
QXLive/Room(房间)/View/用户信息/QXRoomUserInfoView.m
View File

@@ -18,12 +18,13 @@
#import "QXUserRelationListView.h"
#import "QXUserInfoRelationCardCell.h"
#import "QXDirectSetScaleView.h"
#import "QXSeatHeaderView.h"
@interface QXRoomUserInfoView()<UIGestureRecognizerDelegate,SDCycleScrollViewDelegate,QXMenuPopViewDelegate,UITableViewDelegate,UITableViewDataSource>
@property (nonatomic,strong)UIView *bgView;
@property (nonatomic,strong)UIImageView *bgImageView;
/// 头像
@property (nonatomic,strong)UIImageView *headerImageView;
@property (nonatomic,strong)QXSeatHeaderView *headerImageView;
/// 昵称
@property (nonatomic,strong)UIButton *nameBtn;
/// ID
@@ -108,13 +109,13 @@
make.left.right.bottom.equalTo(self.bgView);
}];
self.headerImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"user_header_placehoulder"]];
self.headerImageView = [[QXSeatHeaderView alloc] init];
self.headerImageView.contentMode = UIViewContentModeScaleAspectFill;
[self.bgView addSubview:self.headerImageView];
[self.headerImageView addRoundedCornersWithRadius:ScaleWidth(33)];
// [self.headerImageView addRoundedCornersWithRadius:ScaleWidth(33)];
[self.headerImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.centerX.equalTo(self.bgView);
make.size.mas_equalTo(CGSizeMake(ScaleWidth(66), ScaleWidth(66)));
make.size.mas_equalTo(CGSizeMake(ScaleWidth(66), ScaleWidth(79)));
}];
UIButton *headder = [[UIButton alloc] init];
@@ -545,7 +546,18 @@
MJWeakSelf
[QXMineNetwork roomUserInfoWithUserId:self.userId roomId:self.roomId successBlock:^(QXRoomUserInfoModel * _Nonnull model) {
weakSelf.userModel = model;
[weakSelf.headerImageView sd_setImageWithURL:[NSURL URLWithString:model.avatar] placeholderImage:[UIImage imageNamed:@"user_header_placehoulder"]];
[weakSelf.headerImageView setHeadIcon:model.avatar dress:@""];
if ([model.nobility_image isExist]) {
[weakSelf.headerImageView.nobilityImageView sd_setImageWithURL:[NSURL URLWithString:model.nobility_image]];
}else{
[weakSelf.headerImageView.nobilityImageView sd_cancelLatestImageLoad];
weakSelf.headerImageView.nobilityImageView.image = nil;
}
if ([model.nickname_color isExist]) {
[weakSelf.nameBtn setTitleColor:[UIColor colorWithHexString:model.nickname_color] forState:(UIControlStateNormal)];
}else{
[weakSelf.nameBtn setTitleColor:[UIColor whiteColor] forState:(UIControlStateNormal)];
}
[weakSelf.nameBtn setTitle:model.nickname forState:(UIControlStateNormal)];
[weakSelf.nameBtn setImage:model.sex.intValue==1?[UIImage imageNamed:@"user_sex_boy"]:[UIImage imageNamed:@"user_sex_girl"] forState:(UIControlStateNormal)];
[weakSelf.nameBtn qx_layoutButtonNOSizeToFitWithEdgeInsetsStyle:(QXButtonEdgeInsetsStyleRight) imageTitleSpace:2];

2
QXLive/Room(房间)/View/直播/QXSeatHeaderView.h
View File

@@ -14,6 +14,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic,strong)UIImageView *dressImageView;
/// 头像
@property (nonatomic,strong)UIImageView *headImageView;
@property (nonatomic,strong)UIImageView *nobilityImageView;
/// 昵称
//@property (nonatomic,strong)UILabel *nameLabel;
/// 按钮

19
QXLive/Room(房间)/View/直播/QXSeatHeaderView.m
View File

@@ -26,6 +26,14 @@
}
return self;
}
//- (instancetype)init
//{
// self = [super init];
// if (self) {
// [self initSubViews];
// }
// return self;
//}
- (instancetype)initWithFrame:(CGRect)frame
{
self = [super initWithFrame:frame];
@@ -46,7 +54,16 @@
self.headImageView.clipsToBounds = YES;
[self addSubview:self.headImageView];
[self.headImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.bottom.top.equalTo(self);
make.left.right.top.equalTo(self);
make.height.equalTo(self.headImageView.mas_width);
}];
self.nobilityImageView = [[UIImageView alloc] init];
self.nobilityImageView.contentMode = UIViewContentModeScaleToFill;
[self addSubview:self.nobilityImageView];
[self.nobilityImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.bottom.equalTo(self);
make.height.mas_equalTo(self.nobilityImageView.mas_width).multipliedBy(0.54);
}];
[self addSubview:self.svgaView];

1
QXLive/Room(房间)/View/表情/QXEmojiCell.h
View File

@@ -12,6 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
@interface QXEmojiCell : UICollectionViewCell
@property (weak, nonatomic) IBOutlet UILabel *titleLabel;
@property (weak, nonatomic) IBOutlet UIImageView *imageView;
@property (weak, nonatomic) IBOutlet UIView *nobilityLockView;
@property (nonatomic,strong)QXEmojiModel *model;
@end

5
QXLive/Room(房间)/View/表情/QXEmojiCell.m
View File

@@ -17,5 +17,10 @@
_model = model;
self.titleLabel.text = model.name;
[self.imageView sd_setImageWithURL:[NSURL URLWithString:model.image]];
if (model.is_lock.intValue == 1) {
self.nobilityLockView.hidden = NO;
}else{
self.nobilityLockView.hidden = YES;
}
}
@end

29
QXLive/Room(房间)/View/表情/QXEmojiCell.xib
View File

@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina6_12" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -29,13 +28,33 @@
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="LlC-Kp-7ty">
<rect key="frame" x="0.0" y="0.0" width="265" height="255"/>
</imageView>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4xH-Q6-Jmm">
<rect key="frame" x="0.0" y="0.0" width="265" height="273"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="nobility_gift_lock" translatesAutoresizingMaskIntoConstraints="NO" id="mZc-fM-hpH">
<rect key="frame" x="106.66666666666669" y="116" width="52" height="41"/>
<constraints>
<constraint firstAttribute="height" constant="41" id="98C-6r-KEp"/>
<constraint firstAttribute="width" constant="52" id="mNC-4E-kvY"/>
</constraints>
</imageView>
</subviews>
<color key="backgroundColor" red="0.9137254901960784" green="0.9137254901960784" blue="0.9137254901960784" alpha="0.5" colorSpace="custom" customColorSpace="calibratedRGB"/>
<constraints>
<constraint firstItem="mZc-fM-hpH" firstAttribute="centerX" secondItem="4xH-Q6-Jmm" secondAttribute="centerX" id="4A5-yV-H2C"/>
<constraint firstItem="mZc-fM-hpH" firstAttribute="centerY" secondItem="4xH-Q6-Jmm" secondAttribute="centerY" id="pzL-kl-Ieb"/>
</constraints>
</view>
</subviews>
</view>
<viewLayoutGuide key="safeArea" id="SEy-5g-ep8"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="Het-BN-kc9" secondAttribute="bottom" id="2BG-mC-FaO"/>
<constraint firstItem="LlC-Kp-7ty" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="2qv-XJ-xHU"/>
<constraint firstItem="4xH-Q6-Jmm" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="6pC-8e-yaG"/>
<constraint firstAttribute="trailing" secondItem="LlC-Kp-7ty" secondAttribute="trailing" id="D6X-gv-ZCy"/>
<constraint firstAttribute="trailing" secondItem="4xH-Q6-Jmm" secondAttribute="trailing" id="E65-Lv-Tqz"/>
<constraint firstAttribute="bottom" secondItem="4xH-Q6-Jmm" secondAttribute="bottom" id="Gz6-33-zUQ"/>
<constraint firstItem="4xH-Q6-Jmm" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="Ie6-fv-iJi"/>
<constraint firstAttribute="trailing" secondItem="Het-BN-kc9" secondAttribute="trailing" id="NMN-es-X8p"/>
<constraint firstItem="LlC-Kp-7ty" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="eud-aw-Nov"/>
<constraint firstItem="Het-BN-kc9" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="gQo-iX-ukL"/>
@@ -44,9 +63,13 @@
<size key="customSize" width="265" height="273"/>
<connections>
<outlet property="imageView" destination="LlC-Kp-7ty" id="ZPe-C3-RBQ"/>
<outlet property="nobilityLockView" destination="4xH-Q6-Jmm" id="Tk2-UX-vht"/>
<outlet property="titleLabel" destination="Het-BN-kc9" id="lDC-MQ-3fj"/>
</connections>
<point key="canvasLocation" x="303.05343511450383" y="98.239436619718319"/>
</collectionViewCell>
</objects>
<resources>
<image name="nobility_gift_lock" width="52" height="41"/>
</resources>
</document>

4
QXLive/Room(房间)/View/表情/QXRoomEmojiContentView.m
View File

@@ -76,6 +76,10 @@
}
-(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{
QXEmojiModel *md = self.dataArray[indexPath.row];
if (md.is_lock.intValue == 1) {
showToast(@"请先开通爵位");
return;
}
QXEmojiModel *result = [self randomResultWithEmoji:md];
if (self.delegate && [self.delegate respondsToSelector:@selector(didSelectedEmoji:)]) {
[self.delegate didSelectedEmoji:result];

8
QXLive/Room(房间)/View/麦位视图/QXRoomSeatContentView.m
View File

@@ -263,6 +263,11 @@
}
self.isSeatSpeaking = YES;
[self.micSvgaView setHidden:NO];
if ([self.pitModel.mic_cycle isExist]) {
[self.micSvgaView loadSVGAPlayerWith:self.pitModel.mic_cycle inBundle:NO loop:10000000];
}else{
[self.micSvgaView loadSVGAPlayerWith:@"mic" inBundle:YES loop:10000000];
}
[self.micSvgaView startEffectSvgaPlay];
}
/// 暂停麦位动画
@@ -505,9 +510,8 @@
}
- (QXEffectSvgaView *)micSvgaView {
if (!_micSvgaView) {
_micSvgaView = [[QXEffectSvgaView alloc] initWithFrame:CGRectZero isAutoPlay:NO];
_micSvgaView = [[QXEffectSvgaView alloc] initWithFrame:CGRectZero isAutoPlay:YES];
_micSvgaView.hidden = YES;
[_micSvgaView loadSVGAPlayerWith:@"mic" inBundle:[NSBundle mainBundle] loop:10000000];
__weak typeof(self)weakSelf = self;
_micSvgaView.didFinishedDisplay = ^(QXEffectSvgaView * _Nonnull svgaView) {
weakSelf.isSeatSpeaking = NO;

24
QXLive/Room(房间)/View/麦位视图/QXRoomSeatTypeAuctionView.m
View File

@@ -573,6 +573,9 @@
model.dress = self.roomModel.room_auction.auction_user.dress;
model.sex = self.roomModel.room_auction.auction_user.sex;
model.charm = self.roomModel.room_auction.auction_user.charm;
model.nobility_image = self.roomModel.room_auction.auction_user.nobility_image;
model.nickname_color = self.roomModel.room_auction.auction_user.nickname_color;
model.mic_cycle = self.roomModel.room_auction.auction_user.mic_cycle;
self.auctionView.pitModel = model;
[self.auctionView hideCharm];
self.auctionCharmView.hidden = NO;
@@ -697,6 +700,9 @@
model.nickname = user.nickname;
model.user_code = user.user_code;
model.charm = user.charm;
model.nobility_image = user.nobility_image;
model.nickname_color = user.nickname_color;
model.mic_cycle = user.mic_cycle;
}else{
model.user_id = @"0";
model.avatar = @"";
@@ -705,6 +711,9 @@
model.nickname = @"";
model.user_code = @"";
model.charm = @"";
model.nobility_image = @"";
model.nickname_color = @"";
model.mic_cycle = @"";
if (contentView.isSeatSpeaking) {
[contentView stopAudioAnimation];
}
@@ -747,6 +756,9 @@
model.nickname = user.nickname;
model.user_code = user.user_code;
model.charm = user.charm;
model.nobility_image = user.nobility_image;
model.nickname_color = user.nickname_color;
model.mic_cycle = user.mic_cycle;
self.auctionCharmView.hidden = NO;
self.charmLabel.text = [NSString qx_showHotCountNumDouble:model.charm.longLongValue];
}else{
@@ -757,6 +769,9 @@
model.nickname = @"";
model.user_code = @"";
model.charm = @"";
model.nobility_image = @"";
model.nickname_color = @"";
model.mic_cycle = @"";
if (contentView.isSeatSpeaking) {
[contentView stopAudioAnimation];
}
@@ -976,6 +991,9 @@
pitModel.nickname = user.nickname;
pitModel.sex = user.sex;
pitModel.avatar = user.avatar;
pitModel.nobility_image = user.nobility_image;
pitModel.nickname_color = user.nickname_color;
pitModel.mic_cycle = user.mic_cycle;
self.auctionView.pitModel = pitModel;
}
@@ -985,6 +1003,9 @@
pitModel.nickname = user.nickname;
pitModel.sex = user.sex;
pitModel.avatar = user.avatar;
pitModel.nobility_image = user.nobility_image;
pitModel.nickname_color = user.nickname_color;
pitModel.mic_cycle = user.mic_cycle;
self.compereView.pitModel = pitModel;
}
for (QXRoomSeatContentView *seatView in self.seatArray) {
@@ -994,6 +1015,9 @@
md.nickname = user.nickname;
md.sex = user.sex;
md.avatar = user.avatar;
md.nobility_image = user.nobility_image;
md.nickname_color = user.nickname_color;
md.mic_cycle = user.mic_cycle;
seatView.pitModel = md;
break;
}

12
QXLive/Room(房间)/View/麦位视图/QXRoomSeatTypeFrientView.m
View File

@@ -837,6 +837,9 @@
model.nickname = user.nickname;
model.user_code = user.user_code;
model.charm = user.charm;
model.nobility_image = user.nobility_image;
model.nickname_color = user.nickname_color;
model.mic_cycle = user.mic_cycle;
}else{
model.user_id = @"0";
model.avatar = @"";
@@ -845,6 +848,9 @@
model.nickname = @"";
model.user_code = @"";
model.charm = @"";
model.nobility_image = @"";
model.nickname_color = @"";
model.mic_cycle = @"";
if (contentView.isSeatSpeaking) {
[contentView stopAudioAnimation];
}
@@ -1051,6 +1057,9 @@
md.nickname = model.nickname;
md.user_code = model.user_code;
md.charm = model.charm;
md.nobility_image = model.nobility_image;
md.nickname_color = model.nickname_color;
md.mic_cycle = model.mic_cycle;
contentView.pitModel = md;
if (contentView.isSeatSpeaking) {
[contentView stopAudioAnimation];
@@ -1158,6 +1167,9 @@
md.nickname = user.nickname;
md.sex = user.sex;
md.avatar = user.avatar;
md.nobility_image = user.nobility_image;
md.nickname_color = user.nickname_color;
md.mic_cycle = user.mic_cycle;
contentView.pitModel = md;
break;
}

9
QXLive/Room(房间)/View/麦位视图/QXRoomSeatTypeNormalView.m
View File

@@ -204,6 +204,9 @@ static NSInteger maxSeat = 8;
model.nickname = user.nickname;
model.user_code = user.user_code;
model.charm = user.charm;
model.nobility_image = user.nobility_image;
model.nickname_color = user.nickname_color;
model.mic_cycle = user.mic_cycle;
}else{
model.user_id = @"0";
model.avatar = @"";
@@ -212,6 +215,9 @@ static NSInteger maxSeat = 8;
model.nickname = @"";
model.user_code = @"";
model.charm = @"";
model.nobility_image = @"";
model.nickname_color = @"";
model.mic_cycle = @"";
if (contentView.isSeatSpeaking) {
[contentView stopAudioAnimation];
}
@@ -429,6 +435,9 @@ static NSInteger maxSeat = 8;
md.nickname = user.nickname;
md.sex = user.sex;
md.avatar = user.avatar;
md.nobility_image = user.nobility_image;
md.nickname_color = user.nickname_color;
md.mic_cycle = user.mic_cycle;
seatView.pitModel = md;
break;
}

24
QXLive/Room(房间)/View/麦位视图/QXRoomSeatTypeSongView.m
View File

@@ -302,6 +302,9 @@ QXRoomSeatDelegate
model.nickname = user.nickname;
model.user_code = user.user_code;
model.charm = user.charm;
model.nobility_image = user.nobility_image;
model.nickname_color = user.nickname_color;
model.mic_cycle = user.mic_cycle;
// [self.dataArray removeAllObjects];
// [self.dataArray addObjectsFromArray:self.roomModel.song_pit_list];
if (contentView == nil) {
@@ -315,6 +318,9 @@ QXRoomSeatDelegate
model.nickname = @"";
model.user_code = @"";
model.charm = @"";
model.nobility_image = @"";
model.nickname_color = @"";
model.mic_cycle = @"";
if (contentView) {
if (contentView.isSeatSpeaking) {
[contentView stopAudioAnimation];
@@ -443,6 +449,9 @@ QXRoomSeatDelegate
singer.nickname = self.roomModel.song_user_info.nickname;
singer.charm = self.roomModel.song_user_info.charm;
singer.dress = self.roomModel.song_user_info.dress;
singer.nobility_image = self.roomModel.song_user_info.nobility_image;
singer.nickname_color = self.roomModel.song_user_info.nickname_color;
singer.mic_cycle = self.roomModel.song_user_info.mic_cycle;
[self.dataArray removeAllObjects];
self.singerSeatView.pitModel = singer;
for (QXRoomPitModel *model in roomModel.room_info.pit_list) {
@@ -582,6 +591,9 @@ QXRoomSeatDelegate
singerModel.nickname = user.nickname;
singerModel.sex = user.sex;
singerModel.avatar = user.avatar;
singerModel.nobility_image = user.nobility_image;
singerModel.nickname_color = user.nickname_color;
singerModel.mic_cycle = user.mic_cycle;
self.singerSeatView.pitModel = singerModel;
}
QXRoomPitModel *compereModel = self.compereView.pitModel;
@@ -590,6 +602,9 @@ QXRoomSeatDelegate
compereModel.nickname = user.nickname;
compereModel.sex = user.sex;
compereModel.avatar = user.avatar;
compereModel.nobility_image = user.nobility_image;
compereModel.nickname_color = user.nickname_color;
compereModel.mic_cycle = user.mic_cycle;
self.compereView.pitModel = compereModel;
}
QXRoomPitModel *guestModel = self.guestView.pitModel;
@@ -598,6 +613,9 @@ QXRoomSeatDelegate
guestModel.nickname = user.nickname;
guestModel.sex = user.sex;
guestModel.avatar = user.avatar;
guestModel.nobility_image = user.nobility_image;
guestModel.nickname_color = user.nickname_color;
guestModel.mic_cycle = user.mic_cycle;
self.guestView.pitModel = guestModel;
}
for (QXRoomPitModel *md in self.dataArray) {
@@ -606,6 +624,9 @@ QXRoomSeatDelegate
md.nickname = user.nickname;
md.sex = user.sex;
md.avatar = user.avatar;
md.nobility_image = user.nobility_image;
md.nickname_color = user.nickname_color;
md.mic_cycle = user.mic_cycle;
break;
}
}
@@ -714,6 +735,9 @@ QXRoomSeatDelegate
singer.nickname = songInfo.nickname;
singer.charm = songInfo.charm;
singer.dress = songInfo.dress;
singer.nobility_image = songInfo.nobility_image;
singer.nickname_color = songInfo.nickname_color;
singer.mic_cycle = songInfo.mic_cycle;
self.singerSeatView.pitModel = singer;
// if (singer.user_id.intValue > 0) {
// [self.seatDict setObject:self.singerSeatView forKey:singer.user_id];