iOS Team / ScioLive · Commits

Commit 05c8ca3dea85d27aee965258b06c342272abf6f2

Authored by yanglingyu
1 parent 3afdb34e

列表标签，标题文字加红

Inline Side-by-side
Showing 25 changed files with 84 additions and 210 deletions
CNLiveScioLive/AppDelegate.m
  View file @05c8ca3
... ... @@ -97,7 +97,7 @@
97 97 #pragma mark - 请求启动页
98 98 -(void)requestLanchImage
99 99 {
100   - NSString *urlStr = @"http://app.phonemovie.cnlive.com/gxb/openBanner";
  100 + NSString *urlStr = REQUESTURL(@"gxb/openBanner");
101 101 NSDictionary *parameters = @{@"params":@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"pageUUID\":\"852cde69-ecd8-11e6-b52e-c7d8a7a18cc4\",\"pageType\":\"channelList\"}"};
102 102 [XWHTTPTool GET:urlStr params:parameters success:^(id json) {
103 103 NSDictionary *dic = [NSDictionary dictionaryWithDictionary:json];
... ... @@ -291,7 +291,7 @@
291 291 return;
292 292 }
293 293  
294   - NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/programByContentId";
  294 + NSString *strUrl = REQUESTURL(@"gxb/api/programByContentId");
295 295  
296 296 NSString *parameter = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"38_iuvkou3xi05\",\"cmsContentId\":\"%@\"}",idStr];
297 297 NSDictionary *parameters = @{@"params":parameter};
... ...
CNLiveScioLive/Pages/Header/UrlMacro.h
  View file @05c8ca3
... ... @@ -9,6 +9,12 @@
9 9 #ifndef UrlMacro_h
10 10 #define UrlMacro_h
11 11  
  12 +#ifdef DEBUG
  13 +#define REQUESTURL(url) [@"http://test.app.phonemovie.cnlive.com/" stringByAppendingPathComponent:url]
  14 +#else
  15 +#define REQUESTURL(url) [@"http://app.phonemovie.cnlive.com/" stringByAppendingPathComponent:url]
  16 +#endif
  17 +
12 18 #define IS_STRING_EMPTY(string) (string==nil || string == NULL || [string isKindOfClass:[NSNull class]] || [[string stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] length]==0 || [string isEqualToString:@""] || [string isEqualToString:@"<null>"])
13 19  
14 20 #define LOCARRAYLIST_PATH [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0] stringByAppendingPathComponent:@"LocArrayList.db"]
... ... @@ -25,7 +31,7 @@
25 31 #define SQLITE_PATH [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0] stringByAppendingPathComponent:@"notice.sqldb"]
26 32  
27 33 #define SEARCH_HISTORY @"searchHistory.txt"
28   -#define searchApi @"http://app.phonemovie.cnlive.com/gxb/api/programList"
  34 +#define searchApi REQUESTURL(@"gxb/api/programList")
29 35  
30 36  
31 37 #define IKEY @"0"
... ... @@ -45,7 +51,7 @@
45 51 //#define tuwen(id) [NSString stringWithFormat:@"http://www.scio.gov.cn:9095/video/JsonDataFromGXW.aspx/JsonDataFromGXW.aspx?type=Doc&DocID=%d",id]
46 52 #define tuwen(id) [NSString stringWithFormat:@"http://www.scio.gov.cn:9095/video/JsonDataFromGXW.aspx?type=Doc&DocID=%d",id]
47 53  
48   -#define FORECAST @"http://app.phonemovie.cnlive.com/gxb/api/"
  54 +#define FORECAST REQUESTURL(@"gxb/api/")
49 55 #define yugaoliebiao @"http://www.scio.gov.cn:9095/video/JsonDataFromGXW.aspx?type=DocList&ChannelID=20490"
50 56 //#define newsdetail(id) [NSString stringWithFormat:@"http://www.scio.gov.cn:9095/video/JsonDataFromGXW.aspx/JsonDataFromGXW.aspx?type=Doc&DocID=%d",id]
51 57  
... ...
CNLiveScioLive/Pages/Home/CNHomeBaseViewController.m
  View file @05c8ca3
... ... @@ -31,7 +31,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
31 31  
32 32 #pragma mark - Data
33 33 - (void)loadData{
34   - NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
  34 + NSString *strUrl = REQUESTURL(@"gxb/api/cataloglatest");
35 35 //NSLog(@"%@",strUrl);
36 36 NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"%@\",\"page\":\"%ld\",\"pageSize\":\"10\"}",self.cid,(long)self.pageNo];
37 37 //NSLog(@"%@",categoryId);
... ... @@ -176,30 +176,6 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
176 176 return cell;
177 177  
178 178 }
179   - else if([model.showType isEqualToString:@"1"]){
180   - if(model.img && ![model.img isEqualToString:@""]){
181   - //一张图 左边
182   - CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
183   - if (!cell) {
184   - cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
185   - }
186   - cell.selectionStyle = UITableViewCellSelectionStyleNone;
187   - cell.model = self.data[indexPath.row];
188   - return cell;
189   - }
190   - //无图
191   - CNLiveNewsNoPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsNoPicTableViewCell];
192   - if (!cell) {
193   - cell = [[CNLiveNewsNoPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsNoPicTableViewCell];
194   - }
195   -// CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
196   -// if (!cell) {
197   -// cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
198   -// }
199   - cell.selectionStyle = UITableViewCellSelectionStyleNone;
200   - cell.model = self.data[indexPath.row];
201   - return cell;
202   - }
203 179 else if([model.showType isEqualToString:@"2"]){
204 180 //三张图
205 181 CNLiveNewsThreePicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsThreePicTableViewCell];
... ... @@ -211,7 +187,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
211 187 return cell;
212 188  
213 189 }
214   - else if([model.showType isEqualToString:@"3"]){
  190 + else {
215 191 if(model.img){
216 192 //一张图 左边
217 193 CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
... ... @@ -234,21 +210,6 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
234 210 cell.selectionStyle = UITableViewCellSelectionStyleNone;
235 211 cell.model = self.data[indexPath.row];
236 212 return cell;
237   -
238   - }else{
239   - //无图
240   - CNLiveNewsNoPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsNoPicTableViewCell];
241   - if (!cell) {
242   - cell = [[CNLiveNewsNoPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsNoPicTableViewCell];
243   - }
244   -// CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
245   -// if (!cell) {
246   -// cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
247   -// }
248   - cell.selectionStyle = UITableViewCellSelectionStyleNone;
249   - cell.model = self.data[indexPath.row];
250   - return cell;
251   -
252 213 }
253 214  
254 215 }
... ...
CNLiveScioLive/Pages/Home/CNHomeENViewController.m
  View file @05c8ca3
... ... @@ -34,7 +34,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
34 34  
35 35 #pragma mark - Data
36 36 - (void)loadData{
37   - NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
  37 + NSString *strUrl = REQUESTURL(@"gxb/api/cataloglatest");
38 38 NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"38_ivkou3xi05\",\"categoryId\":\"%@\",\"page\":\"%ld\",\"pageSize\":\"10\"}",@"wz/scio/",(long)self.pageNo];
39 39  
40 40 NSDictionary *parameters = @{@"params":categoryId};
... ... @@ -215,30 +215,6 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
215 215 return cell;
216 216  
217 217 }
218   - else if([model.showType isEqualToString:@"1"]){
219   - if(model.img && ![model.img isEqualToString:@""]){
220   - //一张图 左边
221   - CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
222   - if (!cell) {
223   - cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
224   - }
225   - cell.selectionStyle = UITableViewCellSelectionStyleNone;
226   - cell.model = self.data[indexPath.row];
227   - return cell;
228   - }
229   - //无图
230   - CNLiveNewsNoPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsNoPicTableViewCell];
231   - if (!cell) {
232   - cell = [[CNLiveNewsNoPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsNoPicTableViewCell];
233   - }
234   -// CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
235   -// if (!cell) {
236   -// cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
237   -// }
238   - cell.selectionStyle = UITableViewCellSelectionStyleNone;
239   - cell.model = self.data[indexPath.row];
240   - return cell;
241   - }
242 218 else if([model.showType isEqualToString:@"2"]){
243 219 //三张图
244 220 CNLiveNewsThreePicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsThreePicTableViewCell];
... ... @@ -250,7 +226,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
250 226 return cell;
251 227  
252 228 }
253   - else if([model.showType isEqualToString:@"3"]){
  229 + else{
254 230 if(model.img){
255 231 //一张图 左边
256 232 CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
... ... @@ -274,22 +250,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
274 250 cell.model = self.data[indexPath.row];
275 251 return cell;
276 252  
277   - }else{
278   - //无图
279   - CNLiveNewsNoPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsNoPicTableViewCell];
280   - if (!cell) {
281   - cell = [[CNLiveNewsNoPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsNoPicTableViewCell];
282   - }
283   -// CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
284   -// if (!cell) {
285   -// cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
286   -// }
287   - cell.selectionStyle = UITableViewCellSelectionStyleNone;
288   - cell.model = self.data[indexPath.row];
289   - return cell;
290   -
291 253 }
292   -
293 254 }
294 255 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
295 256 CNHomeModel *model = self.data[indexPath.row];
... ...
CNLiveScioLive/Pages/Home/CNHomeModel.h
  View file @05c8ca3
... ... @@ -13,6 +13,8 @@
13 13 @property (nonatomic, copy) NSString *title;
14 14 @property (nonatomic, copy) NSString *uuid;
15 15 @property (nonatomic, copy) NSString *subTitle;
  16 +@property (nonatomic, copy) NSString *titleColor;
  17 +@property (nonatomic, copy) NSString *tagsColor;
16 18  
17 19  
18 20 @property (nonatomic, copy) NSString *ID;
... ...
CNLiveScioLive/Pages/Home/CNHomeViewController.m
  View file @05c8ca3
... ... @@ -24,7 +24,7 @@
24 24 @implementation CNHomeViewController
25 25 #pragma mark - Data
26 26 - (void)getData{
27   - NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/page";
  27 + NSString *strUrl = REQUESTURL(@"gxb/api/page");
28 28  
29 29 NSDictionary *parameters = @{@"params":@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"pageUUID\":\"852cde69-ecd8-11e6-b52e-c7d8a7a18cc4\",\"pageType\":\"channelList\"}"};
30 30 if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
... ... @@ -93,9 +93,9 @@
93 93 }
94 94 if(controllers.count > 0){
95 95 self.segmentControl.titles = titles;
96   - if (ininav[@"textColor"]) {
97   - self.segmentControl.titleSelectColor = [UIColor colorWithHexString:ininav[@"textColor"]];
98   - [self.segmentControl setBottomViewColor:[UIColor colorWithHexString:ininav[@"textColor"]]];
  96 + if (ininavArray[0][@"textColor"]) {
  97 + self.segmentControl.titleSelectColor = [UIColor colorWithHexString:ininavArray[0][@"textColor"]];
  98 + [self.segmentControl setBottomViewColor:[UIColor colorWithHexString:ininavArray[0][@"textColor"]]];
99 99 }
100 100 self.segmentControl.viewControllers = controllers;
101 101 }
... ...
CNLiveScioLive/Pages/Home/外宣要闻/Controller/CNLiveHeraldedNewsViewController.m
  View file @05c8ca3
... ... @@ -34,7 +34,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
34 34  
35 35 #pragma mark - Data
36 36 - (void)loadData{
37   - NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
  37 + NSString *strUrl = REQUESTURL(@"gxb/api/cataloglatest");
38 38 //NSLog(@"%@",strUrl);
39 39 NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"%@\",\"page\":\"%ld\",\"pageSize\":\"10\"}",self.cid,(long)self.pageNo];
40 40 //NSLog(@"%@",categoryId);
... ... @@ -212,30 +212,6 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
212 212 return cell;
213 213  
214 214 }
215   - else if([model.showType isEqualToString:@"1"]){
216   - if(model.img && ![model.img isEqualToString:@""]){
217   - //一张图 左边
218   - CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
219   - if (!cell) {
220   - cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
221   - }
222   - cell.selectionStyle = UITableViewCellSelectionStyleNone;
223   - cell.model = self.data[indexPath.row];
224   - return cell;
225   - }
226   - //无图
227   - CNLiveNewsNoPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsNoPicTableViewCell];
228   - if (!cell) {
229   - cell = [[CNLiveNewsNoPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsNoPicTableViewCell];
230   - }
231   -// CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
232   -// if (!cell) {
233   -// cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
234   -// }
235   - cell.selectionStyle = UITableViewCellSelectionStyleNone;
236   - cell.model = self.data[indexPath.row];
237   - return cell;
238   - }
239 215 else if([model.showType isEqualToString:@"2"]){
240 216 //三张图
241 217 CNLiveNewsThreePicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsThreePicTableViewCell];
... ... @@ -246,45 +222,25 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
246 222 cell.model = self.data[indexPath.row];
247 223 return cell;
248 224  
249   - }
250   - else if([model.showType isEqualToString:@"3"]){
  225 + }else{
  226 +
251 227 if(model.img){
252   - //一张图 左边
253   - CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
254   - if (!cell) {
255   - cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
256   - }
257   - cell.selectionStyle = UITableViewCellSelectionStyleNone;
258   - cell.model = self.data[indexPath.row];
259   - return cell;
260   - }
261   - //无图
262   - CNLiveNewsNoPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsNoPicTableViewCell];
  228 + CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
