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

提交

Browse Source
This commit is contained in:
启星
2026-01-08 18:31:27 +08:00
parent 5ab030701c
commit 796f64f5e3
129 changed files with 5425 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
QXLive/Mine(音域)/Controller/钱包/QXCornRecordSubViewController.m
View File

@@ -16,6 +16,7 @@
@property (nonatomic,strong)NSString* startTime;
@property (nonatomic,strong)NSString* endTime;
@property (nonatomic,strong)NSString* last_id;
@end
@implementation QXCornRecordSubViewController
@@ -32,7 +33,7 @@
[dateBg addSubview:self.dateView];
[self.view addSubview:dateBg];
[self.view addSubview:self.tableView];
self.page = 1;
self.last_id = @"";
}
-(void)getData{
// [self.dataArray addObject:@""];
@@ -41,15 +42,17 @@
// [self.tableView reloadData];
//
__weak typeof(self) weakSelf = self;
[QXMineNetwork roomCoinOrDiamondDetailWithPage:self.page in_out_type:[NSString stringWithFormat:@"%ld",self.type+1] start_time:self.startTime end_time:self.endTime gift_type:[NSString stringWithFormat:@"%ld",self.waterType+1] successBlock:^(NSArray<QXCoinDetailModel *> * _Nonnull list) {
[QXMineNetwork roomCoinOrDiamondDetailWithLastId:self.last_id in_out_type:[NSString stringWithFormat:@"%ld",self.type+1] start_time:self.startTime end_time:self.endTime gift_type:[NSString stringWithFormat:@"%ld",self.waterType+1] successBlock:^(NSArray<QXCoinDetailModel *> * _Nonnull list) {
__strong typeof(weakSelf) strongSelf = weakSelf;
if (!strongSelf) {
NSLog(@"⚠️ self has been deallocated, skipping hide operation");
return;
}
if (strongSelf.page == 1) {
if (strongSelf.last_id.length == 0) {
[strongSelf.dataArray removeAllObjects];
}
QXCoinDetailModel *lastModel = list.lastObject;
weakSelf.last_id = lastModel.id;
[strongSelf.dataArray addObjectsFromArray:list];
[strongSelf.tableView reloadData];
if (list.count == 0) {
@@ -83,7 +86,7 @@
QXLOG(@"开始时间-%@ 结束时间-%@",startDateString,endDateString);
self.startTime = startDateString;
self.endTime = endDateString;
self.page = 1;
self.last_id = @"";
[self getData];
}
@@ -106,11 +109,10 @@
_tableView.rowHeight = UITableViewAutomaticDimension;
MJWeakSelf
_tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
weakSelf.page = 1;
weakSelf.last_id = @"";
[weakSelf getData];
}];
_tableView.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
weakSelf.page++;
[weakSelf getData];
}];
}

2
QXLive/Mine(音域)/Model/QXCoinDetailModel.h
View File

@@ -22,6 +22,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic,strong)NSString *remarks;
/// 时间
@property (nonatomic,strong)NSString *createtime;
/// 最后一个id
@property (nonatomic,strong)NSString *id;
@end

7
QXLive/Mine(音域)/Model/QXGiftModel.h
View File

@@ -14,7 +14,9 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic,strong)NSString *num;
/// 礼物名称
@property (nonatomic,strong)NSString *gift_name;
/// 礼物图片
/// 设置自定义礼物名称
@property (nonatomic,strong)NSString *gift_remark_name;
/// 礼物图片as
@property (nonatomic,strong)NSString *base_image;
/// 礼物特效
@property (nonatomic,strong)NSString *play_image;
@@ -41,6 +43,9 @@ NS_ASSUME_NONNULL_BEGIN
/// 是否为师徒标签
@property (nonatomic,strong)NSString *is_teacher;
/// 当前钱包余额
@property (nonatomic,strong)NSString *user_wallet_coin;
@property (nonatomic,assign)BOOL isSelected;
@end

9
QXLive/Mine(音域)/Model/QXRoomModel.h
View File

@@ -60,7 +60,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic,strong)NSString *room_cover;
/// 房间公告
@property (nonatomic,strong)NSString *room_intro;
/// 房间类型 type_id 1 点唱 2 拍卖 3男神 4女神 6小黑屋 7 交友房
/// 房间类型 type_id 1k歌+普通 2 拍卖 3男神 4女神 6小黑屋 7 交友房 9点唱 10签约房 11 酒吧房
@property (nonatomic,strong)NSString *type_id;
/// 房间子类型 label_id 1聊天 2 k歌 拍卖时 1真爱 2亲密
@property (nonatomic,strong)NSString *label_id;
@@ -82,6 +82,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic,strong)NSString *last_pk_room_id;
/// 排麦人数
@property (nonatomic,strong)NSString *queue_number;
/// 酒吧房撩人所需金币数
@property (nonatomic,strong)NSString *sexy_coin;
@end
@@ -128,6 +130,11 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic,strong)NSString *nickname_color;
@property (nonatomic,strong)NSString *is_online;
/// 酒吧房
/// 酒吧房麦位时长
@property (nonatomic,strong)NSString *end_time;
/// 是否有设置自定义礼物 0 没设置 1已设置
@property (nonatomic,assign)NSInteger had_custom_gift;
@property (nonatomic,assign)BOOL isSelected;
@end

