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

版本1.1.18

Browse Source
This commit is contained in:
启星
2026-01-21 14:25:45 +08:00
parent 081aa5622c
commit 491b97f3cb
53 changed files with 1125 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
QXLive/Mine(音域)/Controller/QXMineViewController.m
View File

@@ -278,19 +278,19 @@
break;
case QXMainHeaderOptionTypeWallet:{
QXLOG(@"跳转钱包");
BOOL result = [[NSUserDefaults standardUserDefaults] boolForKey:kWalletRuleHide];
if (result) {
QXWalletViewController * vc = [[QXWalletViewController alloc] init];
[self.navigationController pushViewController:vc animated:YES];
}else{
QXWalletRuleView *ruleView = [[QXWalletRuleView alloc] init];
MJWeakSelf
ruleView.toWalletBlock = ^{
QXWalletViewController*vc = [[QXWalletViewController alloc] init];
[weakSelf.navigationController pushViewController:vc animated:YES];
};
[ruleView showInView:self.view];
}
// BOOL result = [[NSUserDefaults standardUserDefaults] boolForKey:kWalletRuleHide];
// if (result) {
QXWalletViewController * vc = [[QXWalletViewController alloc] init];
[self.navigationController pushViewController:vc animated:YES];
// }else{
// QXWalletRuleView *ruleView = [[QXWalletRuleView alloc] init];
// MJWeakSelf
// ruleView.toWalletBlock = ^{
// QXWalletViewController*vc = [[QXWalletViewController alloc] init];
// [weakSelf.navigationController pushViewController:vc animated:YES];
// };
// [ruleView showInView:self.view];
// }
}
break;
case QXMainHeaderOptionTypeRoom:{

106
QXLive/Mine(音域)/Controller/我的房间/QXCreateRoomViewController.m
View File

@@ -14,6 +14,7 @@
#import "QXTimer.h"
#import "QXMineNetwork.h"
#import "QXCOSUploadManager.h"
//#import "QXRoomDetailHeaderView.h"
@interface QXCreateRoomViewController ()<UITextFieldDelegate>
@property (nonatomic,strong) UILabel *roomCoverLabel;
@@ -36,8 +37,13 @@
@property (nonatomic,strong) UIButton *submitBtn; ///< 提交
@property (nonatomic,assign)NSInteger selectedIndex;
@property (nonatomic,strong) QXTimer *timer;
//@property (nonatomic,strong) UILabel *timeTitleLabel;
//@property (nonatomic,strong) UILabel *startLabel;
//@property (nonatomic,strong) UILabel *lineLabel;
//@property (nonatomic,strong) UILabel *endLabel;
@property (nonatomic,strong) QXTimer *timer;
//@property (nonatomic,strong)QXDatePickerView* pickerView;
@end
@implementation QXCreateRoomViewController
@@ -116,6 +122,34 @@
make.right.equalTo(self.deleteBtn.mas_left).offset(-4);
}];
// [self.view addSubview:self.timeTitleLabel];
// [self.view addSubview:self.startLabel];
// [self.view addSubview:self.lineLabel];
// [self.view addSubview:self.endLabel];
// [self.timeTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
// make.top.equalTo(self.textFieldbgView.mas_bottom).offset(12);
// make.left.equalTo(self.roomNameLabel);
// make.height.mas_equalTo(24);
// }];
// [self.lineLabel mas_makeConstraints:^(MASConstraintMaker *make) {
// make.top.equalTo(self.timeTitleLabel.mas_bottom).offset(12);
// make.centerX.equalTo(self.view);
// make.height.mas_equalTo(44);
// make.width.mas_equalTo(20);
// }];
//
// [self.startLabel mas_makeConstraints:^(MASConstraintMaker *make) {
// make.top.equalTo(self.timeTitleLabel.mas_bottom).offset(12);
// make.left.equalTo(self.roomNameLabel);
// make.height.mas_equalTo(44);
// make.right.equalTo(self.lineLabel.mas_left).offset(-3);
// }];
// [self.endLabel mas_makeConstraints:^(MASConstraintMaker *make) {
// make.top.equalTo(self.timeTitleLabel.mas_bottom).offset(12);
// make.left.equalTo(self.lineLabel.mas_right).offset(3);
// make.height.mas_equalTo(44);
// make.right.mas_equalTo(-16);
// }];
[self.view addSubview:self.roomNoticeLabel];
@@ -325,6 +359,9 @@
// sender.selected = !sender.selected;
// self.typeBtn = sender;
//}
//-(void)selectedTimeAction{
// [self.pickerView show];
//}
- (void)onSubmitBtnClick:(UIButton *)btn {
[self requestCreateMineRoomData];
@@ -385,6 +422,58 @@
}
return _roomNoticeLabel;
}
//-(UILabel *)timeTitleLabel{
// if (!_timeTitleLabel) {
// _timeTitleLabel = [[UILabel alloc] init];
// _timeTitleLabel.font = [UIFont boldSystemFontOfSize:15];
// _timeTitleLabel.textColor = RGB16A(0x000000, 0.45);
// _timeTitleLabel.text = @"营业时间";
// }
// return _timeTitleLabel;
//}
//-(UILabel *)startLabel{
// if (!_startLabel) {
// _startLabel = [[UILabel alloc] init];
// _startLabel.font = [UIFont boldSystemFontOfSize:15];
// _startLabel.textColor = RGB16(333333);
// _startLabel.text = @"00:00";
// _startLabel.backgroundColor = [UIColor colorWithHexString:@"#F0EEF7"];
// [_startLabel addRoundedCornersWithRadius:11];
// _startLabel.textAlignment = NSTextAlignmentCenter;
// MJWeakSelf
// [_startLabel addTapBlock:^(id _Nonnull obj) {
// [weakSelf selectedTimeAction];
// }];
// }
// return _startLabel;
//}
//-(UILabel *)lineLabel{
// if (!_lineLabel) {
// _lineLabel = [[UILabel alloc] init];
// _lineLabel.font = [UIFont boldSystemFontOfSize:15];
// _lineLabel.textColor = RGB16(333333);
// _lineLabel.text = @"-";
// _lineLabel.textAlignment = NSTextAlignmentCenter;
// }
// return _lineLabel;
//}
//-(UILabel *)endLabel{
// if (!_endLabel) {
// _endLabel = [[UILabel alloc] init];
// _endLabel.font = [UIFont boldSystemFontOfSize:15];
// _endLabel.textColor = RGB16(333333);
// _endLabel.text = @"24:00";
// _endLabel.backgroundColor = [UIColor colorWithHexString:@"#F0EEF7"];
// [_endLabel addRoundedCornersWithRadius:11];
// _endLabel.textAlignment = NSTextAlignmentCenter;
// MJWeakSelf
// [_endLabel addTapBlock:^(id _Nonnull obj) {
// [weakSelf selectedTimeAction];
// }];
// }
// return _endLabel;
//}
-(UILabel *)roomCoverLabel{
if (!_roomCoverLabel) {
@@ -467,4 +556,19 @@
}
return _warningLabel;
}
//-(QXDatePickerView *)pickerView{
// if (!_pickerView) {
// _pickerView = [[QXDatePickerView alloc] init];
// _pickerView.pickerView.pickerMode = BRDatePickerModeHM;
// _pickerView.pickerView.maxDate = [NSDate br_setHour:23 minute:59];
// _pickerView.pickerView.minDate = [NSDate br_setHour:00 minute:00];
// _pickerView.pickerView.selectDate = [NSDate br_setHour:00 minute:00];
// MJWeakSelf
// _pickerView.chooseDateBlock = ^(NSString * _Nonnull startTime, NSString * _Nonnull endTime) {
// weakSelf.startLabel.text = startTime;
// weakSelf.endLabel.text = endTime;
// };
// }
// return _pickerView;
//}
@end