263 229 if (!cell) {
264   - cell = [[CNLiveNewsNoPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsNoPicTableViewCell];
  230 + cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
265 231 }
266   -// CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
267   -// if (!cell) {
268   -// cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
269   -// }
270 232 cell.selectionStyle = UITableViewCellSelectionStyleNone;
271 233 cell.model = self.data[indexPath.row];
272 234 return cell;
273   -
274   - }else{
  235 + }
275 236 //无图
276 237 CNLiveNewsNoPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsNoPicTableViewCell];
277 238 if (!cell) {
278 239 cell = [[CNLiveNewsNoPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsNoPicTableViewCell];
279 240 }
280   -// CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
281   -// if (!cell) {
282   -// cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
283   -// }
284 241 cell.selectionStyle = UITableViewCellSelectionStyleNone;
285 242 cell.model = self.data[indexPath.row];
286 243 return cell;
287   -
288 244 }
289 245  
290 246  
... ...
CNLiveScioLive/Pages/Home/外宣要闻/View/CNLiveNewsLeftPicTableViewCell.m
  View file @05c8ca3
... ... @@ -80,7 +80,12 @@
80 80 _titleLabel.text = model.title;
81 81 _timeLabel.text = [model.createDate componentsSeparatedByString:@" "][0];
82 82 [_picImage sd_setImageWithURL:[NSURL URLWithString:model.img] placeholderImage:[UIImage imageNamed:@"placeholder"]];
83   -
  83 + if (model.titleColor) {
  84 + _titleLabel.textColor = [UIColor colorWithHexString:model.titleColor];
  85 + }
  86 + if (model.tagsColor) {
  87 + _projectLabel.backgroundColor = [UIColor colorWithHexString:model.tagsColor];
  88 + }