2
QXLive/Mine(音域)/Model/QXUserModel.h
View File

@@ -140,6 +140,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic,strong)QXUserHomeModel *master;
@property (nonatomic,assign)NSInteger had_custom_gift;
-(instancetype)copyModel;
@end

21
QXLive/Mine(音域)/Model/酒吧房/QXRoomSeatTimeModel.h Normal file
View File

@@ -0,0 +1,21 @@
//
// QXRoomSeatTimeModel.h
// QXLive
//
// Created by 启星 on 2026/1/6.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
@interface QXRoomSeatTimeModel : NSObject
/// 时间
@property (nonatomic,strong)NSString *time;
/// 时间字符串
@property (nonatomic,strong)NSString *time_str;
@property (nonatomic,assign)BOOL isSelected;
@end
NS_ASSUME_NONNULL_END

12
QXLive/Mine(音域)/Model/酒吧房/QXRoomSeatTimeModel.m Normal file
View File

@@ -0,0 +1,12 @@
//
// QXRoomSeatTimeModel.m
// QXLive
//
// Created by 启星 on 2026/1/6.
//
#import "QXRoomSeatTimeModel.h"
@implementation QXRoomSeatTimeModel
@end

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

@@ -33,6 +33,7 @@
#import "QXFamilyModel.h"
#import "QXRoomActivityStatusModel.h"
#import "QXConfig.h"
#import "QXRoomSeatTimeModel.h"
NS_ASSUME_NONNULL_BEGIN
@@ -354,6 +355,7 @@ NS_ASSUME_NONNULL_BEGIN
heart_id:(NSString*)heart_id
type:(NSString*)type
pit_number:(NSString*)pit_number
gift_bag_id:(NSString*)gift_bag_id
successBlock:(void (^)(NSDictionary* dict))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
@@ -378,6 +380,7 @@ NS_ASSUME_NONNULL_BEGIN
*/
+(void)roomUpSeatWithRoomId:(NSString*)room_id
pit_number:(NSString*)pit_number
gift_id:(NSString*)gift_id
isUpSeat:(BOOL)isUpSeat
successBlock:(void (^)(NSDictionary* dict))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
@@ -831,7 +834,7 @@ NS_ASSUME_NONNULL_BEGIN
gift_type 1金币，2收益（钻石）
in_out_type 1收入2支出
*/
+(void)roomCoinOrDiamondDetailWithPage:(NSInteger)page
+(void)roomCoinOrDiamondDetailWithLastId:(NSString*)last_id
in_out_type:(NSString*)in_out_type
start_time:(NSString*)start_time
end_time:(NSString*)end_time
@@ -1493,6 +1496,81 @@ NS_ASSUME_NONNULL_BEGIN
num:(NSString*)num
successBlock:(void (^)(NSDictionary* dict))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
#pragma mark - 酒吧房
/**
label 礼物标签（类型）不传返回所有礼物，拍卖 传99 酒吧房自定义礼物 14 酒吧房普通礼物15 酒吧房小黑屋礼物 16 酒吧房撩TA礼物17
type 类型位置：1-房间送礼礼物，2-排麦设置插麦礼物，3-拍卖位选择拍卖礼物，4-歌手添加歌单礼物，5-动态打赏礼物 6酒吧房
新礼物列表
*/
+(void)getRoomNewGiftListWithLabel:(NSString*)label
type:(NSString*)type
successBlock:(void (^)(NSArray<QXGiftModel*>* list))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
/**
获取自定义礼物列表
*/
+(void)getRoomCustomGiftWithUserId:(NSString*)userId
successBlock:(void (^)(NSArray<QXGiftModel*>* list))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
/**
设置自定义礼物
*/
+(void)setRoomCustomGiftWithGiftId:(NSString*)gift_id
roomId:(NSString*)roomId
newGiftName:(NSString*)new_gift_name
successBlock:(void (^)(NSDictionary* dict))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
/**
获取酒吧房麦位时间列表
*/
+(void)getRoomSeatTimeListSuccessBlock:(void (^)(NSArray<QXRoomSeatTimeModel*>* list))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
/**
房间麦位时长设置
*/
+(void)setRoomSeatTimeWithRoomId:(NSString*)roomId
time:(NSString*)time
successBlock:(void (^)(NSDictionary* dict))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
/**
约Ta礼物详情
*/
+(void)roomAskUserGiftWithRoomId:(NSString*)roomId
toUserId:(NSString*)toUserId
successBlock:(void (^)(QXGiftModel* model))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
/**
撩他
*/
+(void)roomSeductionWithRoomId:(NSString*)roomId
to_user_id:(NSString*)to_user_id
type:(NSString*)type
successBlock:(void (^)(NSDictionary* dict))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
/**
约他
*/
+(void)roomBarAskWithRoomId:(NSString*)roomId
user_id:(NSString*)user_id
gift_id:(NSString*)gift_id
successBlock:(void (^)(NSDictionary* dict))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
@end

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

