no message

zhangxiaowen
1 parent 8d4c92e9
Showing 7 changed files with 76 additions and 124 deletions
CNLiveBalanceModule/Classes/Controller/CNLiveBalanceController.m
CNLiveBalanceModule/Classes/Controller/CNLiveMonthBillController.m
CNLiveBalanceModule/Classes/Controller/CNLiveTradingRecordController.m
CNLiveBalanceModule/Classes/Model/CNLiveBalanceRequest.h
CNLiveBalanceModule/Classes/Model/CNLiveBalanceRequest.m
CNLiveBalanceModule/Classes/View/CNLiveMonthBillView.m
CNLiveBalanceModule/Classes/View/CNLiveTradingRecordView.m
@@ -28,7 +28,6 @@
 @end
 @implementation CNLiveBalanceController
-static const NSInteger timeValue = 1.5;
 #pragma mark - 加载数据
 - (void)loadData {
     [CNLiveBalanceRequest getBalance:self.type ID:self.ID block:^(BOOL isSuccess, NSString * _Nonnull number) {
@@ -19,12 +19,13 @@
 #import "CNLiveCategory.h"
 #import "CNLiveRefreshHeader.h"
-#import "CNLiveTradingRecordModel.h"
-#import "CNLiveTradingRecordCell.h"
 #import "CNLiveServices.h"
+#import "CNLiveBalanceRequest.h"
 #import "CNLiveBalanceNavigationBar.h"
 #import "CNLiveMonthBillView.h"
+#import "CNLiveTradingRecordModel.h"
+#import "CNLiveTradingRecordCell.h"
 @interface CNLiveMonthBillController ()<UITableViewDelegate, UITableViewDataSource,CNLiveBalanceNavigationBarDelegate,CNLiveMonthBillViewDelegate>
 @property (nonatomic, strong) CNLiveBalanceNavigationBar *navigationBar;
@@ -52,17 +53,7 @@ static const CGFloat height = 60;
 }
 #pragma mark - 加载数据
 - (void)loadData {
-    NSDictionary *params = @{@"appId":AppId,
-                             @"targetId":CNUserShareModel.uid?CNUserShareModel.uid:@"",
-                             //@"10504050"
-                             @"type":self.type,//0全部(默认) 1收入 2支出
-                             @"startTime":self.startTime?self.startTime:@"1575129600000",
-                             @"endTime":self.endTime?self.endTime:@"1577807999000",
-                             @"pageSize":[NSString stringWithFormat:@"%d",INT_MAX],
-                             @"pageNo":[NSString stringWithFormat:@"%ld", self.pageNo]
-                             };
-    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
-    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNGetTradingRecordUrl Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+    [CNLiveBalanceRequest getTradingRecordWithType:self.type startTime:self.startTime endTime:self.endTime block:^(BOOL isSuccess, NSDictionary * _Nonnull data, NSError *error) {
         [self.tableView.mj_header endRefreshing];
         [self.tableView.mj_footer endRefreshing];
@@ -75,20 +66,14 @@ static const CGFloat height = 60;
             return;
         }
-        if (responseObject && [responseObject isKindOfClass:[NSDictionary class]] && responseObject[@"data"] && [responseObject[@"data"] isKindOfClass:[NSDictionary class]]) {
-            NSString *errorCode = [NSString stringWithFormat:@"%@", responseObject[@"errorCode"]];
-            NSDictionary *data = responseObject[@"data"];
+        if (isSuccess) {
             CNLiveTradingRecordModel *model = [CNLiveTradingRecordModel mj_objectWithKeyValues:data];
             if(self.pageNo == 1&&self.data.count > 0){
                 [self.data removeAllObjects];
             }
             [self.data addObjectsFromArray:model.list];
             [self.tableView reloadData];
-
-        }else{
-
         }
-
     }];
 }
@@ -18,13 +18,14 @@
 #import "CNLiveCategory.h"
 #import "CNLiveRefreshHeader.h"
-#import "CNLiveTradingRecordModel.h"
-#import "CNLiveTradingRecordCell.h"
 #import "CNLiveServices.h"
+#import "CNLiveBalanceRequest.h"
 #import "CNLiveBalanceNavigationBar.h"
 #import "CNLiveTradingRecordView.h"
 #import "CNLiveMonthBillController.h" //月账单
+#import "CNLiveTradingRecordModel.h"
+#import "CNLiveTradingRecordCell.h"
 @interface CNLiveTradingRecordController ()<UITableViewDelegate, UITableViewDataSource,CNLiveBalanceNavigationBarDelegate,CNLiveTradingRecordViewDelegate>
 @property (nonatomic, strong) CNLiveBalanceNavigationBar *navigationBar;
@@ -45,16 +46,7 @@ static const CGFloat height = 80;
 #pragma mark - 加载数据
 - (void)loadData {
-    NSDictionary *params = @{@"appId":AppId,
-                             @"targetId":CNUserShareModel.uid?CNUserShareModel.uid:@"",
-                             @"type":@"0",//0全部(默认) 1收入 2支出
-                             @"startTime":self.startTime?self.startTime:@"1575129600000",
-                             @"endTime":self.endTime?self.endTime:@"1577807999000",
-                             @"pageSize":[NSString stringWithFormat:@"%d",INT_MAX],
-                             @"pageNo":[NSString stringWithFormat:@"%ld", self.pageNo]
-                             };
-    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
-    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNGetTradingRecordUrl Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+    [CNLiveBalanceRequest getTradingRecordWithType:@"0" startTime:self.startTime endTime:self.endTime block:^(BOOL isSuccess, NSDictionary * _Nonnull data, NSError *error) {
         [self.tableView.mj_header endRefreshing];
         [self.tableView.mj_footer endRefreshing];
@@ -67,9 +59,7 @@ static const CGFloat height = 80;
             return;
         }
-        if (responseObject && [responseObject isKindOfClass:[NSDictionary class]] && responseObject[@"data"] && [responseObject[@"data"] isKindOfClass:[NSDictionary class]]) {
-            NSString *errorCode = [NSString stringWithFormat:@"%@", responseObject[@"errorCode"]];
-            NSDictionary *data = responseObject[@"data"];
+        if (isSuccess) {
             CNLiveTradingRecordModel *model = [CNLiveTradingRecordModel mj_objectWithKeyValues:data];
             if(self.pageNo == 1&&self.data.count > 0){
                 [self.data removeAllObjects];
@@ -78,54 +68,8 @@ static const CGFloat height = 80;
             self.tradingRecordView.model = model;
             [self.tableView reloadData];
-
-        }else{
-
         }
-
     }];
-            
-//            [[HttpService service]sendRequestWithHttpMethod:E_HTTP_REQUEST_METHOD_POST URLPath:CNGetTradingRecordUrl parameters:params isCache:NO CheckParam:nil completionHandler:^(id data, NSError *error) {
-//                if (error) {
-//                    NSLog(@"error:%@",error.localizedDescription);
-//                    [self.tableView.mj_header endRefreshing];
-//                    [self.tableView.mj_footer endRefreshing];
-//                    [self.dataArray removeAllObjects];
-//                    [self.tableView reloadData];
-//    //                [self showEmptyViewWithFrame:CGRectMake(0, kNavigationBarHeight+80, KScreenWidth, KScreenHeight-kNavigationBarHeight-80) image:[UIImage imageNamed:@"wufalianjie"] text:error.localizedDescription detailText:@"别紧张，试试看刷新页面~" buttonTitle:@"     重试     " buttonAction:@selector(refreshList)];
-//                    [self showEmptyViewWithImage:[UIImage imageNamed:@"wufalianjie"] text:error.localizedDescription detailText:@"别紧张，试试看刷新页面~" buttonTitle:@"     重试     " buttonAction:@selector(refreshList)];
-//                    [self setCNAPIErrorEmptyView];
-//                    self.emptyView.verticalOffset = -(kNavigationBarHeight+80);
-//    //                [QMUITips showError:error.localizedDescription inView:self.view hideAfterDelay:1.5];
-//                    return;
-//                }
-//                NSLog(@"data:%@",data);
-//                if (refresh) {
-//                    _page = 1;
-//                    [self.dataArray removeAllObjects];
-//                    [self.tableView.mj_header endRefreshing];
-//                } else {
-//                    [self.tableView.mj_footer endRefreshing];
-//                }
-//                _lastPage = [data[@"lastPage"] boolValue];
-//                double defray = [data[@"defray"] doubleValue];
-//                double income = [data[@"income"] doubleValue];
-//                self.payLab.text = [NSString stringWithFormat:@"支出 ¥%.2f",defray];
-//                self.incomeLab.text = [NSString stringWithFormat:@"收入 ¥%.2f",income];
-//                if (data[@"list"] && [data[@"list"] isKindOfClass:[NSArray class]] && [NSArray arrayWithArray:data[@"list"]].count>0) {
-//
-//                    NSMutableArray *arrayM = [NSMutableArray array];
-//                    for (NSDictionary *dic in data[@"list"]) {
-//                        CNTradingRecordModel *model = [CNTradingRecordModel mj_objectWithKeyValues:dic];
-//                        [arrayM addObject:model];
-//                    }
-//                    self.dataArray = [self.dataArray arrayByAddingObjectsFromArray:arrayM].mutableCopy;
-//                } else {
-//                    [self.dataArray removeAllObjects];
-//                    [self.tableView addSubview:self.noDataView];
-//                }
-//                [self.tableView reloadData];
-//            }];
 }
@@ -144,9 +88,14 @@ static const CGFloat height = 80;
     else {
         self.automaticallyAdjustsScrollViewInsets = NO;
     }
+    [self createSubViews];
+    
+    NSArray *times = [CNLiveBalanceRequest getMonthFirstAndLastDayWithDate:[NSDate date]];
+    
+    self.startTime = times.firstObject;
+    self.endTime = times.lastObject;
     self.pageNo = 1;
-    [self createSubViews];
     [self loadData];
 }
@@ -10,12 +10,19 @@
 NS_ASSUME_NONNULL_BEGIN
 typedef void(^GetBalanceBlock)(BOOL isSuccess, NSString *number);
+typedef void(^GetTradingRecordBlock)(BOOL isSuccess, NSDictionary *data, NSError *error);
 @interface CNLiveBalanceRequest : NSObject
 // 获取余额
 + (void)getBalance:(NSString *)type ID:(NSString *)ID block:(GetBalanceBlock)block;
+// 
++ (void)getTradingRecordWithType:(NSString *)type startTime:(NSString *)startTime endTime:(NSString *)endTime block:(GetTradingRecordBlock)block;
+
++ (NSArray *)getMonthFirstAndLastDayWithDate:(NSDate *)date;
+
+
 @end
 NS_ASSUME_NONNULL_END
@@ -9,6 +9,7 @@
 #import "CNLiveBalanceRequest.h"
 #import "CNLiveNetworking.h"
 #import "CNLiveEnvironment.h"
+#import "CNUserInfoManager.h"
 @implementation CNLiveBalanceRequest
 #pragma mark - 获取余额
@@ -34,4 +35,46 @@
     }];
 }