84 89 //专题
85 90 if(model.tags && ![model.tags isEqualToString:@""]){
86 91 _projectLabel.text = model.tags;
... ...
CNLiveScioLive/Pages/Home/外宣要闻/View/CNLiveNewsNoPicTableViewCell.m
  View file @05c8ca3
... ... @@ -63,6 +63,12 @@
63 63 - (void)setModel:(CNHomeModel *)model{
64 64 _model = model;
65 65 _titleLabel.text = model.title;
  66 + if (model.titleColor) {
  67 + _titleLabel.textColor = [UIColor colorWithHexString:model.titleColor];
  68 + }
  69 + if (model.tagsColor) {
  70 + _projectLabel.backgroundColor = [UIColor colorWithHexString:model.tagsColor];
  71 + }
66 72 _timeLabel.text = [model.createDate componentsSeparatedByString:@" "][0];
67 73  
68 74 if(model.tags && ![model.tags isEqualToString:@""]){
... ...
CNLiveScioLive/Pages/Home/外宣要闻/View/CNLiveNewsThreePicTableViewCell.m
  View file @05c8ca3
... ... @@ -94,7 +94,12 @@
94 94 _projectLabel.text = model.subjecttag;
95 95  
96 96 }
97   -
  97 + if (model.titleColor) {
  98 + _titleLabel.textColor = [UIColor colorWithHexString:model.titleColor];
  99 + }
  100 + if (model.tagsColor) {
  101 + _projectLabel.backgroundColor = [UIColor colorWithHexString:model.tagsColor];
  102 + }
98 103 [_leftImage sd_setImageWithURL:[NSURL URLWithString:model.img] placeholderImage:[UIImage imageNamed:@"placeholder"]];
99 104 [_picImage sd_setImageWithURL:[NSURL URLWithString:model.imgSmall] placeholderImage:[UIImage imageNamed:@"placeholder"]];
100 105 [_rightImage sd_setImageWithURL:[NSURL URLWithString:model.imgBig] placeholderImage:[UIImage imageNamed:@"placeholder"]];
... ...
CNLiveScioLive/Pages/Home/搜索/Controller/CNLiveSearchViewController.m
  View file @05c8ca3
... ... @@ -214,7 +214,7 @@
214 214 [self loadScreenData];
215 215 }
216 216 - (void)loadScreenData {
217   - NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/page";
  217 + NSString *strUrl = REQUESTURL(@"gxb/api/page");
218 218 NSLog(@"%@",strUrl);
219 219 NSDictionary *parameters = @{@"params":@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"pageUUID\":\"b73ec15c-0d1b-11e6-b082-c7d8a7a18cc4\",\"pageType\":\"channelList\"}"};
220 220 NSLog(@"%@",parameters);
... ... @@ -484,6 +484,12 @@
484 484 if ([text isEqualToString:@"<null>"]) {
485 485 text = @"";
486 486 }
  487 + if (_dic[@"titleColor"]) {
  488 + cell.titleLabel.textColor = [UIColor colorWithHexString:_dic[@"titleColor"]];
  489 + }
  490 + if (_dic[@"tagsColor"]) {
  491 + cell.tagsLabel.backgroundColor = [UIColor colorWithHexString:_dic[@"tagsColor"]];
  492 + }
487 493 cell.tagsLabel.text = text;
488 494 [cell reSetTagFrame];
489 495 return cell;
... ...
CNLiveScioLive/Pages/Home/新闻详情/Controller/VideoDetailViewController.m
  View file @05c8ca3
... ... @@ -49,7 +49,7 @@ static NSString *newsLeftPicTableViewCell = @&quot;CNLiveNewsLeftPicTableViewCell&quot;;
49 49 [AlertViewTool showHUDAddedToView:self.view text:CustomStr(@"NetworkiInterruption")];
50 50 return;
51 51 }
52   - NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/programRelative";
  52 + NSString *strUrl = REQUESTURL(@"gxb/api/programRelative");
53 53 NSLog(@"%@",strUrl);
54 54 NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"cmsContentId\":\"%@\"}",self.model.cmsContentId];
55 55 NSLog(@"%@",categoryId);
... ...
CNLiveScioLive/Pages/Home/新闻详情/OldController/MoreSpecialViewController.m
  View file @05c8ca3
