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

预上线

Browse Source
This commit is contained in:
启星
2026-01-13 09:45:03 +08:00
parent d41d74dd8e
commit 705d891c51
12 changed files with 97 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
QXLive.xcodeproj/project.pbxproj
View File

@@ -793,7 +793,7 @@
"$(inherited)", "$(inherited)",
"$(SDKROOT)/usr/lib/swift", "$(SDKROOT)/usr/lib/swift",
); );
MARKETING_VERSION = 1.2.0; MARKETING_VERSION = 1.1.16;
PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive; PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
@@ -859,7 +859,7 @@
"$(inherited)", "$(inherited)",
"$(SDKROOT)/usr/lib/swift", "$(SDKROOT)/usr/lib/swift",
); );
MARKETING_VERSION = 1.2.0; MARKETING_VERSION = 1.1.16;
PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive; PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";

10
QXLive/Mine(音域)/Services/QXMineNetwork.h
View File

@@ -545,9 +545,19 @@ NS_ASSUME_NONNULL_BEGIN
已点歌曲列表 已点歌曲列表
*/ */
+(void)roomSongListWithRoomId:(NSString*)room_id +(void)roomSongListWithRoomId:(NSString*)room_id
search_user:(NSString*)search_user
successBlock:(void (^)(NSArray<QXSongListModel*>*list))successBlock successBlock:(void (^)(NSArray<QXSongListModel*>*list))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock; 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歌房间 魅力排行 k歌房间 魅力排行
*/ */

30
QXLive/Mine(音域)/Services/QXMineNetwork.m
View File

