iOS Team / ScioLive · Commits

Commit 5552b120f3dc1fb4b41fdd69e6ca39863637f191

Authored by yanglingyu
1 parent 2a5af8b5

文案，loading修改

Inline Side-by-side
Showing 3 changed files with 9 additions and 7 deletions
CNLiveScioLive/Pages/Home/CNHomeENViewController.m
  View file @5552b12
... ... @@ -54,7 +54,6 @@ static NSString *newsUpPicTableViewCell = @"CNLiveNewsUpPicTableViewCell";
54 54  
55 55 [AlertViewTool showHUDView];
56 56 [XWHTTPTool POST:strUrl params:parameters success:^(id json) {
57   - [MBProgressHUD hideHUDForView:self.view animated:YES];
58 57 [AlertViewTool hideHUDView];
59 58  
60 59 // 请求成功，解析数据
... ... @@ -88,13 +87,16 @@ static NSString *newsUpPicTableViewCell = @"CNLiveNewsUpPicTableViewCell";
88 87  
89 88  
90 89 } failure:^(NSError *error) {
  90 + [AlertViewTool hideHUDView];
  91 + self->_isRefreshing = NO;
  92 + [self.tableView.mj_footer endRefreshing];
  93 + [self.tableView.mj_header endRefreshing];
  94 + [AlertViewTool showHUDViewText:CustomStr(@"ServerBusy")];
91 95 NSData *data = [[NSUserDefaults standardUserDefaults] objectForKey:@"ENHome"];
92 96 if (data && self.pageNo == 1) {
93 97 [self dealDictionaryData:data];
94 98 }
95   - [AlertViewTool hideHUDView];
96   - self->_isRefreshing = NO;
97   - [AlertViewTool showHUDViewText:CustomStr(@"ServerBusy")];
  99 +
98 100  
99 101 }];
100 102 }
... ...
CNLiveScioLive/Pages/Sources/zh-Hans.lproj/Localizable.strings
  View file @5552b12
... ... @@ -135,7 +135,7 @@
135 135  
136 136 //提示
137 137 "NetworkiInterruption" = "网络连接中断";
138   -"ServerBusy" = "服务器忙";
  138 +"ServerBusy" = "网络异常";
139 139 "PhoneNumberError" = "手机号错误";
140 140 "EmailError" = "邮箱错误";
141 141 "CodeError" = "验证码错误";
... ...
CNLiveScioLive/Pages/Tools/AlertView/AlertViewTool.m
  View file @5552b12
... ... @@ -96,11 +96,11 @@
96 96  
97 97 }
98 98 + (void)showHUDView{
99   - [MBProgressHUD showHUDAddedTo:[self getCurrentVC].view animated:YES];
  99 + [MBProgressHUD showHUDAddedTo:AppKeyWindow animated:YES];
100 100 }
101 101  
102 102 + (void)hideHUDView{
103   - [MBProgressHUD hideHUDForView:[self getCurrentVC].view animated:YES];
  103 + [MBProgressHUD hideHUDForView:AppKeyWindow animated:YES];
104 104 }
105 105  
106 106 + (UIViewController *)getCurrentVC{
... ...