... ... @@ -120,7 +120,7 @@
120 120 - (void)loadData {
121 121 self.isAll = NO;
122 122 self.pageNumber = 1;
123   - NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
  123 + NSString *strUrl = REQUESTURL(@"gxb/api/cataloglatest");
124 124 NSLog(@"%@",strUrl);
125 125 NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"%@\",\"page\":\"%ld\",\"pageSize\":\"10\"}",_dictionary[@"cid"],(long)self.pageNumber];
126 126 NSLog(@"%@",categoryId);
... ... @@ -173,7 +173,7 @@
173 173 return;
174 174 }
175 175 self.pageNumber++;
176   - NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
  176 + NSString *strUrl = REQUESTURL(@"gxb/api/cataloglatest");
177 177 NSLog(@"%@",strUrl);
178 178 NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"%@\",\"page\":\"%ld\",\"pageSize\":\"10\"}",_dictionary[@"cid"],(long)self.pageNumber];
179 179 NSLog(@"%@",categoryId);
... ...
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldArticleDetailViewController.m
  View file @05c8ca3
... ... @@ -91,7 +91,7 @@
91 91 // 详情数据
92 92 NSDictionary *parameters = @{@"params":[NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"type\":\"program\",\"id\":\"%@\"}", _dictionary[@"cmsContentId"]]};
93 93 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
94   - [manager POST:@"http://app.phonemovie.cnlive.com/gxb/api/programDetail"
  94 + [manager POST:REQUESTURL(@"gxb/api/programDetail")
95 95 parameters:parameters headers:nil
96 96 progress:^(NSProgress * _Nonnull uploadProgress) {}
97 97 success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
... ... @@ -126,7 +126,7 @@
126 126 [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
127 127 return;
128 128 }
129   - NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/programRelative";
  129 + NSString *strUrl = REQUESTURL(@"gxb/api/programRelative");
130 130 NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"cmsContentId\":\"%@\"}",_dictionary[@"cmsContentId"]];
131 131 NSDictionary *parameters = @{@"params":categoryId};
132 132 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
... ...
CNLiveScioLive/Pages/Home/新闻详情/OldController/Present/VideoDetailPresent.m
  View file @05c8ca3
... ... @@ -16,7 +16,7 @@
16 16 [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
17 17 return;
18 18 }
19   - NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/programDetail";
  19 + NSString *strUrl = REQUESTURL(@"gxb/api/programDetail");
20 20 NSLog(@"%@",strUrl);
21 21 NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"type\":\"program\",\"id\":\"%@\"}",reportId];
22 22 NSLog(@"%@",categoryId);
... ... @@ -49,7 +49,7 @@
49 49 [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
50 50 return;
51 51 }
52   - NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/programRelative";
  52 + NSString *strUrl = REQUESTURL(@"gxb/api/programRelative");