@@ -1109,11 +1109,16 @@
failBlock(error,msg); failBlock(error,msg);
}]; }];
} }
+(void)roomSongListWithRoomId:(NSString *)room_id successBlock:(void (^)(NSArray<QXSongListModel *> * _Nonnull))successBlock failBlock:(void (^)(NSError * _Nonnull, NSString * _Nonnull))failBlock{ +(void)roomSongListWithRoomId:(NSString *)room_id search_user:(NSString*)search_user successBlock:(void (^)(NSArray<QXSongListModel *> * _Nonnull))successBlock failBlock:(void (^)(NSError * _Nonnull, NSString * _Nonnull))failBlock{
NSDictionary *parameters =@{ NSDictionary *parameters =@{
@"room_id":room_id, @"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) { if (successBlock) {
NSArray *list = [NSArray yy_modelArrayWithClass:[QXSongListModel class] json:responseObject[@"data"]]; NSArray *list = [NSArray yy_modelArrayWithClass:[QXSongListModel class] json:responseObject[@"data"]];
successBlock(list); successBlock(list);
@@ -1122,6 +1127,27 @@
failBlock(error,msg); 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<QXRoomPitModel *> * _Nonnull))successBlock failBlock:(void (^)(NSError * _Nonnull, NSString * _Nonnull))failBlock{ +(void)roomCharmRankListWithRoomId:(NSString *)room_id successBlock:(void (^)(NSArray<QXRoomPitModel *> * _Nonnull))successBlock failBlock:(void (^)(NSError * _Nonnull, NSString * _Nonnull))failBlock{
NSDictionary *parameters =@{ NSDictionary *parameters =@{
@"room_id":room_id, @"room_id":room_id,

8
QXLive/Other/QXApi.h
View File

@@ -16,6 +16,8 @@
//tadmin.xscmmidi.site --管理后台 //tadmin.xscmmidi.site --管理后台
//tmd.xscmmidi.site -- 这是接口 api //tmd.xscmmidi.site -- 这是接口 api
#if DEVELOPENT == 1 #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* ServerUrl = @"https://test.vespa.qxyushen.top/";
static NSString* H5ServerUrl = @"https://test.vespa.qxyushen.top/h5/"; static NSString* H5ServerUrl = @"https://test.vespa.qxyushen.top/h5/";
static NSString* RServerUrl = @"https://test.vespa.qxyushen.top/"; 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* H5ServerUrl = @"https://test.vespa.qxyushen.top/h5/";
//static NSString* ServerUrl = @"https://vespa.qxyushen.top/"; //static NSString* ServerUrl = @"https://vespa.qxyushen.top/";
//static NSString* H5ServerUrl = @"https://vespa.qxyushen.top/h5/"; //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* ServerUrl = @"https://yushengapi.qxyushen.top/";
static NSString* H5ServerUrl = @"https://yushengapi.qxyushen.top/h5/"; static NSString* H5ServerUrl = @"https://yushengapi.qxyushen.top/h5/";
static NSString* RServerUrl = @"https://details.qxhs.xyz/"; 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 * QXRoomNextSong = @"api/RoomSong/change_song";
/// 已点歌曲列表 /// 已点歌曲列表
static NSString * QXRoomSongList = @"api/RoomSong/song_list"; 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"; static NSString * QXRoomEndSong = @"api/RoomSong/end_song";
/// 魅力排行 /// 魅力排行

BIN
QXLive/Other/Resource/zizi.mp4
View File

Binary file not shown.

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

@@ -44,6 +44,8 @@
@property (nonatomic,strong)UIImageView *sexImageView; @property (nonatomic,strong)UIImageView *sexImageView;
/// ID /// ID
@property (nonatomic,strong)UILabel *idLabel; @property (nonatomic,strong)UILabel *idLabel;
/// 靓号
@property (nonatomic,strong)UIImageView *useCodeImageView;
/// 公会 /// 公会
@property (nonatomic,strong)UILabel *guildLabel; @property (nonatomic,strong)UILabel *guildLabel;
/// 加入公会 /// 加入公会
@@ -234,6 +236,17 @@
make.width.mas_lessThanOrEqualTo(ScaleWidth(180)); 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 = [[UILabel alloc] init];
self.guildLabel.font = [UIFont systemFontOfSize:12]; self.guildLabel.font = [UIFont systemFontOfSize:12];
self.guildLabel.textColor = [UIColor whiteColor]; self.guildLabel.textColor = [UIColor whiteColor];
@@ -682,6 +695,11 @@
// }]; // }];
[weakSelf.collectionView reloadData]; [weakSelf.collectionView reloadData];
weakSelf.idLabel.text = [NSString stringWithFormat:@"%@ ID:%@",model.sex.intValue==1?@"男":@"女",model.user_code]; 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:@"无"]; weakSelf.guildLabel.text = [NSString stringWithFormat:@"所属公会:%@",[model.guild_name isExist]?model.guild_name:@"无"];
if ([model.me_guild_name isExist]) { if ([model.me_guild_name isExist]) {
weakSelf.joinGuildBtn.hidden = YES; weakSelf.joinGuildBtn.hidden = YES;

28
QXLive/Room(房间)/View/练歌房/QXRoomSongListSubView.m
View File

@@ -97,8 +97,9 @@
} }
-(void)setIsSearch:(BOOL)isSearch{ -(void)setIsSearch:(BOOL)isSearch{
_isSearch = isSearch; _isSearch = isSearch;
self.searchBgView.hidden = !isSearch; self.textField.placeholder = isSearch?@"请输入歌名搜索":@"请输入用户id进行搜索";
self.tableView.frame = CGRectMake(0, isSearch?self.searchBgView.bottom+10:6, self.width, isSearch?(self.height-self.searchBgView.bottom-10):self.height - 6); // 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{ -(void)setRoomId:(NSString *)roomId{
@@ -146,7 +147,7 @@
self.tableView.mj_footer.state = MJRefreshStateNoMoreData; self.tableView.mj_footer.state = MJRefreshStateNoMoreData;
}else{ }else{
[QXMineNetwork roomSongListWithRoomId:self.roomId successBlock:^(NSArray<QXSongListModel *> * _Nonnull list) { [QXMineNetwork roomSongListWithRoomId:self.roomId search_user:self.textField.text successBlock:^(NSArray<QXSongListModel *> * _Nonnull list) {
[weakSelf.dataArray removeAllObjects]; [weakSelf.dataArray removeAllObjects];
[weakSelf.dataArray addObjectsFromArray:list]; [weakSelf.dataArray addObjectsFromArray:list];
[weakSelf.tableView reloadData]; [weakSelf.tableView reloadData];
@@ -163,6 +164,10 @@
-(void)textDidChange:(UITextField*)textField{ -(void)textDidChange:(UITextField*)textField{
if (textField.text.length == 0) {
[self getSongList];
return;
}
if ([self isMarkedText]) { if ([self isMarkedText]) {
// 中文输入中，不回调 // 中文输入中，不回调
QXLOG(@"中文输入中，不回调"); QXLOG(@"中文输入中，不回调");
@@ -220,14 +225,15 @@
[alertView showInView:self title:@"您确定要删除歌曲吗" message:[NSString stringWithFormat:@"歌曲名称：%@\n演唱者：%@ ",model.song_name,model.nickname] cancleTitle:@"取消" commitTitle:@"确定"]; [alertView showInView:self title:@"您确定要删除歌曲吗" message:[NSString stringWithFormat:@"歌曲名称：%@\n演唱者：%@ ",model.song_name,model.nickname] cancleTitle:@"取消" commitTitle:@"确定"];
MJWeakSelf MJWeakSelf
alertView.commitBlock = ^{ alertView.commitBlock = ^{
// [QXMineNetwork mineUserAddAndDeleteAndEditWithType:2 Id:model.id songName:model.song_name giftId:model.gift_id giftNum:model.gift_num successBlock:^(NSDictionary * _Nonnull dict) { [QXMineNetwork deleteRoomSongListWithRoomId:self.roomId did:model.did successBlock:^(NSDictionary * _Nonnull dict) {
// showToast(@"删除成功"); showToast(@"删除成功");
// weakSelf.page = 1; weakSelf.page = 0;
// [weakSelf getSongList]; [weakSelf getSongList];
// } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) { } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
// showToast(@"删除失败"); showToast(msg);
// }]; }];
}; }
;
} }
-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{ -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{

18
QXLive/Room(房间)/View/麦位视图/QXRoomSeatBarView.m
View File

@@ -1042,15 +1042,15 @@
-(void)playSeductionEffectWithPlayImage:(NSString *)playImage isMute:(BOOL)isMute{ -(void)playSeductionEffectWithPlayImage:(NSString *)playImage isMute:(BOOL)isMute{
MJWeakSelf MJWeakSelf
if ([playImage hasPrefix:@"http"] || [playImage hasPrefix:@"https"]) { if ([playImage hasPrefix:@"http"] || [playImage hasPrefix:@"https"]) {
// [[QXRequset shareInstance] downloadVideoPlayerWithUrl:playImage completion:^(BOOL result, NSString * _Nonnull fileName) { [[QXRequset shareInstance] downloadVideoPlayerWithUrl:playImage completion:^(BOOL result, NSString * _Nonnull fileName) {
// NSString *videoPath = [QXFileManager getGiftVideoPath:playImage.lastPathComponent]; NSString *videoPath = [QXFileManager getGiftVideoPath:playImage.lastPathComponent];
// weakSelf.mp4View.hidden = NO; weakSelf.mp4View.hidden = NO;
// [weakSelf.mp4View playHWDMP4:videoPath repeatCount:1 delegate:self]; [weakSelf.mp4View playHWDMP4:videoPath repeatCount:1 delegate:self];
// }]; }];
self.mp4View.hidden = NO; // self.mp4View.hidden = NO;
NSString *videoPath = [[NSBundle mainBundle] pathForResource:@"zizi" ofType:@"mp4"]; // NSString *videoPath = [[NSBundle mainBundle] pathForResource:@"zizi" ofType:@"mp4"];
[self.mp4View setMute:isMute]; // [self.mp4View setMute:isMute];
[self.mp4View playHWDMP4:videoPath repeatCount:1 delegate:self]; // [self.mp4View playHWDMP4:videoPath repeatCount:1 delegate:self];
} }
} }

8
QXLive/活动/巡乐会/QXMeetActivityResultView.m
View File

@@ -56,7 +56,7 @@
}]; }];
self.againBtn = [[UIButton alloc] init]; 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.againBtn addTarget:self action:@selector(againAction) forControlEvents:(UIControlEventTouchUpInside)];
[self.bgView addSubview:self.againBtn]; [self.bgView addSubview:self.againBtn];
[self.againBtn mas_makeConstraints:^(MASConstraintMaker *make) { [self.againBtn mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -112,9 +112,9 @@
-(void)againAction{ -(void)againAction{
[self hide]; [self hide];
if (self.againBlock) { // if (self.againBlock) {
self.againBlock(self.times); // self.againBlock(self.times);
} // }
} }
-(void)closeAction{ -(void)closeAction{
[self hide]; [self hide];

1
QXLive/活动/巡乐会/QXMeetActivityView.m
View File

@@ -260,6 +260,7 @@
[self.jumpAnimateBtn setTitle:@"跳过动画" forState:(UIControlStateNormal)]; [self.jumpAnimateBtn setTitle:@"跳过动画" forState:(UIControlStateNormal)];
self.jumpAnimateBtn.titleLabel.font = [UIFont systemFontOfSize:12]; self.jumpAnimateBtn.titleLabel.font = [UIFont systemFontOfSize:12];
[self.jumpAnimateBtn setTitleColor:RGB16(0xffffff) forState:(UIControlStateNormal)]; [self.jumpAnimateBtn setTitleColor:RGB16(0xffffff) forState:(UIControlStateNormal)];
self.jumpAnimateBtn.hidden = YES;
self.jumpAnimateBtn.centerY = self.coinView.centerY; self.jumpAnimateBtn.centerY = self.coinView.centerY;
[self.bgView addSubview:self.jumpAnimateBtn]; [self.bgView addSubview:self.jumpAnimateBtn];

BIN
QXLive/活动/巡乐会/Resource/ac_meet_in_bag@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 46 KiB

BIN
QXLive/活动/巡乐会/Resource/ac_meet_in_bag@3x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 94 KiB