From d41d74dd8e3ff3dcaa7fa21712035de05ce9f32e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=AF=E6=98=9F?= Date: Fri, 9 Jan 2026 20:35:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QXLive/Manager/QXRoomMessageManager.m | 17 ++----------- .../我的房间/QXRoomDetailViewController.m | 7 ++++- QXLive/Mine(音域)/Services/QXMineNetwork.h | 6 +++++ QXLive/Mine(音域)/Services/QXMineNetwork.m | 24 ++++++++++++++++++ .../View/我的房间/QXRoomDetailHeaderView.m | 2 +- .../Contents.json | 22 ++++++++++++++++ .../bar_room_title_cabin_room@2x.png | Bin 0 -> 2350 bytes .../bar_room_title_cabin_room@3x.png | Bin 0 -> 4883 bytes QXLive/Other/QXApi.h | 2 ++ .../Controller/QXRoomViewController+Activity.m | 3 +++ .../Controller/QXRoomViewController.m | 1 + QXLive/Room(房间)/View/QXRoomChatListView.m | 4 +-- QXLive/Room(房间)/View/QXRoomTitleView.m | 11 +++++++- .../Room(房间)/View/礼物特效/QXCPEffectView.h | 1 + .../Room(房间)/View/礼物特效/QXCPEffectView.m | 1 - .../View/练歌房/QXRoomSongListCell.xib | 4 +-- .../View/酒吧房/QXRoomBarCabinListView.m | 17 +++++++++---- .../View/麦位视图/QXRoomSeatBarCabinView.m | 16 ++++++++++-- .../View/麦位视图/QXRoomSeatBarView.m | 9 +++++++ .../View/麦位视图/QXRoomSeatTypeCabinView.m | 1 + 20 files changed, 118 insertions(+), 30 deletions(-) create mode 100644 QXLive/Other/Assets.xcassets/room/酒吧房/bar_room_title_cabin_room.imageset/Contents.json create mode 100644 QXLive/Other/Assets.xcassets/room/酒吧房/bar_room_title_cabin_room.imageset/bar_room_title_cabin_room@2x.png create mode 100644 QXLive/Other/Assets.xcassets/room/酒吧房/bar_room_title_cabin_room.imageset/bar_room_title_cabin_room@3x.png 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 0000000000000000000000000000000000000000..e59c8616447abed4675102055d44de55a21f3490 GIT binary patch literal 2350 zcmV+}3DNe6P)iLyLo126eWSaB%-P)QQJV9 z2vtE%E2R&qYN9?=sYq@Al%z+KRNZ23hT*s=fx*VI}6ZNV~HcxoZoM;?3+b_ydW2Ac4JLB>|kSCU_@4j@2LR_{ z3o?Zas`5VS1C2#a63s?oNy3OYxUc3RJW&5l?5Y2b-e0>*KUcNQY!}u`J&i`4K~1wF;wj{HU{*Pm z*y=XWgSn0T-26S}XQ?)`Q3DI4Le;K@_qL5EL1zB$NWePhT9C?ksM3skQ_HZS=IdsE z<#zp&w}Kx_EaHcfE3l*bOZaYno7pk;M|HaRuKG6ufI|W$xUupuv;<>QtnfdbGgs( z>hU+xDFoQWL;<9^C9@iB%*ahJygGm|u}VmEo`Sg@%eH3`c>5GsCWPc-GU&n?_@t-6BwzrrZ0o7MZQmw7bl8J# zCyT5tz4eLu=?I3MF5x^eN(dgt90+U{Ct?I%gz<1tT?&VA+y;xw>XQ%v;&x0%`qRr3 z_Ru9tVG=3aBcxf6;mqVQ`jxEzpy%VJ6TzMk|9=Tcmfz6`NMSsRFgW=y`n4%gzp5dk(n!$^91lzNKq(V^5z-UJ_$Q6K$9&V?6(06n3`m|RExQ2Xrc@3;ikc&!7P zCs9f&jPNKr3-8cgJxuRO=8=grhg5<=aT8G8Zu_`*9(! ziZ@n?3ONa@rF=EQy;>9UAb6$(KN>)9*oW?@AAPz6E%TG)sd`n3`x8z4OmZb3@YeGy znN|F~v01*>xqsAgmmA?D>6AJHM2h53p^ zt=X1t#uMq~ygRiTyS-L^+-u<-sa5>d^hbH8*UVp39+roL+*>+Lzl(b42m*<#uv%5| zld0wE7j6^pbdqSz5*B(uoh*qZ5q~Er3;yU5BupE!`7COZ3JVRRHBpZ*rp)5rj+ug+)<*%@O^~6DJpt%U6+NtJEP6KZV`>0C~ zQG0nlB)+QQ?^6{%8!9xYB=Vygo@xb>*$8=AfChN@gj2`QgVAgRuq@>uwr|^IZQE96 z_GQ1+x^=uskKwu=p-W{SgzzZK-*D1cNecNILQ**fUOI!k7?-L%zHLHOl>^G|j}IN= zLtZ;8gmT;Z#4FlQ0kL8USr9uG2*J25I<(`W zW1DT$2{VZUaxk??+`n^)c106-MV6;K(ilremA)DohA-t9m6PF$4)7z{`7fD}d)Nkv zMKZEvZWjx9Yit_Oj+gBrIyj;O9OB0$Kpf#!^0CKg9CIUdB?}nzM=(C#i$MKj0D-xV z@uZIdHt3KEe-PbWETOE;>X({Ey1K7afIX4RA=7_M%ky zh}Jk6F|J`)PEUpFmpgECT`x*o0Ii+|qV^#aF^N%SFrXP%!Dwf~>xS@xT(3`(i+x1+ zt=Ru2B#*=3UHM>nhZ(QSE_%%*@VxjuMG5Se{u|oIc?!@elzMa+XFHrKVYFC}@s;hE z+y+R!NH~(XgZL4UZt8+R*p8dyqqwebpw}&-Qzdah?(s8Fc!NE>=A`hl*nX%o*yniI zFR$)T#QqyO-3}YZS$Uf-C?B086X-2TobgK-Yq^MmWLsR?LH_zvBwLdtFJh@w{EOcL z+ae*d1r%+(hEm)6xGDQ$m`msnZlc>O;HsX)<&uv}asgeG4RpZ?a6y*kqKtJ!GA^bc;}RFwV>Y10x?OG&C>t#i5p5Z-YDeLM1nX|Zi0fjg>H_-Zd$BJVM*m0w z{a%29Q0(Cq+-N(4F)451bCRj8sKkh~EXTc@{to~E0RR8=h9p=3000I_L_t&o0CjG6 Uy?tc;>Hq)$07*qoM6N<$f?_{ciU0rr literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b48b97a1d89c52f14b0603d768638e00e93b9221 GIT binary patch literal 4883 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 -