53 53 NSLog(@"%@",strUrl);
54 54 NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"cmsContentId\":\"%@\"}",reportId];
55 55 NSLog(@"%@",categoryId);
... ...
CNLiveScioLive/Pages/Home/新闻详情/OldController/SCIOSpecialViewController.m
  View file @05c8ca3
... ... @@ -205,7 +205,7 @@
205 205 - (void)loadData {
206 206 self.isAll = NO;
207 207 self.pageNumber = 1;
208   - NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/objectContent";
  208 + NSString *strUrl = REQUESTURL(@"gxb/api/objectContent");
209 209 NSLog(@"%@",strUrl);
210 210 NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"cmsContentId\":\"%@\"}",_dictionary[@"cmsContentId"]];
211 211 NSLog(@"%@",categoryId);
... ... @@ -260,7 +260,7 @@
260 260 return;
261 261 }
262 262 self.pageNumber++;
263   - NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
  263 + NSString *strUrl = REQUESTURL(@"gxb/api/cataloglatest");
264 264 NSLog(@"%@",strUrl);//,\"page\":\"%ld\",\"pageSize\":\"10\"
265 265 NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"cmsContentId\":\"%@\"}",_dictionary[@"cmsContentId"]];//,(long)self.pageNumber
266 266 NSLog(@"%@",categoryId);
... ... @@ -439,6 +439,12 @@
439 439  
440 440 cell.titleLabel.text = _dic[@"title"];
441 441 cell.timeLabel.text = _dic[@"createDate"];
  442 + if (_dic[@"titleColor"]) {
  443 + cell.tintColor = [UIColor colorWithHexString:_dic[@"titleColor"]];
  444 + }
  445 + if (_dic[@"tagsColor"]) {
  446 + cell.tagsLabel.backgroundColor = [UIColor colorWithHexString:_dic[@"tagsColor"]];
  447 + }
