提交

QXLive/Mine(音域)/Controller/设置/QXAboutViewController.m

@@ -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];

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

@@ -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];

QXLive/Mine(音域)/Controller/钱包/QXWalletViewController.m

@@ -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;
         }

QXLive/Mine(音域)/Model/QXRoomModel.h

@@ -10,7 +10,7 @@
 #import "QXSongListModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
-@class QXRoomInfoModel,QXRoomPitModel,QXRoomOwnerModel,QXHeadLineModel,QXRoomAuction,QXRoomAuctionUser,QXRoomCpUser,QXRoomPkInfo,QXRoomFriendInfo,QXRoomFriendHeartListModel;
+@class QXRoomInfoModel,QXRoomPitModel,QXRoomOwnerModel,QXHeadLineModel,QXRoomAuction,QXRoomAuctionUser,QXRoomCpUser,QXRoomPkInfo,QXRoomFriendInfo,QXRoomFriendHeartListModel,QXRoomActivitySubModel,QXRoomActivityModel;
 @interface QXRoomModel : NSObject
 /// 房间信息
 @property (nonatomic,strong)QXRoomInfoModel *room_info;
@@ -32,6 +32,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,strong)QXRoomFriendInfo *friend_info;
 /// k歌麦位
 @property (nonatomic,strong)NSArray< QXRoomPitModel*> *song_pit_list;
+/// 活动
+@property (nonatomic,strong)QXRoomActivityModel *gift_cycle;
 @end
 
 
@@ -342,4 +344,15 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,strong)NSString *heartNum;
 @property (nonatomic,strong)NSString *heartId;
 @end
+
+@interface QXRoomActivityModel : NSObject
+@property (nonatomic,strong)QXRoomActivitySubModel *xlh_info;
+@end
+
+@interface QXRoomActivitySubModel : NSObject
+@property (nonatomic,strong)NSString *activities_name;
+@property (nonatomic,strong)NSString *icon;
+@property (nonatomic,strong)NSString *xlh_status;
+@property (nonatomic,assign)long end_time;
+@end
 NS_ASSUME_NONNULL_END

QXLive/Mine(音域)/Model/QXRoomModel.m

@@ -20,6 +20,7 @@
         @"pk_info" : @"QXRoomPkInfo",
         @"song_pit_list":@"QXRoomPitModel",
         @"friend_info":@"QXRoomFriendInfo",
+        @"gift_cycle":@"QXRoomActivityModel",
     };
 }
 
@@ -129,4 +130,17 @@
 
 @implementation QXRoomFriendHeartListModel
 
+@end
+
+@implementation QXRoomActivityModel
++(NSDictionary<NSString *,id> *)modelContainerPropertyGenericClass{
+    return @{
+        @"xlh_info" : @"QXRoomActivitySubModel"
+    };
+}
+@end
+
+@implementation QXRoomActivitySubModel
+
+
 @end

QXLive/Mine(音域)/Services/QXMineNetwork.h

@@ -22,6 +22,7 @@
 #import "QXPayTypeModel.h"
 #import "QXDayTaskModel.h"
 #import "QXRoomUserCharmModel.h"
+#import "QXRoomHourRankModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -443,6 +444,13 @@ NS_ASSUME_NONNULL_BEGIN
                   search:(NSString*)search
             successBlock:(void (^)(NSDictionary* dict))successBlock
                failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
+/**
+ 搜索接口 (房间，用户)
+  
+ */
++(void)searchListApiWithKetwords:(NSString*)keywords
+                    successBlock:(void (^)(NSDictionary* dict))successBlock
+                       failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
 
 /**
  设置主持收益比例
@@ -1047,6 +1055,26 @@ NS_ASSUME_NONNULL_BEGIN
                       successBlock:(void (^)(NSDictionary* dict))successBlock
                          failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
 
+/**
+ 绑定详情
+"id": "string",
+"alipay_name": "string",
+"alipay_account": "string",
+"bank_card_number": "string",
+"bank_user_name": "string",
+"bank_card": "string",
+"open_bank": "string"
+ */
++(void)walletBindDetailWithUserId:(NSString*)user_id
+                             type:(NSString*)type
+                     successBlock:(void (^)(NSDictionary* dict))successBlock
+                        failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
+
+
+
++(void)roomHourRankWithPage:(NSInteger)page
+               successBlock:(void (^)(QXRoomHourRankModel* model))successBlock
+                  failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
 @end
 
 