4
QXLive/Mine(音域)/Controller/钱包/QXAliBindViewController.m
View File

@@ -88,7 +88,7 @@
weakSelf.bankNumberTextField.textField.text = bank_card_number;
}
if ([bank_card isExist]) {
weakSelf.bankNumberTextField.textField.text = bank_card_number;
weakSelf.bankNameTextField.textField.text = bank_card;
}
if ([open_bank isExist]) {
weakSelf.bankAddressTextField.textField.text = open_bank;
@@ -107,7 +107,7 @@
[QXMineNetwork walletBindWithUserId:QXGlobal.shareGlobal.loginModel.user_id type:self.model.type alipay_account:self.aliTextField.textField.text bank_card_number:self.bankNumberTextField.textField.text bank_card:self.bankNameTextField.textField.text open_bank:self.bankAddressTextField.textField.text successBlock:^(NSDictionary * _Nonnull dict) {
[weakSelf.navigationController popViewControllerAnimated:YES];
} failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
showToast(msg);
}];;
}
@end

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

@@ -84,6 +84,10 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic,strong)NSString *queue_number;
/// 酒吧房撩人所需金币数
@property (nonatomic,strong)NSString *sexy_coin;
/// 酒吧房撩人所需金币数
@property (nonatomic,strong)NSString *start_time;
/// 酒吧房撩人所需金币数
@property (nonatomic,strong)NSString *end_time;
@end
@@ -357,6 +361,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic,strong)NSString *receive_type;
/// 是否接受pk 1 接收 2不接受
@property (nonatomic,strong)NSString *is_pk;
/// 被闭麦用户
@property (nonatomic,strong)NSString *close_users;
@end

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