442 448 NSString *text = [NSString stringWithFormat:@"%@",_dic[@"tags"]];
443 449 if ([text isEqualToString:@"<null>"]) {
444 450 text = @"";
... ...
CNLiveScioLive/Pages/Home/答记者问/Controller/CNLiveReporterAskedViewController.m
  View file @05c8ca3
... ... @@ -29,7 +29,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
29 29  
30 30 #pragma mark - Data
31 31 - (void)loadData{
32   - NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
  32 + NSString *strUrl = REQUESTURL(@"gxb/api/cataloglatest");
33 33 //NSLog(@"%@",strUrl);
34 34 NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"%@\",\"page\":\"%ld\",\"pageSize\":\"10\"}",self.cid,(long)self.pageNo];
35 35 //NSLog(@"%@",categoryId);
... ... @@ -181,30 +181,6 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
181 181 return cell;
182 182  
183 183 }
184   - else if([model.showType isEqualToString:@"1"]){
185   - if(model.img && ![model.img isEqualToString:@""]){
186   - //一张图 左边
187   - CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
188   - if (!cell) {
189   - cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
190   - }
191   - cell.selectionStyle = UITableViewCellSelectionStyleNone;
192   - cell.model = self.data[indexPath.row];
193   - return cell;
194   - }
195   - //无图
196   - CNLiveNewsNoPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsNoPicTableViewCell];
197   - if (!cell) {
198   - cell = [[CNLiveNewsNoPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsNoPicTableViewCell];
199   - }
200   -// CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
201   -// if (!cell) {
202   -// cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
203   -// }
204   - cell.selectionStyle = UITableViewCellSelectionStyleNone;
205   - cell.model = self.data[indexPath.row];
206   - return cell;
207   - }
208 184 else if([model.showType isEqualToString:@"2"]){
209 185 //三张图
210 186 CNLiveNewsThreePicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsThreePicTableViewCell];
... ... @@ -216,7 +192,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
216 192 return cell;
217 193  
218 194 }
219   - else if([model.showType isEqualToString:@"3"]){
  195 + else{
220 196 if(model.img){
221 197 //一张图 左边
222 198 CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
... ... @@ -240,23 +216,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
240 216 cell.model = self.data[indexPath.row];
241 217 return cell;
242 218  
243   - }else{
244   - //无图
245   - CNLiveNewsNoPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsNoPicTableViewCell];
246   - if (!cell) {
247   - cell = [[CNLiveNewsNoPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsNoPicTableViewCell];
248   - }
249   -// CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
250   -// if (!cell) {
251   -// cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
252   -// }
253   - cell.selectionStyle = UITableViewCellSelectionStyleNone;
254   - cell.model = self.data[indexPath.row];
255   - return cell;
256   -
257 219 }
258   -
259   -
260 220 }
261 221 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
262 222 CNHomeModel *model = self.data[indexPath.row];
... ...
CNLiveScioLive/Pages/Home/高级搜索/Controller/CNLiveAdvancedSearchViewController.m
  View file @05c8ca3
... ... @@ -152,7 +152,7 @@
152 152  
153 153 - (void)searchApiWithKeywords:(NSString *)keywords {
154 154  
155   - NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/seniorProgramList";
  155 + NSString *strUrl = REQUESTURL(@"gxb/api/seniorProgramList");
156 156 NSMutableDictionary *param = [NSMutableDictionary dictionaryWithDictionary:self.paramDict];
157 157  
158 158 [param setObject:@"i" forKey:@"plat"];
... ...
CNLiveScioLive/Pages/Home/高级搜索/Controller/SearchResultViewController.m
  View file @05c8ca3
... ... @@ -297,7 +297,7 @@
297 297  
298 298 - (void)loadMoreData {
299 299  
300   - NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/seniorProgramList";
  300 + NSString *strUrl = REQUESTURL(@"gxb/api/seniorProgramList");
301 301 NSMutableDictionary *param = [NSMutableDictionary dictionaryWithDictionary:self.moreParam];
302 302  
303 303 [param setObject:[NSString stringWithFormat:@"%ld",(long)self.page] forKey:@"page"];
... ...
CNLiveScioLive/Pages/Home/高级搜索/Controller/SelectedViewController.m
  View file @05c8ca3
... ... @@ -70,7 +70,7 @@
70 70  
71 71 - (void)getList {
72 72  
73   - NSString *strUrl = [NSString stringWithFormat:@"http://app.phonemovie.cnlive.com/gxb/api/%@",self.url];
  73 + NSString *strUrl = [NSString stringWithFormat:@"%@%@",REQUESTURL(@"gxb/api/"),self.url];
74 74 NSMutableDictionary *param = [NSMutableDictionary dictionary];
75 75 [param setObject:@"i" forKey:@"plat"];
76 76 [param setObject:@"5.0" forKey:@"version"];
... ... @@ -234,7 +234,7 @@
234 234  
235 235 - (void)getMediaList
236 236 {
237   - NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/mediaList";
  237 + NSString *strUrl = REQUESTURL(@"gxb/api/mediaList");
238 238 NSMutableDictionary *param = [NSMutableDictionary dictionary];
239 239  
240 240 [param setObject:@"i" forKey:@"plat"];
... ...
CNLiveScioLive/Pages/Live/Controller/CNLiveViewController.m
  View file @05c8ca3
... ... @@ -66,7 +66,7 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
66 66 }];
67 67 }
68 68 - (void)loadData{
69   - NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
  69 + NSString *strUrl = REQUESTURL(@"gxb/api/cataloglatest");
70 70 NSLog(@"%@",strUrl);
71 71 NSString *josnParameters = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"spzl/fbhhf/\",\"page\":\"%ld\",\"pageSize\":\"%@\"}",(long)self.pageNo,REQUEST_PAGE_SIZE];
72 72 NSLog(@"%@",josnParameters);
... ... @@ -146,7 +146,7 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
146 146 }];
147 147 }
148 148 - (void)loadYGData {
149   - NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
  149 + NSString *strUrl = REQUESTURL(@"gxb/api/cataloglatest");
150 150 //NSLog(@"%@",strUrl);
151 151 NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"wz/fbhgg/\",\"page\":\"1\",\"pageSize\":\"1\"}"];
152 152 //NSLog(@"%@",categoryId);
... ...
CNLiveScioLive/Pages/Live/Controller/VideoPlayBackViewController.m
  View file @05c8ca3
