iOS Team / CNLiveCMineModule · Commits

Commit 1458564c6b9bfc6ffdc293880ff69e3fcd8c74f2

Authored by yanglingyu
1 parent e601e862

修复云测bug

Inline Side-by-side
Showing 5 changed files with 14 additions and 2 deletions
CNLiveCMineModule/Classes/CNCSubMine/ViewController/CNMineCodeVC.m
  View file @1458564
@@ -84,9 +84,11 @@ @@ -84,9 +84,11 @@
84 { 84 {
85 [super viewWillAppear:animated]; 85 [super viewWillAppear:animated];
86 [BHConfig set:@"2" value:@"darenPayMent"]; 86 [BHConfig set:@"2" value:@"darenPayMent"];
  87 + self.navigationController.navigationBarHidden = YES;
87 } 88 }
88 - (void)viewWillDisappear:(BOOL)animated{ 89 - (void)viewWillDisappear:(BOOL)animated{
89 [super viewWillDisappear:animated]; 90 [super viewWillDisappear:animated];
  91 + self.navigationController.navigationBarHidden = NO;
90 } 92 }
91 - (BOOL)preferredNavigationBarHidden 93 - (BOOL)preferredNavigationBarHidden
92 { 94 {
CNLiveCMineModule/Classes/CNWallet/ViewController/CNChangePayPasswordController.m
  View file @1458564
@@ -226,7 +226,7 @@ @@ -226,7 +226,7 @@
226 [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNCheckVerifyCodeSetPasswordUrl Param:paramDict CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) { 226 [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNCheckVerifyCodeSetPasswordUrl Param:paramDict CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
227 if (error) { 227 if (error) {
228 [QMUITips showError:@"验证验证码失败" inView:self.view hideAfterDelay:1.5]; 228 [QMUITips showError:@"验证验证码失败" inView:self.view hideAfterDelay:1.5];
229 - self.sendNoteButton.userInteractionEnabled = YES; 229 +// self.sendNoteButton.userInteractionEnabled = YES;
230 return; 230 return;
231 } 231 }
232 NSLog(@"data:%@",responseObject); 232 NSLog(@"data:%@",responseObject);
CNLiveCMineModule/Classes/CNWallet/ViewController/CNTradingRecordController.m
  View file @1458564
@@ -36,7 +36,7 @@ static NSString *walletDetailCellId = @"walletDetailCellId"; @@ -36,7 +36,7 @@ static NSString *walletDetailCellId = @"walletDetailCellId";
36 @property (nonatomic, strong) CNNoOrderView *noDataView; 36 @property (nonatomic, strong) CNNoOrderView *noDataView;
37 @property (nonatomic, strong) NSArray *timeArr; 37 @property (nonatomic, strong) NSArray *timeArr;
38 @property (nonatomic, copy) NSString *monthStr; 38 @property (nonatomic, copy) NSString *monthStr;
39 - 39 +@property (nonatomic, strong)NSDate *selectDate;
40 @end 40 @end
41 41
42 @implementation CNTradingRecordController 42 @implementation CNTradingRecordController
@@ -132,6 +132,7 @@ static NSString *walletDetailCellId = @"walletDetailCellId"; @@ -132,6 +132,7 @@ static NSString *walletDetailCellId = @"walletDetailCellId";
132 [CNLiveNetworking setupShowDataResult:YES]; 132 [CNLiveNetworking setupShowDataResult:YES];
133 weakself 133 weakself
134 [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNViewTransferRecordUrl Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) { 134 [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNViewTransferRecordUrl Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
  135 + [QMUITips hideAllTips];
135 if (error) { 136 if (error) {
136 NSLog(@"error:%@",error.localizedDescription); 137 NSLog(@"error:%@",error.localizedDescription);
137 [weakSelf.tableView.mj_header endRefreshing]; 138 [weakSelf.tableView.mj_header endRefreshing];
@@ -213,6 +214,7 @@ static NSString *walletDetailCellId = @"walletDetailCellId"; @@ -213,6 +214,7 @@ static NSString *walletDetailCellId = @"walletDetailCellId";
213 //获取当前时间日期 214 //获取当前时间日期
214 NSString *dateStr = [dateFormatter stringFromDate:[NSDate date]]; 215 NSString *dateStr = [dateFormatter stringFromDate:[NSDate date]];
215 datePicker.minimumDate = [dateFormatter dateFromString: @"2017-01"]; 216 datePicker.minimumDate = [dateFormatter dateFromString: @"2017-01"];
  217 + [datePicker setDate:self.selectDate?self.selectDate: [dateFormatter dateFromString: dateStr]];
216 datePicker.maximumDate = [dateFormatter dateFromString: dateStr]; 218 datePicker.maximumDate = [dateFormatter dateFromString: dateStr];
217 [self presentViewController:datePickManager animated:false completion:nil]; 219 [self presentViewController:datePickManager animated:false completion:nil];
218 } 220 }
@@ -230,6 +232,10 @@ static NSString *walletDetailCellId = @"walletDetailCellId"; @@ -230,6 +232,10 @@ static NSString *walletDetailCellId = @"walletDetailCellId";
230 dateComponents.day = 1; 232 dateComponents.day = 1;
231 NSCalendar * calendar = [NSCalendar currentCalendar]; 233 NSCalendar * calendar = [NSCalendar currentCalendar];
232 NSDate * date = [calendar dateFromComponents:dateComponents]; 234 NSDate * date = [calendar dateFromComponents:dateComponents];
  235 + if ([date compare:datePicker.maximumDate] == NSOrderedDescending) {
  236 + date = datePicker.maximumDate;
  237 + }
  238 + self.selectDate = date;
233 NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; 239 NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
234 [dateFormatter setLocale:[NSLocale currentLocale]]; 240 [dateFormatter setLocale:[NSLocale currentLocale]];
235 [dateFormatter setDateFormat:@"yyyy年M月"];//dd日h:mm:ss t 241 [dateFormatter setDateFormat:@"yyyy年M月"];//dd日h:mm:ss t
CNLiveCMineModule/Classes/Colletion/ViewController/CNMineCollectController.m
  View file @1458564
@@ -117,6 +117,7 @@ static NSString * const kCNLiveWebViewForCollectionRefreshKey = @"kCNLiveWebView @@ -117,6 +117,7 @@ static NSString * const kCNLiveWebViewForCollectionRefreshKey = @"kCNLiveWebView
117 - (void)viewDidDisappear:(BOOL)animated { 117 - (void)viewDidDisappear:(BOOL)animated {
118 [super viewDidDisappear:animated]; 118 [super viewDidDisappear:animated];
119 _isRefresh = @"0";//1不刷新 119 _isRefresh = @"0";//1不刷新
  120 +// [self.tableView scrollToTopAnimated:NO];
120 } 121 }
121 122
122 - (void)viewDidLoad { 123 - (void)viewDidLoad {
CNLiveCMineModule/Classes/inte/Controller/CNLiveCMineInteDetailViewController.m
  View file @1458564
@@ -114,6 +114,9 @@ static NSInteger const kCNLiveSectionHeaderHeight = 120;//头视图高度 @@ -114,6 +114,9 @@ static NSInteger const kCNLiveSectionHeaderHeight = 120;//头视图高度
114 dateComponents.day = 1; 114 dateComponents.day = 1;
115 NSCalendar * calendar = [NSCalendar currentCalendar]; 115 NSCalendar * calendar = [NSCalendar currentCalendar];
116 NSDate * date = [calendar dateFromComponents:dateComponents]; 116 NSDate * date = [calendar dateFromComponents:dateComponents];
  117 + if ([date compare:datePicker.maximumDate] == NSOrderedDescending) {
  118 + date = datePicker.maximumDate;
  119 + }
117 NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; 120 NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
118 [dateFormatter setLocale:[NSLocale currentLocale]]; 121 [dateFormatter setLocale:[NSLocale currentLocale]];
119 [dateFormatter setDateFormat:@"yyyy-MM"]; 122 [dateFormatter setDateFormat:@"yyyy-MM"];