@@ -133,8 +133,10 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic,strong)NSString *is_use_code;
@property (nonatomic,strong)NSString *in_room_id;
/// 是否被禁言
@property (nonatomic,strong)NSString *is_mute;
/// 群组角色 1 是群主 2管理员 3群成员 4非群成员
@property (nonatomic,strong)NSString *group_role;
@property (nonatomic,strong)QXUserCpInfoModel *cp_info;

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

@@ -662,7 +662,7 @@ NS_ASSUME_NONNULL_BEGIN
/**
拍卖房关系列表
1真爱拍 2 亲密拍
1真爱拍 2 亲密拍 3 星球房
*/
+(void)roomRelationListWithType:(NSString*)type
successBlock:(void (^)(NSArray<QXRoomRelationModel*>*list))successBlock
@@ -1587,7 +1587,23 @@ NS_ASSUME_NONNULL_BEGIN
successBlock:(void (^)(NSArray* list))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
/**
设置房间营业时间
*/
+(void)roomSetTimeWithRoomId:(NSString*)roomId
start_time:(NSString*)start_time
end_time:(NSString*)end_time
successBlock:(void (^)(NSDictionary* dict))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
/**
pk闭麦
*/
+(void)roomPkCloseMicWithPkId:(NSString*)pk_id
type:(NSString*)type
user_id:(NSString*)user_id
successBlock:(void (^)(NSDictionary* dict))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
@end

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

@@ -3110,6 +3110,7 @@
successBlock:(void (^)(NSDictionary* dict))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock{
NSDictionary *parameters =@{
@"room_id":roomId?:@"",
@"gift_id":gift_id?:@"",
@"gift_remark_name":new_gift_name?:@""
};
@@ -3246,5 +3247,47 @@
failBlock(error,msg);
}];
}
/**
设置房间营业时间
*/
+(void)roomSetTimeWithRoomId:(NSString*)roomId
start_time:(NSString*)start_time
end_time:(NSString*)end_time
successBlock:(void (^)(NSDictionary* dict))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock{
NSDictionary *parameters =@{
@"room_id":roomId?:@"",
@"start_time":start_time?:@"",
@"end_time":end_time?:@""
};
[[QXRequset shareInstance] postWithUrl:QXRoomSetTime parameters:parameters needCache:NO success:^(id responseObject) {
if (successBlock) {
successBlock(responseObject[@"data"]);
}
} fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
failBlock(error,msg);
}];
}
/**
pk闭麦
*/
+(void)roomPkCloseMicWithPkId:(NSString*)pk_id
type:(NSString*)type
user_id:(NSString*)user_id
successBlock:(void (^)(NSDictionary* dict))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock{
NSDictionary *parameters =@{
@"pk_id":pk_id?:@"",
@"type":type?:@"",
@"user_id":user_id?:@""
};
[[QXRequset shareInstance] postWithUrl:QXRoomPKCloseMic parameters:parameters needCache:NO success:^(id responseObject) {
if (successBlock) {
successBlock(responseObject[@"data"]);
}
} fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
failBlock(error,msg);
}];
}
@end

3
QXLive/Mine(音域)/View/个人主页/QXUserHomeHeaderView.m
View File