... ... @@ -542,7 +542,7 @@
542 542 [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
543 543 return;
544 544 }
545   - NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/programRelative";
  545 + NSString *strUrl = REQUESTURL(@"gxb/api/programRelative");
546 546 NSLog(@"%@",strUrl);
547 547 NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"cmsContentId\":\"%@\"}",_dictionary[@"cmsContentId"]];
548 548 NSLog(@"%@",categoryId);
... ...
CNLiveScioLive/Pages/My/通知公告/Controller/CNMyAnnouncementsViewController.m
  View file @05c8ca3
... ... @@ -25,7 +25,7 @@ static NSString *myAnnouncementsTableViewCell = @&quot;CNMyAnnouncementsTableViewCell
25 25  
26 26 #pragma mark - Data
27 27 - (void)loadData{
28   - NSString *url = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
  28 + NSString *url = REQUESTURL(@"gxb/api/cataloglatest");
29 29 NSLog(@"%@",url);
30 30 NSString *josnParameters = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"%@\",\"page\":\"%ld\",\"pageSize\":\"%@\",\"lang\":\"%@\"}",IS_CHINESE?@"wz/fbhgg/":@"wz/notice/",(long)self.pageNo,@"15", IS_CHINESE?@"cn":@"en"];
31 31 NSLog(@"%@",josnParameters);
... ...
CNLiveScioLive/Pages/Newsound/Controller/CNNewsoundBaseViewController.m
  View file @05c8ca3
