iOS Team / CNLiveBalanceModule · Commits

Commit 605b7d4215bb3b56369aa66e93382c368f03fb69

Authored by zhangxiaowen
1 parent 87ecd1a5

no message

Inline Side-by-side
Showing 7 changed files with 34 additions and 15 deletions
CNLiveBalanceModule/Assets/CNLiveBalanceModule.xcassets/cnlive_no_bill.imageset/Contents.json 0 → 100644
  View file @605b7d4
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "filename" : "cnlive_no_bill@2x.png",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "filename" : "cnlive_no_bill@3x.png",
  15 + "scale" : "3x"
  16 + }
  17 + ],
  18 + "info" : {
  19 + "version" : 1,
  20 + "author" : "xcode"
  21 + }
  22 +}
0 \ No newline at end of file 23 \ No newline at end of file
CNLiveBalanceModule/Assets/CNLiveBalanceModule.xcassets/cnlive_no_bill.imageset/cnlive_no_bill@2x.png 0 → 100644
View file @605b7d4

4.72 KB
CNLiveBalanceModule/Assets/CNLiveBalanceModule.xcassets/cnlive_no_bill.imageset/cnlive_no_bill@3x.png 0 → 100644
View file @605b7d4

11.5 KB
CNLiveBalanceModule/Classes/Detail/CNLiveBalanceDetailBaseController.m
  View file @605b7d4
@@ -39,9 +39,9 @@ static const CGFloat height = 44; @@ -39,9 +39,9 @@ static const CGFloat height = 44;
39 if (error) { 39 if (error) {
40 [self.data removeAllObjects]; 40 [self.data removeAllObjects];
41 [self.tableView reloadData]; 41 [self.tableView reloadData];
42 - [self showEmptyViewWithImage:[UIImage imageNamed:@"wufalianjie"] text:error.localizedDescription detailText:@"别紧张，试试看刷新页面~" buttonTitle:@" 重试 " buttonAction:@selector(loadData)];  
43 - [self setCNAPIErrorEmptyView];  
44 - self.emptyView.verticalOffset = -(NavigationContentTop+height); 42 + [self.tableView showEmptyViewWithType:CNLiveCustomTipsTypeLoadFail noData:self.data.count == 0 block:^{
  43 + [self.tableView.mj_header beginRefreshing];
  44 + }];
45 return; 45 return;
46 } 46 }
47 47
@@ -59,8 +59,10 @@ static const CGFloat height = 44; @@ -59,8 +59,10 @@ static const CGFloat height = 44;
59 59
60 } 60 }
61 [self.data addObjectsFromArray:model.list]; 61 [self.data addObjectsFromArray:model.list];
  62 + UIImage *image = [self getImageWithImageName:@"cnlive_no_bill" bundleName:@"CNLiveBalanceModule" targetClass:[self class]];
  63 + [self.tableView showEmptyViewWithImage:image text:@"您现在没有相关内容哦" buttonText:@"重新加载" noData:self.data.count == 0 block:nil];
  64 + self.tableView.emptyView.top = 0;
62 [self.tableView reloadData]; 65 [self.tableView reloadData];
63 -  
64 66
65 } 67 }
66 self.tableView.mj_footer.hidden = self.data.count == 0; 68 self.tableView.mj_footer.hidden = self.data.count == 0;
CNLiveBalanceModule/Classes/TradingRecord/CNLiveMonthBillController.m
  View file @605b7d4
@@ -77,7 +77,9 @@ static const CGFloat height = 60; @@ -77,7 +77,9 @@ static const CGFloat height = 60;
77 [self.data removeAllObjects]; 77 [self.data removeAllObjects];
78 } 78 }
79 [self.data addObjectsFromArray:model.list]; 79 [self.data addObjectsFromArray:model.list];
80 - [self.tableView showEmptyViewWithType:CNLiveCustomTipsTypeNoData noData:self.data.count == 0 block:nil]; 80 +
  81 + UIImage *image = [self getImageWithImageName:@"cnlive_no_bill" bundleName:@"CNLiveBalanceModule" targetClass:[self class]];
  82 + [self.tableView showEmptyViewWithImage:image text:@"您现在没有相关内容哦" buttonText:@"重新加载" noData:self.data.count == 0 block:nil];
81 self.tableView.emptyView.top = 0; 83 self.tableView.emptyView.top = 0;
82 [self.tableView reloadData]; 84 [self.tableView reloadData];
83 } 85 }
CNLiveBalanceModule/Classes/TradingRecord/CNLiveTradingRecordController.m
  View file @605b7d4
@@ -85,15 +85,8 @@ static const CGFloat height = 80; @@ -85,15 +85,8 @@ static const CGFloat height = 80;
85 [self.data removeAllObjects]; 85 [self.data removeAllObjects];
86 } 86 }
87 [self.data addObjectsFromArray:self.type == TradingRecordTypeDefault?model.list:model.transferRecordList]; 87 [self.data addObjectsFromArray:self.type == TradingRecordTypeDefault?model.list:model.transferRecordList];
88 -// UIImage *image = [self getImageWithImageName:@"cnlive_no_data" bundleName:@"CNLiveCategory" targetClass:[CNLiveEmptyView class]];  
89 -// [self.tableView showEmptyViewWithImage:image text:@"加载失败" buttonText:@"重新加载" noData:self.data.count == 0 block:^{  
90 -// [self.tableView.mj_header beginRefreshing];  
91 -//  
92 -// }];  
93 - [self.tableView showEmptyViewWithType:CNLiveCustomTipsTypeNoData noData:self.data.count == 0 block:^{  
94 - [self.tableView.mj_header beginRefreshing];  
95 -  
96 - }]; 88 + UIImage *image = [self getImageWithImageName:@"cnlive_no_bill" bundleName:@"CNLiveBalanceModule" targetClass:[self class]];
  89 + [self.tableView showEmptyViewWithImage:image text:@"您现在没有相关内容哦" buttonText:@"重新加载" noData:self.data.count == 0 block:nil];
97 self.tableView.emptyView.top = 0; 90 self.tableView.emptyView.top = 0;
98 91
99 self.tradingRecordView.model = model; 92 self.tradingRecordView.model = model;
CNLiveBalanceModule/Classes/View/CNLiveBalanceView.m
  View file @605b7d4
@@ -84,7 +84,7 @@ static const NSInteger margin = 30; @@ -84,7 +84,7 @@ static const NSInteger margin = 30;
84 - (UILabel *)title { 84 - (UILabel *)title {
85 if (!_title) { 85 if (!_title) {
86 _title = [[UILabel alloc] init]; 86 _title = [[UILabel alloc] init];
87 - [_title setFont:UIFontCNMake(12.0)]; 87 + [_title setFont:UIFontCNMake(14.0)];
88 _title.textColor = [UIColor whiteColor]; 88 _title.textColor = [UIColor whiteColor];
89 _title.text = @"账户余额(元)"; 89 _title.text = @"账户余额(元)";
90 } 90 }