diff --git a/QXLive.xcodeproj/project.pbxproj b/QXLive.xcodeproj/project.pbxproj index 8ee508f..56eb5de 100644 --- a/QXLive.xcodeproj/project.pbxproj +++ b/QXLive.xcodeproj/project.pbxproj @@ -793,7 +793,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = 1.2.0; + MARKETING_VERSION = 1.1.16; PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -859,7 +859,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = 1.2.0; + MARKETING_VERSION = 1.1.16; PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/QXLive/Mine(音域)/Services/QXMineNetwork.h b/QXLive/Mine(音域)/Services/QXMineNetwork.h index 216c174..4df4f18 100644 --- a/QXLive/Mine(音域)/Services/QXMineNetwork.h +++ b/QXLive/Mine(音域)/Services/QXMineNetwork.h @@ -545,9 +545,19 @@ NS_ASSUME_NONNULL_BEGIN 已点歌曲列表 */ +(void)roomSongListWithRoomId:(NSString*)room_id + search_user:(NSString*)search_user successBlock:(void (^)(NSArray*list))successBlock failBlock:(void (^)(NSError * error, NSString * msg))failBlock; +/** + 删除已点歌曲 + */ ++(void)deleteRoomSongListWithRoomId:(NSString*)room_id + did:(NSString*)did + successBlock:(void (^)(NSDictionary* dict))successBlock + failBlock:(void (^)(NSError * error, NSString * msg))failBlock; + + /** k歌房间 魅力排行 */ diff --git a/QXLive/Mine(音域)/Services/QXMineNetwork.m b/QXLive/Mine(音域)/Services/QXMineNetwork.m index c6f5bcb..c6f4194 100644 --- a/QXLive/Mine(音域)/Services/QXMineNetwork.m +++ b/QXLive/Mine(音域)/Services/QXMineNetwork.m @@ -1109,11 +1109,16 @@ failBlock(error,msg); }]; } -+(void)roomSongListWithRoomId:(NSString *)room_id successBlock:(void (^)(NSArray * _Nonnull))successBlock failBlock:(void (^)(NSError * _Nonnull, NSString * _Nonnull))failBlock{ ++(void)roomSongListWithRoomId:(NSString *)room_id search_user:(NSString*)search_user successBlock:(void (^)(NSArray * _Nonnull))successBlock failBlock:(void (^)(NSError * _Nonnull, NSString * _Nonnull))failBlock{ NSDictionary *parameters =@{ @"room_id":room_id, + @"search_user":search_user?search_user:@"" }; - [[QXRequset shareInstance] postWithUrl:QXRoomSongList parameters:parameters needCache:NO success:^(id responseObject) { + NSString *url = QXRoomSongList; + if (search_user.length>0) { + url = QXRoomSongListSearch; + } + [[QXRequset shareInstance] postWithUrl:url parameters:parameters needCache:NO success:^(id responseObject) { if (successBlock) { NSArray *list = [NSArray yy_modelArrayWithClass:[QXSongListModel class] json:responseObject[@"data"]]; successBlock(list); @@ -1122,6 +1127,27 @@ failBlock(error,msg); }]; } + +/** + 删除已点歌曲 + */ ++(void)deleteRoomSongListWithRoomId:(NSString*)room_id + did:(NSString*)did + successBlock:(void (^)(NSDictionary* dict))successBlock + failBlock:(void (^)(NSError * error, NSString * msg))failBlock{ + NSDictionary *parameters =@{ + @"room_id":room_id, + @"did":did?did:@"" + }; + [[QXRequset shareInstance] postWithUrl:QXRoomSongListDelete parameters:parameters needCache:NO success:^(id responseObject) { + if (successBlock) { + successBlock(responseObject[@"data"]); + } + } fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) { + failBlock(error,msg); + }]; +} + +(void)roomCharmRankListWithRoomId:(NSString *)room_id successBlock:(void (^)(NSArray * _Nonnull))successBlock failBlock:(void (^)(NSError * _Nonnull, NSString * _Nonnull))failBlock{ NSDictionary *parameters =@{ @"room_id":room_id, diff --git a/QXLive/Other/QXApi.h b/QXLive/Other/QXApi.h index cfe5336..81b8198 100644 --- a/QXLive/Other/QXApi.h +++ b/QXLive/Other/QXApi.h @@ -16,6 +16,8 @@ //tadmin.xscmmidi.site --管理后台 //tmd.xscmmidi.site -- 这是接口 api #if DEVELOPENT == 1 +//static NSString* ServerUrl = @"https://vsyusheng.qxhs.xyz/"; +//static NSString* H5ServerUrl = @"https://vsyusheng.qxhs.xyz/h5/"; static NSString* ServerUrl = @"https://test.vespa.qxyushen.top/"; static NSString* H5ServerUrl = @"https://test.vespa.qxyushen.top/h5/"; static NSString* RServerUrl = @"https://test.vespa.qxyushen.top/"; @@ -25,6 +27,8 @@ static NSString* RH5ServerUrl = @"https://test.vespa.qxyushen.top/h5/"; //static NSString* H5ServerUrl = @"https://test.vespa.qxyushen.top/h5/"; //static NSString* ServerUrl = @"https://vespa.qxyushen.top/"; //static NSString* H5ServerUrl = @"https://vespa.qxyushen.top/h5/"; +//static NSString* ServerUrl = @"https://vsyusheng.qxhs.xyz/"; +//static NSString* H5ServerUrl = @"https://vsyusheng.qxhs.xyz/h5/"; static NSString* ServerUrl = @"https://yushengapi.qxyushen.top/"; static NSString* H5ServerUrl = @"https://yushengapi.qxyushen.top/h5/"; static NSString* RServerUrl = @"https://details.qxhs.xyz/"; @@ -317,6 +321,10 @@ static NSString * QXRoomMoveSong = @"api/RoomSong/up_song"; static NSString * QXRoomNextSong = @"api/RoomSong/change_song"; /// 已点歌曲列表 static NSString * QXRoomSongList = @"api/RoomSong/song_list"; +/// 已点歌曲列表搜索 +static NSString * QXRoomSongListSearch = @"api/RoomSong/search_song"; +/// 已点歌曲列表删除 +static NSString * QXRoomSongListDelete = @"api/RoomSong/del_song"; /// 结束本次唱歌 static NSString * QXRoomEndSong = @"api/RoomSong/end_song"; /// 魅力排行 diff --git a/QXLive/Other/Resource/zizi.mp4 b/QXLive/Other/Resource/zizi.mp4 deleted file mode 100644 index afc31b1..0000000 Binary files a/QXLive/Other/Resource/zizi.mp4 and /dev/null differ diff --git a/QXLive/Room(房间)/View/用户信息/QXRoomUserInfoView.m b/QXLive/Room(房间)/View/用户信息/QXRoomUserInfoView.m index 529309b..37138b9 100644 --- a/QXLive/Room(房间)/View/用户信息/QXRoomUserInfoView.m +++ b/QXLive/Room(房间)/View/用户信息/QXRoomUserInfoView.m @@ -44,6 +44,8 @@ @property (nonatomic,strong)UIImageView *sexImageView; /// ID @property (nonatomic,strong)UILabel *idLabel; +/// 靓号 +@property (nonatomic,strong)UIImageView *useCodeImageView; /// 公会 @property (nonatomic,strong)UILabel *guildLabel; /// 加入公会 @@ -234,6 +236,17 @@ make.width.mas_lessThanOrEqualTo(ScaleWidth(180)); }]; + + self.useCodeImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"mine_usercode_isLiang"]]; + self.useCodeImageView.hidden = YES; + [self addSubview:self.useCodeImageView]; + [self.useCodeImageView mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(self.idLabel.mas_right).offset(5); + make.height.mas_equalTo(11); + make.width.mas_equalTo(31); + make.centerY.equalTo(self.idLabel); + }]; + self.guildLabel = [[UILabel alloc] init]; self.guildLabel.font = [UIFont systemFontOfSize:12]; self.guildLabel.textColor = [UIColor whiteColor]; @@ -682,6 +695,11 @@ // }]; [weakSelf.collectionView reloadData]; weakSelf.idLabel.text = [NSString stringWithFormat:@"%@ ID:%@",model.sex.intValue==1?@"男":@"女",model.user_code]; + if (model.is_use_code.intValue == 1) { + weakSelf.useCodeImageView.hidden = NO; + }else{ + weakSelf.useCodeImageView.hidden = YES; + } weakSelf.guildLabel.text = [NSString stringWithFormat:@"所属公会:%@",[model.guild_name isExist]?model.guild_name:@"无"]; if ([model.me_guild_name isExist]) { weakSelf.joinGuildBtn.hidden = YES; diff --git a/QXLive/Room(房间)/View/练歌房/QXRoomSongListSubView.m b/QXLive/Room(房间)/View/练歌房/QXRoomSongListSubView.m index ac99f8b..0303089 100644 --- a/QXLive/Room(房间)/View/练歌房/QXRoomSongListSubView.m +++ b/QXLive/Room(房间)/View/练歌房/QXRoomSongListSubView.m @@ -97,8 +97,9 @@ } -(void)setIsSearch:(BOOL)isSearch{ _isSearch = isSearch; - self.searchBgView.hidden = !isSearch; - self.tableView.frame = CGRectMake(0, isSearch?self.searchBgView.bottom+10:6, self.width, isSearch?(self.height-self.searchBgView.bottom-10):self.height - 6); + self.textField.placeholder = isSearch?@"请输入歌名搜索":@"请输入用户id进行搜索"; +// self.searchBgView.hidden = !isSearch; +// self.tableView.frame = CGRectMake(0, isSearch?self.searchBgView.bottom+10:6, self.width, isSearch?(self.height-self.searchBgView.bottom-10):self.height - 6); } -(void)setRoomId:(NSString *)roomId{ @@ -146,7 +147,7 @@ self.tableView.mj_footer.state = MJRefreshStateNoMoreData; }else{ - [QXMineNetwork roomSongListWithRoomId:self.roomId successBlock:^(NSArray * _Nonnull list) { + [QXMineNetwork roomSongListWithRoomId:self.roomId search_user:self.textField.text successBlock:^(NSArray * _Nonnull list) { [weakSelf.dataArray removeAllObjects]; [weakSelf.dataArray addObjectsFromArray:list]; [weakSelf.tableView reloadData]; @@ -163,6 +164,10 @@ -(void)textDidChange:(UITextField*)textField{ + if (textField.text.length == 0) { + [self getSongList]; + return; + } if ([self isMarkedText]) { // 中文输入中，不回调 QXLOG(@"中文输入中，不回调"); @@ -220,14 +225,15 @@ [alertView showInView:self title:@"您确定要删除歌曲吗" message:[NSString stringWithFormat:@"歌曲名称：%@\n演唱者：%@ ",model.song_name,model.nickname] cancleTitle:@"取消" commitTitle:@"确定"]; MJWeakSelf alertView.commitBlock = ^{ -// [QXMineNetwork mineUserAddAndDeleteAndEditWithType:2 Id:model.id songName:model.song_name giftId:model.gift_id giftNum:model.gift_num successBlock:^(NSDictionary * _Nonnull dict) { -// showToast(@"删除成功"); -// weakSelf.page = 1; -// [weakSelf getSongList]; -// } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) { -// showToast(@"删除失败"); -// }]; - }; + [QXMineNetwork deleteRoomSongListWithRoomId:self.roomId did:model.did successBlock:^(NSDictionary * _Nonnull dict) { + showToast(@"删除成功"); + weakSelf.page = 0; + [weakSelf getSongList]; + } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) { + showToast(msg); + }]; + } + ; } -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{ diff --git a/QXLive/Room(房间)/View/麦位视图/QXRoomSeatBarView.m b/QXLive/Room(房间)/View/麦位视图/QXRoomSeatBarView.m index f2d47dc..8e2b657 100644 --- a/QXLive/Room(房间)/View/麦位视图/QXRoomSeatBarView.m +++ b/QXLive/Room(房间)/View/麦位视图/QXRoomSeatBarView.m @@ -1042,15 +1042,15 @@ -(void)playSeductionEffectWithPlayImage:(NSString *)playImage isMute:(BOOL)isMute{ MJWeakSelf if ([playImage hasPrefix:@"http"] || [playImage hasPrefix:@"https"]) { -// [[QXRequset shareInstance] downloadVideoPlayerWithUrl:playImage completion:^(BOOL result, NSString * _Nonnull fileName) { -// NSString *videoPath = [QXFileManager getGiftVideoPath:playImage.lastPathComponent]; -// weakSelf.mp4View.hidden = NO; -// [weakSelf.mp4View playHWDMP4:videoPath repeatCount:1 delegate:self]; -// }]; - self.mp4View.hidden = NO; - NSString *videoPath = [[NSBundle mainBundle] pathForResource:@"zizi" ofType:@"mp4"]; - [self.mp4View setMute:isMute]; - [self.mp4View playHWDMP4:videoPath repeatCount:1 delegate:self]; + [[QXRequset shareInstance] downloadVideoPlayerWithUrl:playImage completion:^(BOOL result, NSString * _Nonnull fileName) { + NSString *videoPath = [QXFileManager getGiftVideoPath:playImage.lastPathComponent]; + weakSelf.mp4View.hidden = NO; + [weakSelf.mp4View playHWDMP4:videoPath repeatCount:1 delegate:self]; + }]; +// self.mp4View.hidden = NO; +// NSString *videoPath = [[NSBundle mainBundle] pathForResource:@"zizi" ofType:@"mp4"]; +// [self.mp4View setMute:isMute]; +// [self.mp4View playHWDMP4:videoPath repeatCount:1 delegate:self]; } } diff --git a/QXLive/活动/巡乐会/QXMeetActivityResultView.m b/QXLive/活动/巡乐会/QXMeetActivityResultView.m index ca78b75..f8471d0 100644 --- a/QXLive/活动/巡乐会/QXMeetActivityResultView.m +++ b/QXLive/活动/巡乐会/QXMeetActivityResultView.m @@ -56,7 +56,7 @@ }]; self.againBtn = [[UIButton alloc] init]; - [self.againBtn setBackgroundImage:[UIImage imageNamed:@"ac_meet_again_btn"] forState:(UIControlStateNormal)]; + [self.againBtn setBackgroundImage:[UIImage imageNamed:@"ac_meet_in_bag"] forState:(UIControlStateNormal)]; [self.againBtn addTarget:self action:@selector(againAction) forControlEvents:(UIControlEventTouchUpInside)]; [self.bgView addSubview:self.againBtn]; [self.againBtn mas_makeConstraints:^(MASConstraintMaker *make) { @@ -112,9 +112,9 @@ -(void)againAction{ [self hide]; - if (self.againBlock) { - self.againBlock(self.times); - } +// if (self.againBlock) { +// self.againBlock(self.times); +// } } -(void)closeAction{ [self hide]; diff --git a/QXLive/活动/巡乐会/QXMeetActivityView.m b/QXLive/活动/巡乐会/QXMeetActivityView.m index a0e7160..87bb812 100644 --- a/QXLive/活动/巡乐会/QXMeetActivityView.m +++ b/QXLive/活动/巡乐会/QXMeetActivityView.m @@ -260,6 +260,7 @@ [self.jumpAnimateBtn setTitle:@"跳过动画" forState:(UIControlStateNormal)]; self.jumpAnimateBtn.titleLabel.font = [UIFont systemFontOfSize:12]; [self.jumpAnimateBtn setTitleColor:RGB16(0xffffff) forState:(UIControlStateNormal)]; + self.jumpAnimateBtn.hidden = YES; self.jumpAnimateBtn.centerY = self.coinView.centerY; [self.bgView addSubview:self.jumpAnimateBtn]; diff --git a/QXLive/活动/巡乐会/Resource/ac_meet_in_bag@2x.png b/QXLive/活动/巡乐会/Resource/ac_meet_in_bag@2x.png new file mode 100644 index 0000000..fd67233 Binary files /dev/null and b/QXLive/活动/巡乐会/Resource/ac_meet_in_bag@2x.png differ diff --git a/QXLive/活动/巡乐会/Resource/ac_meet_in_bag@3x.png b/QXLive/活动/巡乐会/Resource/ac_meet_in_bag@3x.png new file mode 100644 index 0000000..f6a4789 Binary files /dev/null and b/QXLive/活动/巡乐会/Resource/ac_meet_in_bag@3x.png differ