@@ -617,7 +617,7 @@
+(void)joinRoomWithRoomId:(NSString *)room_id successBlock:(nonnull void (^)(QXRoomModel * _Nonnull))successBlock roomErrorBlock:(nonnull void (^)(NSString * _Nonnull, NSString * _Nonnull))roomErrorBlock failBlock:(nonnull void (^)(NSError * _Nonnull, NSString * _Nonnull))failBlock{
NSDictionary *parameters =@{
@"room_id":room_id
@"room_id":room_id?:@""
};
[[QXRequset shareInstance] postWithUrl:QXJoinRoom parameters:parameters needCache:NO success:^(id responseObject) {
int code = [responseObject[@"code"] intValue];
@@ -719,6 +719,7 @@
heart_id:(NSString*)heart_id
type:(NSString*)type
pit_number:(NSString*)pit_number
gift_bag_id:(NSString*)gift_bag_id
successBlock:(void (^)(NSDictionary* dict))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock{
NSDictionary *parameters =@{
@@ -728,7 +729,8 @@
@"to_uid":to_uid?to_uid:@"",
@"type":type?type:@"",
@"pit_number":pit_number?pit_number:@"",
@"heart_id":heart_id?heart_id:@""
@"heart_id":heart_id?heart_id:@"",
@"gift_bag_id":gift_bag_id?:@"",
};
__block NSString *userId = to_uid;
[[QXRequset shareInstance] postWithUrl:QXSendGift parameters:parameters needCache:NO success:^(id responseObject) {
@@ -795,12 +797,14 @@
+(void)roomUpSeatWithRoomId:(NSString*)room_id
pit_number:(NSString*)pit_number
gift_id:(NSString*)gift_id
isUpSeat:(BOOL)isUpSeat
successBlock:(void (^)(NSDictionary* dict))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock{
NSDictionary *parameters =@{
@"room_id":room_id,
@"pit_number":pit_number?pit_number:@""
@"pit_number":pit_number?pit_number:@"",
@"gift_id":gift_id?:@""
};
[[QXRequset shareInstance] postWithUrl:isUpSeat?QXRoomUpSeat:QXRoomDownSeat parameters:parameters needCache:NO success:^(id responseObject) {
if (successBlock) {
@@ -1642,7 +1646,7 @@
}];
}
+(void)roomCoinOrDiamondDetailWithPage:(NSInteger)page
+(void)roomCoinOrDiamondDetailWithLastId:(NSString*)last_id
in_out_type:(NSString *)in_out_type
start_time:(NSString *)start_time
end_time:(NSString *)end_time
@@ -1650,11 +1654,11 @@
successBlock:(void (^)(NSArray<QXCoinDetailModel *> * _Nonnull))successBlock
failBlock:(void (^)(NSError * _Nonnull, NSString * _Nonnull))failBlock{
NSDictionary *parameters =@{
@"page":[NSNumber numberWithInteger:page],
@"last_id":last_id?:@"",
@"gift_type":gift_type?gift_type:@"",
@"start_time":start_time?start_time:@"",
@"end_time":end_time?end_time:@"",
@"in_out_type":in_out_type?in_out_type:@""
@"in_out_type":in_out_type?in_out_type:@"",
};
[[QXRequset shareInstance] postWithUrl:QXRoomCoinDetail parameters:parameters needCache:NO success:^(id responseObject) {
if (successBlock) {
@@ -3035,4 +3039,162 @@
failBlock(error,msg);
}];
}
#pragma mark - 酒吧房
+(void)getRoomNewGiftListWithLabel:(NSString*)label
type:(NSString*)type
successBlock:(void (^)(NSArray<QXGiftModel *> * _Nonnull))successBlock
failBlock:(void (^)(NSError * _Nonnull, NSString * _Nonnull))failBlock{
[[QXRequset shareInstance] getWithUrl:QXRoomNewGiftList parameters:@{@"label":label?:@"",@"type":type?:@""} needCache:NO success:^(id responseObject) {
if (successBlock) {
NSArray*list = [NSArray yy_modelArrayWithClass:[QXGiftModel class] json:responseObject[@"data"]];
successBlock(list);
}
} fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
failBlock(error,msg);
}];
}
/**
获取自定义礼物列表
*/
+(void)getRoomCustomGiftWithUserId:(NSString*)userId
successBlock:(void (^)(NSArray<QXGiftModel*>* list))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock{
NSDictionary *parameters =@{
@"user_id":userId?:@"",
};
[[QXRequset shareInstance] getWithUrl:QXRoomCustomGiftList parameters:parameters needCache:NO success:^(id responseObject) {
if (successBlock) {
NSArray*list = [NSArray yy_modelArrayWithClass:[QXGiftModel class] json:responseObject[@"data"]];
successBlock(list);
}
} fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
failBlock(error,msg);
}];
}
/**
设置自定义礼物
*/
+(void)setRoomCustomGiftWithGiftId:(NSString*)gift_id
roomId:(NSString*)roomId
newGiftName:(NSString*)new_gift_name
successBlock:(void (^)(NSDictionary* dict))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock{
NSDictionary *parameters =@{
@"gift_id":gift_id?:@"",
@"gift_remark_name":new_gift_name?:@""
};
[[QXRequset shareInstance] postWithUrl:QXRoomSetCustom parameters:parameters needCache:NO success:^(id responseObject) {
if (successBlock) {
successBlock(responseObject[@"data"]);
}
} fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
failBlock(error,msg);
}];
}
/**
获取酒吧房麦位时间列表
*/
+(void)getRoomSeatTimeListSuccessBlock:(void (^)(NSArray<QXRoomSeatTimeModel*>* list))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock{
[[QXRequset shareInstance] getWithUrl:QXRoomSeatTimeList parameters:@{} needCache:NO success:^(id responseObject) {
if (successBlock) {
NSArray*list = [NSArray yy_modelArrayWithClass:[QXRoomSeatTimeModel class] json:responseObject[@"data"]];
successBlock(list);
}
} fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
failBlock(error,msg);
}];
}
/**
房间麦位时长设置
*/
+(void)setRoomSeatTimeWithRoomId:(NSString*)roomId
time:(NSString*)time
successBlock:(void (^)(NSDictionary* dict))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock{
NSDictionary *parameters =@{
@"room_id":roomId?:@"",
@"time":time?:@""
};
[[QXRequset shareInstance] postWithUrl:QXRoomSetSeatTime parameters:parameters needCache:NO success:^(id responseObject) {
if (successBlock) {
successBlock(responseObject[@"data"]);
}
} fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
failBlock(error,msg);
}];
}
/**
约Ta礼物详情
*/
+(void)roomAskUserGiftWithRoomId:(NSString*)roomId
toUserId:(NSString*)toUserId
successBlock:(void (^)(QXGiftModel* model))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock{
NSDictionary *parameters =@{
@"room_id":roomId?:@"",
@"to_user_id":toUserId?:@""
};
[[QXRequset shareInstance] getWithUrl:QXRoomGetSeatGift parameters:parameters needCache:NO success:^(id responseObject) {
if (successBlock) {
QXGiftModel *model = [QXGiftModel yy_modelWithJSON:responseObject[@"data"]];
successBlock(model);
}
} fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
failBlock(error,msg);
}];
}
/**
撩他
*/
+(void)roomSeductionWithRoomId:(NSString*)roomId
to_user_id:(NSString*)to_user_id
type:(NSString*)type
successBlock:(void (^)(NSDictionary* dict))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock{
NSDictionary *parameters =@{
@"room_id":roomId?:@"",
@"to_user_id":to_user_id?:@"",
@"type":type?:@""
};
[[QXRequset shareInstance] postWithUrl:QXRoomBarSeduction parameters:parameters needCache:NO success:^(id responseObject) {
if (successBlock) {
successBlock(responseObject[@"data"]);
}
} fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
failBlock(error,msg);
}];
}
/**
约她
*/
+(void)roomBarAskWithRoomId:(NSString *)roomId
user_id:(nonnull NSString *)user_id
gift_id:(nonnull NSString *)gift_id
successBlock:(nonnull void (^)(NSDictionary * _Nonnull))successBlock
failBlock:(nonnull void (^)(NSError * _Nonnull, NSString * _Nonnull))failBlock{
NSDictionary *parameters =@{
@"room_id":roomId?:@"",
@"user_id":user_id?:@"",
@"gift_id":gift_id?:@""
};
[[QXRequset shareInstance] postWithUrl:QXRoomBarAsk parameters:parameters needCache:NO success:^(id responseObject) {
if (successBlock) {
successBlock(responseObject[@"data"]);
}
} fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
failBlock(error,msg);
}];
}
@end