@@ -250,7 +250,7 @@
[self.guildBgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.headerView.mas_right);
make.height.mas_equalTo(31);
make.bottom.equalTo(self.headerView).offset(-10);
make.bottom.equalTo(self.headerView).offset(5);
make.width.mas_equalTo(94);
}];
@@ -350,6 +350,7 @@
make.top.equalTo(self.cpCardView.mas_bottom).offset(8);
}];
[self.whiteBgView bringSubviewToFront:self.playBtn];
[self.whiteBgView bringSubviewToFront:self.toRoomBtn];
[self bringSubviewToFront:self.followBtn];
}

1
QXLive/Mine(音域)/View/我的房间/QXRoomDetailHeaderView.h
View File

@@ -19,6 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic,strong)UIView *bgView;
@property (nonatomic,strong)UIButton *cancelBtn;
@property (nonatomic,strong)UIButton *doneBtn;
@property (nonatomic,assign)BOOL isNoCompareDate;
@property (nonatomic,strong)UIButton *beginTimeBtn;
@property (nonatomic,strong)UIView *beginTimeLine;

42
QXLive/Mine(音域)/View/我的房间/QXRoomDetailHeaderView.m
View File

@@ -228,6 +228,9 @@
}
@end
@interface QXDatePickerView ()<UIGestureRecognizerDelegate>
@end
@implementation QXDatePickerView
- (instancetype)initWithFrame:(CGRect)frame
@@ -242,6 +245,11 @@
-(void)createViews{
self.backgroundColor = [UIColor colorWithWhite:0.0 alpha:0.5];
self.bgView = [[UIView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT, SCREEN_WIDTH, ScaleWidth(400))];
UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(hide)];
tap.delegate = self;
[self addGestureRecognizer:tap];
self.bgView.backgroundColor = [UIColor whiteColor];
[self.bgView addRoundedCornersWithRadius:16 byRoundingCorners:(UIRectCornerTopLeft|UIRectCornerTopRight)];
[self addSubview:self.bgView];
@@ -296,13 +304,19 @@
[self.pickerView addPickerToView:self.pickerBGView];
[self beginTimeAction];
}
-(BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch{
return touch.view == self;
}
-(void)beginTimeAction{
self.beginTimeBtn.selected = YES;
self.beginTimeLine.backgroundColor = [UIColor colorWithHexString:@"#333333"];
self.endTimeBtn.selected = NO;
self.endTimeLine.backgroundColor = [UIColor colorWithHexString:@"#BBBBBB"];
if (self.beginDate) {
self.pickerView.selectDate = self.beginDate;
}
}
-(void)endTimeAction{
@@ -311,10 +325,26 @@
self.beginTimeBtn.selected = NO;
self.beginTimeLine.backgroundColor = [UIColor colorWithHexString:@"#BBBBBB"];
if (self.endDate) {
self.pickerView.selectDate = self.endDate;
}
}
-(void)cancelAction{
[self hide];
}
-(void)setIsNoCompareDate:(BOOL)isNoCompareDate{
_isNoCompareDate = isNoCompareDate;
}
-(void)setBeginDate:(NSDate *)beginDate{
_beginDate = beginDate;
[self.beginTimeBtn setTitle:[NSString stringWithFormat:@"%02ld:%02ld",(long)beginDate.br_hour,beginDate.br_minute] forState:(UIControlStateNormal)];
}
-(void)setEndDate:(NSDate *)endDate{
_endDate = endDate;
[self.endTimeBtn setTitle:[NSString stringWithFormat:@"%02ld:%02ld",(long)endDate.br_hour,endDate.br_minute] forState:(UIControlStateNormal)];
}
-(void)doneAction{
if ([self.beginTimeBtn.titleLabel.text isEqualToString:@"开始时间"]) {
showToast(@"请选择开始时间");
@@ -324,10 +354,12 @@
showToast(@"请选择结束时间");
return;
}
NSComparisonResult result = [self.endDate compare:self.beginDate];
if (result == NSOrderedAscending) {
showToast(@"结束时间早于开始时间");
return;
if (!self.isNoCompareDate) {
NSComparisonResult result = [self.endDate compare:self.beginDate];
if (result == NSOrderedAscending) {
showToast(@"结束时间早于开始时间");
return;
}
}
[self hide];
if (self.chooseDateBlock) {