++ (void)getTradingRecordWithType:(NSString *)type startTime:(NSString *)startTime endTime:(NSString *)endTime block:(GetTradingRecordBlock)block{
+    NSDictionary *params = @{@"appId":AppId,
+                             @"targetId":CNUserShareModel.uid?CNUserShareModel.uid:@"",
+                             @"type":type?type:@"0",//0全部(默认) 1收入 2支出
+                             @"startTime":startTime?startTime:@"",
+                             @"endTime":endTime?endTime:@"",
+                             @"pageSize":[NSString stringWithFormat:@"%d",INT_MAX],
+                             @"pageNo":[NSString stringWithFormat:@"%d", 1]
+                             };
+    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNGetTradingRecordUrl Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+        if (responseObject && [responseObject isKindOfClass:[NSDictionary class]] && responseObject[@"data"] && [responseObject[@"data"] isKindOfClass:[NSDictionary class]]) {
+            NSString *errorCode = [NSString stringWithFormat:@"%@", responseObject[@"errorCode"]];
+            NSDictionary *data = responseObject[@"data"];
+            block?block([errorCode isEqualToString:@"0"], data, error):@"";
+
+        }else{
+            block?block(NO, nil, error):@"";
+
+        }
+
+    }];
+    
+}
+
++ (NSArray *)getMonthFirstAndLastDayWithDate:(NSDate *)date{
+    double interval = 0;
+    NSDate *firstDateOut = nil;
+    NSDate *lastDateOut = nil;
+    NSCalendar *calendar = [NSCalendar currentCalendar];
+    BOOL OK = [calendar rangeOfUnit:NSCalendarUnitMonth startDate:&firstDateOut interval:&interval forDate:date];
+    if (OK) {
+        lastDateOut = [firstDateOut dateByAddingTimeInterval:interval-1];
+    }else {
+        return @[@"",@""];
+    }
+    NSString *firstOutString = [NSString stringWithFormat:@"%ld", (long)[firstDateOut timeIntervalSince1970]*1000];
+    NSString *lastOutString = [NSString stringWithFormat:@"%ld", (long)[lastDateOut timeIntervalSince1970]*1000];
+    return @[firstOutString, lastOutString];
+    
+}
+
 @end
