覆盖羽声
This commit is contained in:
@@ -27,6 +27,7 @@
|
||||
#import "QXMineNetwork.h"
|
||||
#import "QXHelpViewController.h"
|
||||
#import "QXInviteViewController.h"
|
||||
#import "QXChatViewController.h"
|
||||
|
||||
@interface QXMineViewController ()<UITableViewDelegate,UITableViewDataSource,QXMineServiceCellDelegate,QXMainHeaderViewDelegate>
|
||||
@property (nonatomic,strong)QXMainHeaderView *tableHeaderView;
|
||||
@@ -207,6 +208,14 @@
|
||||
-(void)gotoService{
|
||||
QXHelpViewController *webvc = [[QXHelpViewController alloc] init];
|
||||
[self.navigationController pushViewController:webvc animated:YES];
|
||||
|
||||
// QXChatViewController *vc = [[QXChatViewController alloc] init];
|
||||
// TUIChatConversationModel *data = [[TUIChatConversationModel alloc] init];
|
||||
// data.userID = @"@RBT#u88";
|
||||
// data.title = @"小秘机器人";
|
||||
// data.faceUrl = @"http://md.qxmier.com/data/avatar/head_pic.png";
|
||||
// vc.data = data;
|
||||
// [self.navigationController pushViewController:vc animated:YES];
|
||||
}
|
||||
|
||||
|
||||
@@ -229,6 +238,7 @@
|
||||
} failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
|
||||
showToast(msg);
|
||||
}];
|
||||
|
||||
}
|
||||
|
||||
-(QXMainHeaderView *)tableHeaderView{
|
||||
|
||||
@@ -9,18 +9,23 @@
|
||||
#import "QXDressCell.h"
|
||||
#import "QXMineNetwork.h"
|
||||
#import "QXSeatHeaderView.h"
|
||||
#import "QXGiftPlayerManager.h"
|
||||
|
||||
@interface QXDressSubViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout>
|
||||
@property (nonatomic,strong)QXSeatHeaderView *headerImageView;
|
||||
@property (nonatomic,strong)UICollectionView *collectionView;
|
||||
@property (nonatomic,strong)UIButton *commitBtn;
|
||||
@property (nonatomic,assign)NSInteger selectedIndex;
|
||||
@property (nonatomic,strong)QXEffectContentView *fullEffectView;
|
||||
@end
|
||||
|
||||
@implementation QXDressSubViewController
|
||||
-(UIView *)listView{
|
||||
return self.view;
|
||||
}
|
||||
-(void)listWillAppear{
|
||||
[self getData];
|
||||
}
|
||||
- (void)viewDidLoad {
|
||||
[super viewDidLoad];
|
||||
// Do any additional setup after loading the view.
|
||||
@@ -37,12 +42,13 @@
|
||||
}
|
||||
[self.view addSubview:self.collectionView];
|
||||
[self.view addSubview:self.commitBtn];
|
||||
[self.view addSubview:self.fullEffectView];
|
||||
}
|
||||
|
||||
-(void)getData{
|
||||
MJWeakSelf
|
||||
[QXMineNetwork userDressListWithType:self.model.id successBlock:^(NSArray<QXUserDressModel *> * _Nonnull list) {
|
||||
|
||||
[weakSelf.dataArray removeAllObjects];
|
||||
[weakSelf.dataArray addObjectsFromArray:list];
|
||||
if (list.count > 0 ) {
|
||||
QXUserDressModel *model = [[QXUserDressModel alloc] init];
|
||||
@@ -70,7 +76,7 @@
|
||||
return cell;
|
||||
}
|
||||
-(CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath{
|
||||
CGFloat width = (SCREEN_WIDTH-15*2-22*2)/3;
|
||||
int width = (SCREEN_WIDTH-15*2-22*2-1)/3;
|
||||
return CGSizeMake(width, width/100*120);
|
||||
}
|
||||
-(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{
|
||||
@@ -81,7 +87,10 @@
|
||||
self.selectedIndex = indexPath.row;
|
||||
[collectionView reloadData];
|
||||
// MJWeakSelf
|
||||
|
||||
if ([self.model.id isEqualToString:@"2"]) {
|
||||
self.fullEffectView.hidden = NO;
|
||||
[self.fullEffectView previewEffectWith:model.play_image];
|
||||
}
|
||||
[self.headerImageView setHeadIcon:[QXGlobal shareGlobal].loginModel.avatar dress:model.play_image];
|
||||
|
||||
}
|
||||
@@ -141,4 +150,12 @@
|
||||
}
|
||||
return _headerImageView;
|
||||
}
|
||||
- (QXEffectContentView *)fullEffectView {
|
||||
if (!_fullEffectView) {
|
||||
_fullEffectView = [[QXEffectContentView alloc] initWithFrame:[UIScreen mainScreen].bounds];
|
||||
_fullEffectView.queue = dispatch_queue_create("qx_room_full_preview_message.com", NULL);
|
||||
_fullEffectView.hidden = YES;
|
||||
}
|
||||
return _fullEffectView;
|
||||
}
|
||||
@end
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
#import "JXCategoryView.h"
|
||||
#import "QXDressSubViewController.h"
|
||||
#import "QXMineNetwork.h"
|
||||
#import "QXPropShopViewController.h"
|
||||
|
||||
@interface QXDressViewController ()<JXCategoryViewDelegate,JXCategoryListContainerViewDelegate>
|
||||
@property (nonatomic,strong)JXCategoryTitleView *categoryView;
|
||||
@@ -30,6 +31,17 @@
|
||||
-(void)setNavgationItems{
|
||||
[super setNavgationItems];
|
||||
self.navigationItem.title = QXText(@"个性装扮");
|
||||
UIButton*recordBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 44, 44)];
|
||||
[recordBtn setTitle:QXText(@"道具商城") forState:(UIControlStateNormal)];
|
||||
[recordBtn setTitleColor:RGB16(0xFF8ACC) forState:(UIControlStateNormal)];
|
||||
recordBtn.titleLabel.font = [UIFont systemFontOfSize:16];
|
||||
[recordBtn addTarget:self action:@selector(recordAction) forControlEvents:(UIControlEventTouchUpInside)];
|
||||
self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:recordBtn];
|
||||
}
|
||||
|
||||
-(void)recordAction{
|
||||
QXPropShopViewController *vc = [[QXPropShopViewController alloc] init];
|
||||
[self.navigationController pushViewController:vc animated:YES];
|
||||
}
|
||||
|
||||
- (void)initSubViews{
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
#import "QXGuildViewController.h"
|
||||
#import <WebKit/WebKit.h>
|
||||
#import "QXUserHomePageViewController.h"
|
||||
#import "QXRealNameViewController.h"
|
||||
|
||||
|
||||
static void *WKWebBrowserContext = &WKWebBrowserContext;
|
||||
@@ -119,6 +120,9 @@ static void *WKWebBrowserContext = &WKWebBrowserContext;
|
||||
return;
|
||||
}
|
||||
[[QXGlobal shareGlobal] joinRoomWithRoomId:room_id isRejoin:NO navagationController:self.navigationController];
|
||||
}else if ([dict[@"action"] isEqualToString:@"enterAuthent"]) {
|
||||
QXRealNameViewController *vc = [[QXRealNameViewController alloc] init];
|
||||
[self.navigationController pushViewController:vc animated:YES];
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -330,7 +330,7 @@
|
||||
if (!_roomNameLabel) {
|
||||
_roomNameLabel = [[UILabel alloc] init];
|
||||
_roomNameLabel.font = [UIFont boldSystemFontOfSize:16];
|
||||
_roomNameLabel.textColor = QXConfig.textColor;
|
||||
_roomNameLabel.textColor = RGB16A(0x000000, 0.45);
|
||||
_roomNameLabel.text = QXText(@"房间标题");
|
||||
}
|
||||
return _roomNameLabel;
|
||||
@@ -340,7 +340,7 @@
|
||||
_textFieldbgView = [[UIView alloc] init];
|
||||
_textFieldbgView.layer.masksToBounds = YES;
|
||||
_textFieldbgView.layer.cornerRadius = 11;
|
||||
_textFieldbgView.backgroundColor = [UIColor colorWithHexString:@"#EFF2F8"];
|
||||
_textFieldbgView.backgroundColor = [UIColor colorWithHexString:@"#F0EEF7"];
|
||||
}
|
||||
return _textFieldbgView;
|
||||
}
|
||||
@@ -372,7 +372,7 @@
|
||||
if (!_roomNoticeLabel) {
|
||||
_roomNoticeLabel = [[UILabel alloc] init];
|
||||
_roomNoticeLabel.font = [UIFont boldSystemFontOfSize:15];
|
||||
_roomNoticeLabel.textColor = QXConfig.textColor;
|
||||
_roomNoticeLabel.textColor = RGB16A(0x000000, 0.45);
|
||||
_roomNoticeLabel.text = QXText(@"房间公告");
|
||||
}
|
||||
return _roomNoticeLabel;
|
||||
@@ -399,7 +399,7 @@
|
||||
-(UIView *)noticeBgView{
|
||||
if (!_noticeBgView) {
|
||||
_noticeBgView = [[UIView alloc] init];
|
||||
_noticeBgView.backgroundColor = RGB16(0xEFF2F8);
|
||||
_noticeBgView.backgroundColor = RGB16(0xF0EEF7);
|
||||
[_noticeBgView addRoundedCornersWithRadius:11];
|
||||
}
|
||||
return _noticeBgView;
|
||||
@@ -427,7 +427,7 @@
|
||||
_randomBtn = [[UIButton alloc] init];
|
||||
[_randomBtn setTitle:QXText(@"随机名称") forState:(UIControlStateNormal)];
|
||||
_randomBtn.titleLabel.font = [UIFont systemFontOfSize:14];
|
||||
[_randomBtn setTitleColor:RGB16(0xFF8ACC) forState:(UIControlStateNormal)];
|
||||
[_randomBtn setTitleColor:QXConfig.themeColor forState:(UIControlStateNormal)];
|
||||
[_randomBtn addTarget:self action:@selector(getRandomName) forControlEvents:UIControlEventTouchUpInside];
|
||||
}
|
||||
return _randomBtn;
|
||||
@@ -437,7 +437,7 @@
|
||||
_submitBtn = [[UIButton alloc] init];
|
||||
[_submitBtn setTitle:QXText(@"提交审核") forState:UIControlStateNormal];
|
||||
_submitBtn.titleLabel.font = [UIFont systemFontOfSize:15];
|
||||
[_submitBtn setTitleColor:QXConfig.textColor forState:UIControlStateNormal];
|
||||
[_submitBtn setTitleColor:QXConfig.btnTextColor forState:UIControlStateNormal];
|
||||
_submitBtn.backgroundColor = QXConfig.themeColor;
|
||||
_submitBtn.layer.masksToBounds = YES;
|
||||
_submitBtn.layer.cornerRadius = 21;
|
||||
@@ -449,9 +449,9 @@
|
||||
-(UILabel *)warningLabel{
|
||||
if (!_warningLabel) {
|
||||
_warningLabel = [[UILabel alloc] init];
|
||||
_warningLabel.backgroundColor = RGB16(0x333333);
|
||||
[_warningLabel addRoundedCornersWithRadius:3];
|
||||
_warningLabel.textColor = UIColor.whiteColor;
|
||||
// _warningLabel.backgroundColor = RGB16(0x333333);
|
||||
// [_warningLabel addRoundedCornersWithRadius:3];
|
||||
_warningLabel.textColor = RGB16(0xEEA24C);
|
||||
_warningLabel.font = [UIFont systemFontOfSize:11];
|
||||
_warningLabel.textAlignment = NSTextAlignmentCenter;
|
||||
_warningLabel.text = QXText(@"创建房间需要审核,通过后可开启直播");
|
||||
|
||||
@@ -159,6 +159,18 @@
|
||||
return cell;
|
||||
}
|
||||
}
|
||||
-(void)collectionView:(UICollectionView *)collectionView willDisplayCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath{
|
||||
if ([cell isKindOfClass:[QXHomeRoomCell class]]) {
|
||||
QXHomeRoomCell *rCell = (QXHomeRoomCell *)cell;
|
||||
[rCell startAnimating];
|
||||
}
|
||||
}
|
||||
-(void)collectionView:(UICollectionView *)collectionView didEndDisplayingCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath{
|
||||
if ([cell isKindOfClass:[QXHomeRoomCell class]]) {
|
||||
QXHomeRoomCell *rCell = (QXHomeRoomCell *)cell;
|
||||
[rCell endAnimating];
|
||||
}
|
||||
}
|
||||
|
||||
-(CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath{
|
||||
if (self.type == 0) {
|
||||
|
||||
@@ -97,8 +97,8 @@
|
||||
-(__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{
|
||||
if (self.type == 0) {
|
||||
QXGiftCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"QXGiftCell" forIndexPath:indexPath];
|
||||
cell.cellType = QXGiftCellTypeBackpack;
|
||||
cell.roomGiftModel = self.dataArray[indexPath.row];
|
||||
cell.cellType = QXGiftCellTypeBackpack;
|
||||
return cell;
|
||||
}else{
|
||||
QXBackpackRecordCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"QXBackpackRecordCell" forIndexPath:indexPath];
|
||||
|
||||
@@ -34,14 +34,14 @@
|
||||
self.navigationItem.title = QXText(@"每日任务");
|
||||
UIButton*recordBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 44, 44)];
|
||||
[recordBtn setTitle:QXText(@"礼盒记录") forState:(UIControlStateNormal)];
|
||||
[recordBtn setTitleColor:RGB16(0xFF8ACC) forState:(UIControlStateNormal)];
|
||||
[recordBtn setTitleColor:QXConfig.themeColor forState:(UIControlStateNormal)];
|
||||
recordBtn.titleLabel.font = [UIFont systemFontOfSize:16];
|
||||
[recordBtn addTarget:self action:@selector(recordAction) forControlEvents:(UIControlEventTouchUpInside)];
|
||||
self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:recordBtn];
|
||||
}
|
||||
- (void)initSubViews{
|
||||
self.bgImageHidden = YES;
|
||||
self.view.backgroundColor = RGB16(0xF8E3C8);
|
||||
self.view.backgroundColor = RGB16(0xD7CDFF);
|
||||
self.tableView.tableHeaderView = self.topView;
|
||||
[self.view addSubview:self.tableView];
|
||||
}
|
||||
|
||||
@@ -41,7 +41,8 @@ static void *WKWebBrowserContext = &WKWebBrowserContext;
|
||||
}
|
||||
- (void)loadData {
|
||||
// H5ServerUrl
|
||||
NSString *urlStr = [NSString stringWithFormat:@"%@web/index.html#/pages/other/aboutUs",H5ServerUrl];
|
||||
NSInteger safeTop = kSafeAreaTop;
|
||||
NSString *urlStr = [NSString stringWithFormat:@"%@web/index.html#/pages/other/aboutUs?h=%ld",H5ServerUrl,safeTop];
|
||||
NSURL* url=[NSURL URLWithString:urlStr];
|
||||
NSURLRequest *request =[NSURLRequest requestWithURL:url];
|
||||
[self.contentWebView loadRequest:request];
|
||||
|
||||
@@ -10,7 +10,12 @@
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface QXChirldModeViewController : QXBaseViewController
|
||||
/// 0 = 设置1 , 1 = 设置2 ,2 = 退出
|
||||
@property (nonatomic,assign)NSInteger type;
|
||||
/// 密码
|
||||
@property (nonatomic,strong)NSString *password;
|
||||
|
||||
@property (nonatomic,assign)BOOL isRoot;
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
||||
@@ -7,6 +7,8 @@
|
||||
|
||||
#import "QXChirldModeViewController.h"
|
||||
#import "QXPasswordView.h"
|
||||
#import "QXChirldViewController.h"
|
||||
#import "AppDelegate.h"
|
||||
@interface QXChirldModeViewController ()<QXPasswordViewDelegate>
|
||||
@property (nonatomic,strong)QXPasswordView * passwordView;
|
||||
@end
|
||||
@@ -27,7 +29,12 @@
|
||||
}
|
||||
-(void)initSubViews{
|
||||
self.passwordView = [[QXPasswordView alloc] init];
|
||||
self.passwordView.type = QXPasswordViewTypeChirldMode;
|
||||
if (self.type == 1) {
|
||||
self.passwordView.type = QXPasswordViewTypeChirldModeTwice;
|
||||
}else{
|
||||
self.passwordView.type = QXPasswordViewTypeChirldMode;
|
||||
}
|
||||
|
||||
self.passwordView.delegate = self;
|
||||
[self.view addSubview:self.passwordView];
|
||||
[self.passwordView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
@@ -38,7 +45,35 @@
|
||||
}
|
||||
|
||||
-(void)inputFinished:(NSString *)password{
|
||||
|
||||
if (self.type == 0) {
|
||||
QXChirldModeViewController *vc = [[QXChirldModeViewController alloc] init];
|
||||
vc.type = 1;
|
||||
vc.password = password;
|
||||
[self.navigationController pushViewController:vc animated:YES];
|
||||
}else if (self.type == 1) {
|
||||
if ([self.password isEqualToString:password]) {
|
||||
QXChirldViewController *vc = [[QXChirldViewController alloc] init];
|
||||
[self.navigationController pushViewController:vc animated:YES];
|
||||
[[NSUserDefaults standardUserDefaults] setObject:password forKey:kChirldLocalPassword];
|
||||
[[NSUserDefaults standardUserDefaults] synchronize];
|
||||
}else{
|
||||
showToast(@"两次密码输入不一致");
|
||||
}
|
||||
}else if (self.type == 2) {
|
||||
NSString *localPassword = [[NSUserDefaults standardUserDefaults] objectForKey:kChirldLocalPassword];
|
||||
if (![localPassword isEqualToString:password]) {
|
||||
showToast(@"密码错误");
|
||||
}else{
|
||||
[[NSUserDefaults standardUserDefaults] removeObjectForKey:kChirldLocalPassword];
|
||||
[[NSUserDefaults standardUserDefaults] synchronize];
|
||||
if (self.isRoot) {
|
||||
AppDelegate *appdelegate = (AppDelegate*)[UIApplication sharedApplication].delegate;
|
||||
[appdelegate changeRootViewControllerIsTabbar];
|
||||
}else{
|
||||
[self.navigationController popToRootViewControllerAnimated:YES];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
-(void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event{
|
||||
[self.view endEditing:YES];
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
#import <TencentCloudHuiyanSDKFace/WBFaceVerifyCustomerService.h>
|
||||
#import "QXMineNetwork.h"
|
||||
#import "QXRealNameFinishedViewController.h"
|
||||
#import "QXAlertView.h"
|
||||
|
||||
@interface QXRealNameViewController ()<WBFaceVerifyCustomerServiceDelegate>
|
||||
@property (nonatomic,strong)UILabel *titleLabel;
|
||||
@@ -111,6 +112,7 @@
|
||||
self.realTextField = [[QXLoginTextField alloc] init];
|
||||
self.realTextField.type = LoginTextTypeRealName;
|
||||
self.realTextField.backgroundColor = RGB16(0xEFF2F8);
|
||||
[self.realTextField addRoundedCornersWithRadius:11];
|
||||
[self.view addSubview:self.realTextField];
|
||||
[self.realTextField mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.left.mas_equalTo(16);
|
||||
@@ -122,6 +124,7 @@
|
||||
self.idNumberTextField = [[QXLoginTextField alloc] init];
|
||||
self.idNumberTextField.type = LoginTextTypeIdNumber;
|
||||
self.idNumberTextField.backgroundColor = RGB16(0xEFF2F8);
|
||||
[self.idNumberTextField addRoundedCornersWithRadius:11];
|
||||
[self.view addSubview:self.idNumberTextField];
|
||||
[self.idNumberTextField mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.left.mas_equalTo(16);
|
||||
@@ -257,7 +260,8 @@
|
||||
weakSelf.realNamedict = dict;
|
||||
[weakSelf startFace];
|
||||
} failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
|
||||
|
||||
hideLoadingInView(self.view);
|
||||
showToast(msg);
|
||||
}];
|
||||
|
||||
// [QXGlobal shareGlobal].isRealName = YES;
|
||||
@@ -303,13 +307,26 @@
|
||||
-(void)wbfaceVerifyCustomerServiceDidFinishedWithFaceVerifyResult:(WBFaceVerifyResult *)faceVerifyResult{
|
||||
if (faceVerifyResult.isSuccess) {
|
||||
QXLOG(@"人脸核验通过");
|
||||
[self authSuccess];
|
||||
MJWeakSelf
|
||||
// QXAlertView *al = [[QXAlertView alloc] initWithFrame:CGRectMake(0, 0, ScaleWidth(300), ScaleWidth(175))];
|
||||
// al.type = QXAlertViewTypeNoCancel;
|
||||
// al.title = @"温馨提示";
|
||||
// al.message = @"恭喜您获得内测资格,将获得10万金币";
|
||||
// al.commitBlock = ^{
|
||||
[weakSelf authSuccess];
|
||||
// };
|
||||
// [[QXGlobal shareGlobal] showView:al popType:(PopViewTypeTopToCenter) tapDismiss:NO finishBlock:^{
|
||||
//
|
||||
// }];
|
||||
|
||||
/// 通知服务端实名验证结果
|
||||
[QXMineNetwork postRealNameResultWithOrderNo:faceVerifyResult.orderNo successBlock:^(NSDictionary * _Nonnull dict) {
|
||||
|
||||
} failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
|
||||
|
||||
}];
|
||||
}else{
|
||||
showToast(@"实名认证失败");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ static NSInteger maxClickCount = 6;
|
||||
-(void)initSubViews{
|
||||
NSArray *section1 = @[
|
||||
// QXText(@"消息通知"),
|
||||
QXText(@"未成年人模式"),
|
||||
// QXText(@"未成年人模式"),
|
||||
QXText(@"黑名单"),
|
||||
QXText(@"设置密码"),
|
||||
QXText(@"手机绑定"),
|
||||
@@ -54,7 +54,7 @@ static NSInteger maxClickCount = 6;
|
||||
];
|
||||
self.cellTypeDict = @{
|
||||
// QXText(@"消息通知"):[NSNumber numberWithInteger:QXSettingCellTypeOnlyArrow],
|
||||
QXText(@"未成年人模式"):[NSNumber numberWithInteger:QXSettingCellTypeOnlyArrow],
|
||||
// QXText(@"未成年人模式"):[NSNumber numberWithInteger:QXSettingCellTypeOnlyArrow],
|
||||
QXText(@"黑名单"):[NSNumber numberWithInteger:QXSettingCellTypeOnlyArrow],
|
||||
QXText(@"设置密码"):[NSNumber numberWithInteger:QXSettingCellTypeOnlyArrow],
|
||||
QXText(@"手机绑定"):[NSNumber numberWithInteger:QXSettingCellTypeOnlyArrow],
|
||||
@@ -67,7 +67,7 @@ static NSInteger maxClickCount = 6;
|
||||
|
||||
self.controllerDict = @{
|
||||
QXText(@"消息通知"):@"QXNoticeSwitchViewController",
|
||||
QXText(@"未成年人模式"):@"QXChirldModeViewController",
|
||||
// QXText(@"未成年人模式"):@"QXChirldModeViewController",
|
||||
QXText(@"黑名单"):@"QXBlackListlViewController",
|
||||
QXText(@"设置密码"):@"QXSetPwdViewController",
|
||||
QXText(@"手机绑定"):@"QXBindMobileViewController",
|
||||
|
||||
@@ -174,7 +174,7 @@ static void *WKWebBrowserContext = &WKWebBrowserContext;
|
||||
//自定义配置,一般用于 js调用oc方法(OC拦截URL中的数据做自定义操作)
|
||||
WKUserContentController * UserContentController = [[WKUserContentController alloc]init];
|
||||
// 是否支持记忆读取
|
||||
configuration.suppressesIncrementalRendering = YES;
|
||||
configuration.suppressesIncrementalRendering = NO;
|
||||
// 允许用户更改网页的设置
|
||||
[UserContentController addScriptMessageHandler:self name:@"login"];
|
||||
[UserContentController addScriptMessageHandler:self name:@"nativeHandler"];
|
||||
|
||||
@@ -49,10 +49,10 @@
|
||||
[self.bankNameTextField addRoundedCornersWithRadius:11];
|
||||
[self.view addSubview:self.bankNameTextField];
|
||||
|
||||
self.bankNumberTextField = [[QXLoginTextField alloc] initWithFrame:CGRectMake(16, self.bankNameTextField.bottom+12, SCREEN_WIDTH-32, 44) type:(LoginTextTypeBankAddress)];
|
||||
self.bankNumberTextField.backgroundColor = RGB16(0xEFF2F8);
|
||||
[self.bankNumberTextField addRoundedCornersWithRadius:11];
|
||||
[self.view addSubview:self.bankNumberTextField];
|
||||
self.bankAddressTextField = [[QXLoginTextField alloc] initWithFrame:CGRectMake(16, self.bankNameTextField.bottom+12, SCREEN_WIDTH-32, 44) type:(LoginTextTypeBankAddress)];
|
||||
self.bankAddressTextField.backgroundColor = RGB16(0xEFF2F8);
|
||||
[self.bankAddressTextField addRoundedCornersWithRadius:11];
|
||||
[self.view addSubview:self.bankAddressTextField];
|
||||
|
||||
self.commitBtn = [[UIButton alloc] initWithFrame:CGRectMake(38, self.bankNumberTextField.bottom+16, SCREEN_WIDTH-38*2, 42)];
|
||||
}
|
||||
@@ -67,6 +67,37 @@
|
||||
self.commitBtn.titleLabel.font = [UIFont systemFontOfSize:14];
|
||||
self.commitBtn.backgroundColor = QXConfig.themeColor;
|
||||
[self.view addSubview:self.commitBtn];
|
||||
[self getAliBind];
|
||||
}
|
||||
|
||||
-(void)getAliBind{
|
||||
//2 支付宝 3 银行卡
|
||||
NSString *type = self.isAli?@"2":@"3";
|
||||
MJWeakSelf
|
||||
[QXMineNetwork walletBindDetailWithUserId:QXGlobal.shareGlobal.loginModel.user_id type:type successBlock:^(NSDictionary * _Nonnull dict) {
|
||||
if (weakSelf.isAli) {
|
||||
NSString* result = [NSString stringWithFormat:@"%@",dict[@"alipay_account"]];
|
||||
if ([result isExist]) {
|
||||
weakSelf.aliTextField.textField.text = result;
|
||||
}
|
||||
}else{
|
||||
NSString* bank_card_number = [NSString stringWithFormat:@"%@",dict[@"bank_card_number"]];
|
||||
NSString* bank_card = [NSString stringWithFormat:@"%@",dict[@"bank_card"]];
|
||||
NSString* open_bank = [NSString stringWithFormat:@"%@",dict[@"open_bank"]];
|
||||
if ([bank_card_number isExist]) {
|
||||
weakSelf.bankNumberTextField.textField.text = bank_card_number;
|
||||
}
|
||||
if ([bank_card isExist]) {
|
||||
weakSelf.bankNumberTextField.textField.text = bank_card_number;
|
||||
}
|
||||
if ([open_bank isExist]) {
|
||||
weakSelf.bankAddressTextField.textField.text = open_bank;
|
||||
}
|
||||
}
|
||||
|
||||
} failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
|
||||
|
||||
}];
|
||||
}
|
||||
-(void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event{
|
||||
[self.view endEditing:YES];
|
||||
|
||||
@@ -63,6 +63,7 @@
|
||||
}
|
||||
-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
|
||||
QXCornRecordCell *cell = [QXCornRecordCell cellWithTableView:tableView];
|
||||
cell.isCoin = self.waterType==0;
|
||||
cell.model = self.dataArray[indexPath.row];
|
||||
return cell;
|
||||
}
|
||||
|
||||
@@ -144,11 +144,11 @@
|
||||
weakSelf.isBind = YES;
|
||||
return;
|
||||
}
|
||||
if (model.ali.is_pay_open.intValue == 1 && model.ali.is_bind.intValue == 1) {
|
||||
if (model.ali.is_with_draw_open.intValue == 1 && model.ali.is_bind.intValue == 1) {
|
||||
weakSelf.isBind = YES;
|
||||
return;
|
||||
}
|
||||
if (model.bank.is_pay_open.intValue == 1 && model.bank.is_bind.intValue == 1) {
|
||||
if (model.bank.is_with_draw_open.intValue == 1 && model.bank.is_bind.intValue == 1) {
|
||||
weakSelf.isBind = YES;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -94,7 +94,7 @@
|
||||
_tableView.backgroundColor = [UIColor clearColor];
|
||||
_tableView.tableFooterView = [UIView new];
|
||||
_tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
|
||||
_tableView.rowHeight = 66;
|
||||
_tableView.rowHeight = 180;
|
||||
MJWeakSelf
|
||||
_tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
|
||||
weakSelf.page = 1;
|
||||
|
||||
@@ -155,13 +155,14 @@
|
||||
|
||||
[QXMineNetwork walletPayTypeWithUserId:QXGlobal.shareGlobal.loginModel.user_id successBlock:^(QXPayTypeStatusModel * _Nonnull model) {
|
||||
[weakSelf.dataArray removeAllObjects];
|
||||
weakSelf.selectedPayTypeModel = nil;
|
||||
if (model.wx.is_with_draw_open.intValue == 1 && model.wx.is_bind.intValue == 1) {
|
||||
[weakSelf.dataArray addObject:model.wx];
|
||||
}
|
||||
if (model.ali.is_pay_open.intValue == 1 && model.ali.is_bind.intValue == 1) {
|
||||
if (model.ali.is_with_draw_open.intValue == 1 && model.ali.is_bind.intValue == 1) {
|
||||
[weakSelf.dataArray addObject:model.ali];
|
||||
}
|
||||
if (model.bank.is_pay_open.intValue == 1 && model.bank.is_bind.intValue == 1) {
|
||||
if (model.bank.is_with_draw_open.intValue == 1 && model.bank.is_bind.intValue == 1) {
|
||||
[weakSelf.dataArray addObject:model.bank];
|
||||
}
|
||||
[weakSelf.tableView reloadData];
|
||||
@@ -181,6 +182,10 @@
|
||||
showToast(@"请输入提现金额");
|
||||
return;
|
||||
}
|
||||
if (self.selectedPayTypeModel == nil) {
|
||||
showToast(@"请选择提现方式");
|
||||
return;
|
||||
}
|
||||
MJWeakSelf
|
||||
QXReVerificationPopView *popView = [[QXReVerificationPopView alloc] initWithFrame:CGRectMake(0, 0, ScaleWidth(300), ScaleWidth(200))];
|
||||
popView.commitBlock = ^(NSString * _Nonnull code) {
|
||||
|
||||
Reference in New Issue
Block a user