diff --git a/QXLive/Manager/QXRoomMessageManager.m b/QXLive/Manager/QXRoomMessageManager.m
index a9e4ddd..d61cb33 100644
--- a/QXLive/Manager/QXRoomMessageManager.m
+++ b/QXLive/Manager/QXRoomMessageManager.m
@@ -141,14 +141,8 @@
QXRoomChatListModel *model = [QXRoomChatListModel yy_modelWithJSON:msg.Text];
model.messageType = QXRoomChatMessageTypeSystem;
NSString *jia_jia = [NSString stringWithFormat:@"%@",msg.Text[@"jia_jia"]];
- if ([self.exRoomId isExist] && [self.roomId isExist]) {
+ if (!isSuperRoom) {
/// 酒吧房小黑屋不管大房间的特效
- if ([groupId isEqualToString:self.groupId]){
- if (([jia_jia hasPrefix:@"http"] || [jia_jia hasPrefix:@"https"]) && ([jia_jia hasSuffix:@"svga"] || [jia_jia hasSuffix:@"mp4"])) {
- [[QXGiftPlayerManager shareManager] displayChatEffectView:jia_jia];
- }
- }
- }else{
if (([jia_jia hasPrefix:@"http"] || [jia_jia hasPrefix:@"https"]) && ([jia_jia hasSuffix:@"svga"] || [jia_jia hasSuffix:@"mp4"])) {
[[QXGiftPlayerManager shareManager] displayChatEffectView:jia_jia];
}
@@ -179,21 +173,14 @@
/// 收到礼物
QXRoomChatListModel *model = [QXRoomChatListModel yy_modelWithJSON:msg.Text];
model.messageType = QXRoomChatMessageTypeGift;
- if ([self.exRoomId isExist] && [self.roomId isExist]) {
+ if (!isSuperRoom) {
/// 酒吧房小黑屋不管大房间的特效
- if ([groupId isEqualToString:self.groupId]){
- NSArray *arr = [model.GiftInfo.play_image componentsSeparatedByString:@","];
- [[QXGiftPlayerManager shareManager] displayFullEffectViewWithMorePlayImages:arr];
- [[QXGiftDisplayManager sharedManager] receiveGift:model];
- }
- }else{
if ([model.GiftInfo.play_image isExist]) {
NSArray *arr = [model.GiftInfo.play_image componentsSeparatedByString:@","];
[[QXGiftPlayerManager shareManager] displayFullEffectViewWithMorePlayImages:arr];
}
[[QXGiftDisplayManager sharedManager] receiveGift:model];
}
-
if (model.ToUserInfos.count>0) {
if (self.delegate && [self.delegate respondsToSelector:@selector(didRecieveGiftWithWithUserInfos:)]) {
[self.delegate didRecieveGiftWithWithUserInfos:model.ToUserInfos];
diff --git a/QXLive/Mine(音域)/Controller/我的房间/QXRoomDetailViewController.m b/QXLive/Mine(音域)/Controller/我的房间/QXRoomDetailViewController.m
index 34a8854..0124aa2 100644
--- a/QXLive/Mine(音域)/Controller/我的房间/QXRoomDetailViewController.m
+++ b/QXLive/Mine(音域)/Controller/我的房间/QXRoomDetailViewController.m
@@ -169,7 +169,7 @@
UILabel *waterLabel = [[UILabel alloc] initWithFrame:CGRectMake(SCREEN_WIDTH-16-130, 0, SCREEN_WIDTH-130-32, 25)];
waterLabel.font = [UIFont systemFontOfSize:13];
waterLabel.textColor = [UIColor colorWithHexString:@"#333333"];
- NSString *total_earning = [NSString stringWithFormat:@"%.2f",model.total_earning];
+ NSString *total_earning = [NSString stringWithFormat:@"%.4f",model.total_earning];
NSString *total_price = [NSString stringWithFormat:@"%.2f",model.total_price];
NSString *s = [NSString stringWithFormat:@"收益 %@ 流水 %@",total_earning,total_price];
NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:s];
@@ -181,6 +181,11 @@
[waterLabel sizeToFit];
waterLabel.frame = CGRectMake(SCREEN_WIDTH-16-waterLabel.size.width, 0, waterLabel.size.width, 25);
[header addSubview:waterLabel];
+ if (self.type == 1) {
+ waterLabel.hidden = YES;
+ }else{
+ waterLabel.hidden = NO;
+ }
return header;
}
-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
diff --git a/QXLive/Mine(音域)/Services/QXMineNetwork.h b/QXLive/Mine(音域)/Services/QXMineNetwork.h
index fbae158..216c174 100644
--- a/QXLive/Mine(音域)/Services/QXMineNetwork.h
+++ b/QXLive/Mine(音域)/Services/QXMineNetwork.h
@@ -1570,6 +1570,12 @@ NS_ASSUME_NONNULL_BEGIN
successBlock:(void (^)(NSDictionary* dict))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
+/**
+ 小黑屋列表
+ */
++(void)roomBarCabinRoomListWithRoomId:(NSString*)roomId
+ successBlock:(void (^)(NSArray* list))successBlock
+ failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
@end
diff --git a/QXLive/Mine(音域)/Services/QXMineNetwork.m b/QXLive/Mine(音域)/Services/QXMineNetwork.m
index f5564da..c6f5bcb 100644
--- a/QXLive/Mine(音域)/Services/QXMineNetwork.m
+++ b/QXLive/Mine(音域)/Services/QXMineNetwork.m
@@ -3197,4 +3197,28 @@
failBlock(error,msg);
}];
}
+
+/**
+ 小黑屋列表
+ */
++(void)roomBarCabinRoomListWithRoomId:(NSString*)roomId
+ successBlock:(void (^)(NSArray* list))successBlock
+ failBlock:(void (^)(NSError * error, NSString * msg))failBlock{
+ NSDictionary *parameters =@{
+ @"room_id":roomId?:@"",
+ };
+ [[QXRequset shareInstance] postWithUrl:QXRoomBarCabinRoomList parameters:parameters needCache:NO success:^(id responseObject) {
+ if (successBlock) {
+ id object = responseObject[@"data"];
+ NSArray *array = [NSArray array];
+ if ([object isKindOfClass:[NSArray class]]) {
+ array = (NSArray*)object;
+ }
+ successBlock(array);
+ }
+ } fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
+ failBlock(error,msg);
+ }];
+}
+
@end
diff --git a/QXLive/Mine(音域)/View/我的房间/QXRoomDetailHeaderView.m b/QXLive/Mine(音域)/View/我的房间/QXRoomDetailHeaderView.m
index f943b3c..5e7b3b8 100644
--- a/QXLive/Mine(音域)/View/我的房间/QXRoomDetailHeaderView.m
+++ b/QXLive/Mine(音域)/View/我的房间/QXRoomDetailHeaderView.m
@@ -125,7 +125,7 @@
-(void)setModel:(QXRoomDetailModel *)model{
_model = model;
self.allWaterLabel.text = [NSString stringWithFormat:@"%.2f",model.total_amount];;
- self.allPriceLabel.text = [NSString stringWithFormat:@"%.2f",model.total_earning];
+ self.allPriceLabel.text = [NSString stringWithFormat:@"%.4f",model.total_earning];
}
-(UIImageView *)bgImageView{
diff --git a/QXLive/Other/Assets.xcassets/room/酒吧房/bar_room_title_cabin_room.imageset/Contents.json b/QXLive/Other/Assets.xcassets/room/酒吧房/bar_room_title_cabin_room.imageset/Contents.json
new file mode 100644
index 0000000..487c1b9
--- /dev/null
+++ b/QXLive/Other/Assets.xcassets/room/酒吧房/bar_room_title_cabin_room.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "bar_room_title_cabin_room@2x.png",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "bar_room_title_cabin_room@3x.png",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/QXLive/Other/Assets.xcassets/room/酒吧房/bar_room_title_cabin_room.imageset/bar_room_title_cabin_room@2x.png b/QXLive/Other/Assets.xcassets/room/酒吧房/bar_room_title_cabin_room.imageset/bar_room_title_cabin_room@2x.png
new file mode 100644
index 0000000..e59c861
Binary files /dev/null and b/QXLive/Other/Assets.xcassets/room/酒吧房/bar_room_title_cabin_room.imageset/bar_room_title_cabin_room@2x.png differ
diff --git a/QXLive/Other/Assets.xcassets/room/酒吧房/bar_room_title_cabin_room.imageset/bar_room_title_cabin_room@3x.png b/QXLive/Other/Assets.xcassets/room/酒吧房/bar_room_title_cabin_room.imageset/bar_room_title_cabin_room@3x.png
new file mode 100644
index 0000000..b48b97a
Binary files /dev/null and b/QXLive/Other/Assets.xcassets/room/酒吧房/bar_room_title_cabin_room.imageset/bar_room_title_cabin_room@3x.png differ
diff --git a/QXLive/Other/QXApi.h b/QXLive/Other/QXApi.h
index 6e41c3c..cfe5336 100644
--- a/QXLive/Other/QXApi.h
+++ b/QXLive/Other/QXApi.h
@@ -614,4 +614,6 @@ static NSString * QXRoomGetSeductionCoin = @"api/BarRoom/get_liao_ta_coin";
static NSString * QXRoomBarSeduction = @"api/BarRoom/liao_ta";
/// 约他
static NSString * QXRoomBarAsk = @"api/BarRoom/meeting_ta";
+/// 小黑屋列表
+static NSString * QXRoomBarCabinRoomList = @"api/BarRoom/black_room_list";
#endif /* Api_h */
diff --git a/QXLive/Room(房间)/Controller/QXRoomViewController+Activity.m b/QXLive/Room(房间)/Controller/QXRoomViewController+Activity.m
index 98a1021..345a1a5 100644
--- a/QXLive/Room(房间)/Controller/QXRoomViewController+Activity.m
+++ b/QXLive/Room(房间)/Controller/QXRoomViewController+Activity.m
@@ -26,6 +26,9 @@
}
-(void)updateProgress:(NSNotification *)notice{
+ if ([self.roomModel.room_info.type_id isEqualToString:@"6"]) {
+ return;
+ }
QXMeetActivityDriftModel *model = notice.object;
if (model.from_type == QXMeetActivityTypeAcLock) {
[self.meetView updateUserAndGiftInfoWithModel:model];
diff --git a/QXLive/Room(房间)/Controller/QXRoomViewController.m b/QXLive/Room(房间)/Controller/QXRoomViewController.m
index ec9d10c..0608bca 100644
--- a/QXLive/Room(房间)/Controller/QXRoomViewController.m
+++ b/QXLive/Room(房间)/Controller/QXRoomViewController.m
@@ -271,6 +271,7 @@ QXUpSeatViewDelegate
make.size.mas_equalTo(CGSizeMake(SCREEN_WIDTH, SCREEN_HEIGHT));
}];
QXCPEffectView *cpEffectView = [[QXGiftPlayerManager shareManager] defaultCpEffectView];
+ cpEffectView.isBackground = NO;
[cpEffectView mas_makeConstraints:^(MASConstraintMaker *make) {
// make.top.equalTo(self.seatContentView.mas_bottom).offset(padding);
// make.left.right.equalTo(self.bgEffectView);
diff --git a/QXLive/Room(房间)/View/QXRoomChatListView.m b/QXLive/Room(房间)/View/QXRoomChatListView.m
index 41de730..3cd5809 100644
--- a/QXLive/Room(房间)/View/QXRoomChatListView.m
+++ b/QXLive/Room(房间)/View/QXRoomChatListView.m
@@ -476,7 +476,7 @@ NSInteger maxMessageCount = 20;
self.nameLabel.textColor = superRoomMessageColor;
[attr yy_setColor:superRoomMessageColor range:NSMakeRange(0, attr.length)];
}else{
- self.nameLabel.textColor = messageNameColor;
+ self.nameLabel.textColor = RGB16(0xDED6ED);
if ([message.FromUserInfo.nickname isExist]) {
[attr yy_setColor:messageNameColor range:[message.text rangeOfString:message.FromUserInfo.nickname]];
}
@@ -968,7 +968,7 @@ NSInteger maxMessageCount = 20;
if (message.isSuperRoom) {
self.nameLabel.textColor = superRoomMessageColor;
}else{
- self.nameLabel.textColor = messageNameColor;
+ self.nameLabel.textColor = RGB16(0xDED6ED);
}
self.nameLabel.text = message.FromUserInfo.nickname;
[self.headerImageView setHeadIcon:message.FromUserInfo.avatar dress:@""];
diff --git a/QXLive/Room(房间)/View/QXRoomTitleView.m b/QXLive/Room(房间)/View/QXRoomTitleView.m
index b562623..87d0b5e 100644
--- a/QXLive/Room(房间)/View/QXRoomTitleView.m
+++ b/QXLive/Room(房间)/View/QXRoomTitleView.m
@@ -218,7 +218,7 @@
self.cabinRoom.titleLabel.font = [UIFont systemFontOfSize:12];
[self.cabinRoom setTitleColor:[UIColor whiteColor] forState:(UIControlStateNormal)];
[self.cabinRoom addTarget:self action:@selector(cabinAction) forControlEvents:(UIControlEventTouchUpInside)];
- [self.cabinRoom setImage:[UIImage imageNamed:@"room_clear_charm"] forState:(UIControlStateNormal)];
+ [self.cabinRoom setImage:[UIImage imageNamed:@"bar_room_title_cabin_room"] forState:(UIControlStateNormal)];
self.cabinRoom.backgroundColor = RGB16A(0xFFFFFF,0.2);
[self.cabinRoom addRoundedCornersWithRadius:ScaleWidth(11)];
[self addSubview:self.cabinRoom];
@@ -243,6 +243,10 @@
}
-(void)setIsCompere:(BOOL)isCompere{
_isCompere = isCompere;
+ if ([self.roomModel.room_info.type_id isEqualToString:@"11"]) {
+ self.clearCharmBtn.hidden = YES;
+ return;
+ }
self.clearCharmBtn.hidden = !isCompere;
}
-(void)layoutSubviews{
@@ -260,6 +264,11 @@
self.followBtn.selected = NO;
}
self.countLabel.text = roomModel.room_info.online_number?roomModel.room_info.online_number:@"0";
+ if ([self.roomModel.room_info.type_id isEqualToString:@"11"]) {
+ self.cabinRoom.hidden = NO;
+ }else{
+ self.cabinRoom.hidden = YES;
+ }
}
-(void)setOnlineUsers:(NSArray *)onlineUsers{
_onlineUsers = onlineUsers;
diff --git a/QXLive/Room(房间)/View/礼物特效/QXCPEffectView.h b/QXLive/Room(房间)/View/礼物特效/QXCPEffectView.h
index 67a0182..45f7db1 100644
--- a/QXLive/Room(房间)/View/礼物特效/QXCPEffectView.h
+++ b/QXLive/Room(房间)/View/礼物特效/QXCPEffectView.h
@@ -13,6 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic,strong) VAPView *playerMp4View;
-(void)displayCpEffectUrl:(QXRoomChatListModel*)model;
@property (nonatomic, strong) dispatch_queue_t queue;
+@property (nonatomic, assign) BOOL isBackground;
- (void)destroyEffectView;
-(void)stopPlay;
-(void)startPlay;
diff --git a/QXLive/Room(房间)/View/礼物特效/QXCPEffectView.m b/QXLive/Room(房间)/View/礼物特效/QXCPEffectView.m
index a266dd4..9b478d1 100644
--- a/QXLive/Room(房间)/View/礼物特效/QXCPEffectView.m
+++ b/QXLive/Room(房间)/View/礼物特效/QXCPEffectView.m
@@ -19,7 +19,6 @@
@property (nonatomic, assign) BOOL isLoadEffect;
@property (nonatomic, strong) QXRoomChatListModel *playModel;
@property (nonatomic, assign) BOOL isPlaying;
-@property (nonatomic, assign) BOOL isBackground;
@end
@implementation QXCPEffectView
- (instancetype)initWithFrame:(CGRect)frame {
diff --git a/QXLive/Room(房间)/View/练歌房/QXRoomSongListCell.xib b/QXLive/Room(房间)/View/练歌房/QXRoomSongListCell.xib
index 74effec..dbb7533 100644
--- a/QXLive/Room(房间)/View/练歌房/QXRoomSongListCell.xib
+++ b/QXLive/Room(房间)/View/练歌房/QXRoomSongListCell.xib
@@ -84,7 +84,7 @@
-