... ... @@ -27,7 +27,7 @@ static NSString *newsoundBaseRecommendTableViewCell = @&quot;CNNewsoundBaseRecommendT
27 27  
28 28 #pragma mark - Data
29 29 - (void)getData{
30   - NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/page";
  30 + NSString *strUrl = REQUESTURL(@"gxb/api/page");
31 31 NSLog(@"%@",strUrl);
32 32 NSString *josnParameters = [NSString stringWithFormat:@"{\"plat\":\"%@\",\"version\":\"5.0\",\"appid\":\"gxb\",\"pageUUID\":\"%@\",\"pageType\":\"%@\"}",self.plat, self.pageUUID, self.recommendKey];
33 33 // @"params":@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"pageUUID\":\"d6262244-b059-11e6-b220-c7d8a7a18cc4\",\"pageType\":\"index\"}"
... ... @@ -75,7 +75,7 @@ static NSString *newsoundBaseRecommendTableViewCell = @&quot;CNNewsoundBaseRecommendT
75 75  
76 76 }
77 77 - (void)loadData{
78   - NSString *url = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
  78 + NSString *url = REQUESTURL(@"gxb/api/cataloglatest");
79 79 NSLog(@"%@",url);
80 80 NSString *josnParameters = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"spzl/%@/\",\"page\":\"%ld\",\"pageSize\":\"%@\"}",self.latestKey,(long)self.pageNo,REQUEST_PAGE_SIZE];
81 81 NSLog(@"%@",josnParameters);
... ...
CNLiveScioLive/Pages/Newsound/OldController/VoiceViewController.m
  View file @05c8ca3
... ... @@ -87,7 +87,7 @@ static const NSInteger margin = 34;
87 87  
88 88 //国新之声推荐
89 89 - (void)loadVoiceTopic {
90   - NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/page";
  90 + NSString *strUrl = REQUESTURL(@"gxb/api/page");
91 91 NSLog(@"%@",strUrl);
92 92 NSDictionary *parameters = @{@"params":@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"pageUUID\":\"d6262244-b059-11e6-b220-c7d8a7a18cc4\",\"pageType\":\"index\"}"};
93 93 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
... ... @@ -122,7 +122,7 @@ static const NSInteger margin = 34;
122 122 self.pageNumber = 1;
123 123 [self.tableView.mj_footer setHidden:NO];
124 124  
125   - NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
  125 + NSString *strUrl = REQUESTURL(@"gxb/api/cataloglatest");
126 126  
127 127 NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"spzl/gxzs/\",\"page\":\"%ld\",\"pageSize\":\"10\"}",(long)self.pageNumber];
128 128  
... ... @@ -185,7 +185,7 @@ static const NSInteger margin = 34;
185 185  
186 186 //VOS专题
187 187 - (void)loadVOSTopic {
188   - NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/page";
  188 + NSString *strUrl = REQUESTURL(@"gxb/api/page");
189 189 NSLog(@"%@",strUrl);
190 190 NSDictionary *parameters = @{@"params":@"{\"plat\":\"a\",\"version\":\"5.0\",\"appid\":\"gxb\",\"pageUUID\":\"bca5bdd0-259a-11e8-908c-c7d8a7a18cc4\",\"pageType\":\"channelList\"}"};
191 191 AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
... ... @@ -222,7 +222,7 @@ static const NSInteger margin = 34;
222 222 self.engPageNumber = 1;
223 223 [self.enTableView.mj_footer setHidden:NO];
224 224  
225   - NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
  225 + NSString *strUrl = REQUESTURL(@"gxb/api/cataloglatest");
226 226  
227 227 NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"a\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"spzl/news/\",\"page\":\"%ld\"}",(long)self.engPageNumber];
228 228  
... ... @@ -287,7 +287,7 @@ static const NSInteger margin = 34;
287 287 - (void)loadMoreOfGXZS {
288 288 self.pageNumber++;
289 289  
290   - NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
  290 + NSString *strUrl = REQUESTURL(@"gxb/api/cataloglatest");
291 291  
292 292 NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"spzl/gxzs/\",\"page\":\"%ld\",\"pageSize\":\"10\"}",(long)self.pageNumber];
293 293  
... ... @@ -343,7 +343,7 @@ static const NSInteger margin = 34;
343 343 - (void)loadMoreOfVOS {
344 344 self.engPageNumber++;
345 345  
346   - NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
  346 + NSString *strUrl = REQUESTURL(@"gxb/api/cataloglatest");
347 347  
348 348 NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"a\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"spzl/news/\",\"page\":\"%ld\"}",(long)self.engPageNumber];
349 349  
... ...