@@ -12,6 +12,7 @@
 #import "CNLiveCategory.h"
 #import "CNLiveBaseKit.h"
 #import "PGDatePickManager.h"
+#import "CNLiveBalanceRequest.h"
 @interface CNLiveMonthBillView ()<PGDatePickerDelegate>
 @property (nonatomic, strong) QMUIButton *switchTime;
@@ -95,31 +96,14 @@ static const NSInteger margin = 20;
     NSString *value = [dateFormatter stringFromDate:date];
     [_switchTime setTitle:value forState:UIControlStateNormal];
-    NSArray *timeArr = [self getMonthFirstAndLastDayWith:date];
-    NSLog(@"%@",timeArr);
+    NSArray *times = [CNLiveBalanceRequest getMonthFirstAndLastDayWithDate:date];
+    NSLog(@"%@",times);
     if (self.delegate && [self.delegate respondsToSelector:@selector(monthBillView:startTime:endTime:)]) {
-        [self.delegate monthBillView:self startTime:timeArr.firstObject endTime:timeArr.lastObject];
+        [self.delegate monthBillView:self startTime:times.firstObject endTime:times.lastObject];
     }
 }
-- (NSArray *)getMonthFirstAndLastDayWith:(NSDate *)date{
-    double interval = 0;
-    NSDate *firstDateOut = nil;
-    NSDate *lastDateOut = nil;
-    NSCalendar *calendar = [NSCalendar currentCalendar];
-    BOOL OK = [calendar rangeOfUnit:NSCalendarUnitMonth startDate:&firstDateOut interval:&interval forDate:date];
-    if (OK) {
-        lastDateOut = [firstDateOut dateByAddingTimeInterval:interval-1];
-    }else {
-        return @[@"",@""];
-    }
-    NSString *firstOutString = [NSString stringWithFormat:@"%ld", (long)[firstDateOut timeIntervalSince1970]*1000];
-    NSString *lastOutString = [NSString stringWithFormat:@"%ld", (long)[lastDateOut timeIntervalSince1970]*1000];
-    return @[firstOutString, lastOutString];
-    
-}
-
 /*
  // Only override drawRect: if you perform custom drawing.
  // An empty implementation adversely affects performance during animation.
@@ -12,6 +12,8 @@
 #import "CNLiveCategory.h"
 #import "CNLiveBaseKit.h"
 #import "PGDatePickManager.h"
+#import "CNLiveBalanceRequest.h"
+
 #import "CNLiveTradingRecordModel.h"
 @interface CNLiveTradingRecordView ()<PGDatePickerDelegate>
@@ -71,7 +73,7 @@ static const NSInteger height = 30;
 #pragma mark - PGDatePickerDelegate
 - (void)datePicker:(PGDatePicker *)datePicker didSelectDate:(NSDateComponents *)dateComponents{
     dateComponents.day = 1;
-    NSCalendar * calendar = [NSCalendar currentCalendar];
+    NSCalendar *calendar = [NSCalendar currentCalendar];
     NSDate *date = [calendar dateFromComponents:dateComponents];
     NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
     [dateFormatter setLocale:[NSLocale currentLocale]];
@@ -79,28 +81,11 @@ static const NSInteger height = 30;
     NSString *value = [dateFormatter stringFromDate:date];
     [_switchTime setTitle:value forState:UIControlStateNormal];
-    NSArray *timeArr = [self getMonthFirstAndLastDayWith:date];
-    NSLog(@"%@",timeArr);
+    NSArray *times = [CNLiveBalanceRequest getMonthFirstAndLastDayWithDate:date];
+    NSLog(@"%@",times);
     if (self.delegate && [self.delegate respondsToSelector:@selector(tradingRecordView:date:startTime:endTime:)]) {
-        [self.delegate tradingRecordView:self date:value startTime:timeArr.firstObject endTime:timeArr.lastObject];
-    }
-    
-}
-
-- (NSArray *)getMonthFirstAndLastDayWith:(NSDate *)date{
-    double interval = 0;
-    NSDate *firstDateOut = nil;
-    NSDate *lastDateOut = nil;
-    NSCalendar *calendar = [NSCalendar currentCalendar];
-    BOOL OK = [calendar rangeOfUnit:NSCalendarUnitMonth startDate:&firstDateOut interval:&interval forDate:date];
-    if (OK) {
-        lastDateOut = [firstDateOut dateByAddingTimeInterval:interval-1];
-    }else {
-        return @[@"",@""];
+        [self.delegate tradingRecordView:self date:value startTime:times.firstObject endTime:times.lastObject];
     }
-    NSString *firstOutString = [NSString stringWithFormat:@"%ld", (long)[firstDateOut timeIntervalSince1970]*1000];
-    NSString *lastOutString = [NSString stringWithFormat:@"%ld", (long)[lastDateOut timeIntervalSince1970]*1000];
-    return @[firstOutString, lastOutString];
 }