修改余额补贴接口请求

yanglingyu
1 parent dc0a557f
Showing 5 changed files with 81 additions and 8 deletions
CNLiveCMineModule.podspec
CNLiveCMineModule/Classes/CNCSubMine/Present/CNCSubMinePresent.h
CNLiveCMineModule/Classes/CNWallet/Present/CNWalletPresent.h
CNLiveCMineModule/Classes/CNWallet/Present/CNWalletPresent.m
CNLiveCMineModule/Classes/CNWallet/ViewController/CNMineWalletController.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCMineModule'
-  s.version          = '0.3.0'
+  s.version          = '0.3.1'
   s.summary          = '网家家C端个人中心'
 # This description is used to generate tags and improve search results.
@@ -58,8 +58,6 @@ typedef void (^CNLoginResponseBlock)(NSURLSessionTask *requestTask, id responseO
 +(void)showWithScoreViewForScoreIntergal:(NSString *)scoreIntergal Statue:(BOOL)statue SuperView:(UIViewController *)superView;
-
-
 @end
 NS_ASSUME_NONNULL_END
@@ -11,6 +11,15 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CNWalletPresent : NSObject
 + (void)requestExchangeBalanceWithCardNumber:(NSString *)cardNumber completion:(void (^)(NSDictionary *))completion;
+
+/// 余额专用接口
+/// @param responseBlock 返回
+/// @param type 1-私人,2-群组,不传-达人
++ (void)requestBalanceWithType:(NSString *)type responseBlock:(void(^)(NSString *balance))responseBlock;
+
+/// 获取活动列表接口
+/// @param responseBlock 返回
++ (void)requestActivityListBlock:(void(^)(NSArray *activities))responseBlock;
 @end
 NS_ASSUME_NONNULL_END
@@ -44,4 +44,70 @@
         }];
     }];
 }
++ (void)requestBalanceWithType:(NSString *)type responseBlock:(void (^)(NSString * _Nonnull))responseBlock{
+    NSDictionary *params = @{@"appId":AppId,
+                                 @"userId":CNUserShareModel.uid?CNUserShareModel.uid:@"",
+                                 @"type":type  //1-私人,2-群组,不传-达人
+                                 };
+        [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+        [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNGetBalanceUrl Param:params CacheType:NO CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+            if (error) {
+                [QMUITips showError:error.localizedDescription inView:AppKeyWindow hideAfterDelay:1.5];
+                return;
+
+            }
+            if (responseObject[@"data"][@"balance"]) {
+                if(responseBlock)responseBlock(responseObject[@"data"][@"balance"]);
+            }else{
+                [QMUITips showError:responseObject[@"errorMessage"] inView:AppKeyWindow hideAfterDelay:1.5];
+            }
+            
+        }];
+
+}
+
++ (void)requestActivityListBlock:(void (^)(NSArray * _Nonnull))responseBlock
+{
+    NSDictionary *params = @{
+                            @"blockId": @"9",
+                            @"userId":CNUserShareModel.uid?CNUserShareModel.uid:@"",
+                            @"type":@"1",
+                            @"page":@"1",
+                            @"pageSize":@"10"
+    };
+    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+    [CNLiveNetworking setupShowDataResult:YES];
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:cn_API_Classify(@"/contentApi/getBlockContents") Param:params CacheType:NO CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+        if (error) {
+            [QMUITips showError:error.localizedDescription inView:AppKeyWindow hideAfterDelay:1.5];
+            return;
+        }
+            if (responseObject && [responseObject isKindOfClass:[NSDictionary class]]) {
+                
+                
+                NSArray *dataArr = responseObject[@"list"];
+                
+                if (dataArr.count>0) {
+                    NSMutableArray *activityListArr = [[NSMutableArray alloc] init];
+                    for (NSDictionary *dic in dataArr)
+                    {
+                        if ([dic isKindOfClass:[NSDictionary class]])
+                        {
+                            NSDictionary *dictionary = @{
+                                @"imgName":dic[@"transverseImg"],
+                                @"url":dic[@"thirdUrl"],
+                                @"title":dic[@"title"]
+                            };
+                            CNActivityListModel *model = [CNActivityListModel mj_objectWithKeyValues:dictionary];
+                            [activityListArr addObject:model];
+                        }
+                    }
+                    if (responseBlock) {
+                        responseBlock(activityListArr.copy);
+                    }
+                }
+            }
+    }];
+
+}
 @end
@@ -16,7 +16,7 @@
 #import "CNLiveMyExchangeBalanceView.h"
 #import <CNLiveCustomUI/CNLiveCycleScrollView.h>
-#import "CNScoreModel.h"
+#import "CNWalletPresent.h"
 @interface CNMineWalletController ()<CNLiveCycleScrollViewDelegate>
@@ -67,10 +67,11 @@
     } else if (self.style==PayWalletStyle) {
         type = @"2";
     }
-    [CNMinePresent requestMineDataSourceWithBlock:^(NSArray * _Nonnull activities, CNScoreModel * _Nonnull model) {
-        self.moneyLab.text = [NSString stringWithFormat:@"¥%@",model.money];
+    [CNWalletPresent requestBalanceWithType:type responseBlock:^(NSString * _Nonnull balance) {
+        self.moneyLab.text = balance;
+    }];
+    [CNWalletPresent requestActivityListBlock:^(NSArray * _Nonnull activities) {
         self.activityArray = activities;
-        
         if(self.activityArray && self.activityArray.count > 0)
         {
             [self.view addSubview:self.activityScorllView];
@@ -82,7 +83,6 @@
             }];
         }
     }];
-
 }
 - (void)viewDidLayoutSubviews {
     [super viewDidLayoutSubviews];