QXLive/Mine(音域)/Services/QXMineNetwork.m

@@ -904,6 +904,22 @@
     }];
 }
 
++(void)searchListApiWithKetwords:(NSString*)keywords
+                    successBlock:(void (^)(NSDictionary* dict))successBlock
+                       failBlock:(void (^)(NSError * error, NSString * msg))failBlock{
+    NSDictionary *parameters =@{
+        @"search":keywords?keywords:@"",
+    };
+    [[QXRequset shareInstance] postWithUrl:QXSearchListApi parameters:parameters needCache:NO success:^(id responseObject) {
+        if (successBlock) {
+            successBlock(responseObject[@"data"]);
+        }
+    } fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
+        failBlock(error,msg);
+    }];
+}
+
+
 /**
  设置主持收益比例
  */
@@ -2063,4 +2079,34 @@
         failBlock(error,msg);
     }];
 }
+
++(void)walletBindDetailWithUserId:(NSString *)user_id type:(NSString *)type successBlock:(void (^)(NSDictionary * _Nonnull))successBlock failBlock:(void (^)(NSError * _Nonnull, NSString * _Nonnull))failBlock{
+    NSDictionary *parameters =@{
+        @"user_id":user_id?user_id:@"",
+        @"type":type?type:@""
+    };
+    [[QXRequset shareInstance] postWithUrl:QXWalletBindDetail parameters:parameters needCache:NO success:^(id responseObject) {
+        if (successBlock) {
+            successBlock(responseObject[@"data"]);
+        }
+    } fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
+        failBlock(error,msg);
+    }];
+}
+
++(void)roomHourRankWithPage:(NSInteger)page successBlock:(void (^)(QXRoomHourRankModel * _Nonnull))successBlock failBlock:(void (^)(NSError * _Nonnull, NSString * _Nonnull))failBlock{
+    NSDictionary *parameters =@{
+        @"page":[NSNumber numberWithInteger:page]
+    };
+    [[QXRequset shareInstance] postWithUrl:QXRoomHourRank parameters:parameters needCache:NO success:^(id responseObject) {
+        if (successBlock) {
+            QXRoomHourRankModel *model = [QXRoomHourRankModel yy_modelWithJSON:responseObject[@"data"]];
+            successBlock(model);
+        }
+    } fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
+        failBlock(error,msg);
+    }];
+}
+
+
 @end

QXLive/Mine(音域)/View/充值/QXRechargeView.m

@@ -88,10 +88,10 @@
     [QXMineNetwork getRechargeListSuccessBlock:^(NSArray<QXRechargeListModel *> * _Nonnull list) {
         [weakSelf.rechargeDataArray removeAllObjects];
         [weakSelf.rechargeDataArray addObjectsFromArray:list];
-        QXRechargeListModel *model = [[QXRechargeListModel alloc] init];
-        model.money = @"0";
-        model.coins = @"0";
-        [weakSelf.rechargeDataArray addObject:model];
+//        QXRechargeListModel *model = [[QXRechargeListModel alloc] init];
+//        model.money = @"0";
+//        model.coins = @"0";
+//        [weakSelf.rechargeDataArray addObject:model];
         [weakSelf.collectionView reloadSections:[NSIndexSet indexSetWithIndex:0]];
     } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
         
@@ -264,19 +264,18 @@
         showToast(@"请选择充值金额");
         return;
     }
-    if (self.isPop) {
-        [self hide];
-    }
-    MJWeakSelf
+    
+    @weakify(self)
     [QXMineNetwork rechargePayWithMoney:self.selectedModel.money coin:self.selectedModel.coins type:self.selectedPayTypeModel.type userId:QXGlobal.shareGlobal.loginModel.user_id successBlock:^(NSDictionary * _Nonnull dict) {
-        if (weakSelf.selectedPayTypeModel.type.intValue == 2) {
+        @strongify(self)
+        if (self.selectedPayTypeModel.type.intValue == 2) {
             NSDictionary *resultDict = dict[@"data"];
             NSString *order = [NSString stringWithFormat:@"%@",resultDict[@"ali"]];
             [[AlipaySDK defaultService] payOrder:order fromScheme:@"midilive" callback:^(NSDictionary *resultDic) {
                 NSLog(@"支付宝H5支付回调 - %@", resultDic);
                
             }];
-        }else if (weakSelf.selectedPayTypeModel.type.intValue == 1) {
+        }else if (self.selectedPayTypeModel.type.intValue == 1) {
             NSDictionary *resultDict = dict[@"data"][@"wx"];
             NSString *appid = resultDict[@"appid"];
             NSString *partnerId = resultDict[@"partnerid"];
@@ -297,7 +296,7 @@
 
             }];
         }
-        else if (weakSelf.selectedPayTypeModel.type.intValue == 4) {
+        else if (self.selectedPayTypeModel.type.intValue == 4) {
             NSMutableDictionary*dic = [NSMutableDictionary dictionaryWithDictionary:dict[@"data"][@"tl"]];
             [dic removeObjectForKey:@"json_data"];
             NSString *json = [dic jsonStringEncoded];
@@ -312,7 +311,7 @@
             NSString *doubleEncodedQuery = [queryString stringByAddingPercentEncodingWithAllowedCharacters:customSet3];
             NSString *jumpStr = [NSString stringWithFormat:@"alipays://platformapi/startapp?appId=2021001104615521&page=pages/orderDetail/orderDetail&%@&query=%@",encodedString,doubleEncodedQuery];
             [[UIApplication sharedApplication] openURL:[NSURL URLWithString:jumpStr] options:@{} completionHandler:nil];
-        }else if (weakSelf.selectedPayTypeModel.type.intValue == 5) {
+        }else if (self.selectedPayTypeModel.type.intValue == 5) {
             WXLaunchMiniProgramReq *launchMiniProgramReq = [WXLaunchMiniProgramReq object];
             launchMiniProgramReq.userName = @"gh_e64a1a89a0ad";
             NSDictionary *dic = dict[@"data"][@"tl"];
@@ -328,7 +327,9 @@
             launchMiniProgramReq.miniProgramType = WXMiniProgramTypeRelease;
             [WXApi sendReq:launchMiniProgramReq completion:nil];
         }
-       
+        if (self.isPop) {
+            [self hide];
+        }
     } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
         showToast(msg)
     }];

QXLive/Mine(音域)/View/我的房间/QXMyRoomListCell.m

@@ -31,10 +31,10 @@
 -(void)setType:(NSInteger)type{
     _type = type;
     if (type == 0) {
-        self.roomSubsidyBtn.hidden = NO;
+//        self.roomSubsidyBtn.hidden = NO;
         self.roomDetailBtn.hidden = NO;
     }else{
-        self.roomSubsidyBtn.hidden = YES;
+//        self.roomSubsidyBtn.hidden = YES;
         self.roomDetailBtn.hidden = NO;
     }
     

QXLive/Mine(音域)/View/我的房间/QXMyRoomListCell.xib

@@ -104,7 +104,7 @@
                                     <constraint firstAttribute="height" constant="0.5" id="Dhz-Jd-Tft"/>
                                 </constraints>
                             </view>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ay1-ie-dOO">
+                            <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ay1-ie-dOO">
                                 <rect key="frame" x="106" y="109.66666666666667" width="82" height="30.000000000000014"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="DWX-hC-OPc"/>
@@ -221,7 +221,7 @@
         </collectionViewCell>
     </objects>
     <resources>
-        <image name="my_room_wait" width="64" height="64"/>
-        <image name="user_header_placehoulder" width="40" height="40"/>
+        <image name="my_room_wait" width="88" height="88"/>
+        <image name="user_header_placehoulder" width="60" height="60"/>
     </resources>
 </document>