列表标签，标题文字加红

yanglingyu
1 parent 3afdb34e
Showing 25 changed files with 84 additions and 210 deletions
CNLiveScioLive/AppDelegate.m
CNLiveScioLive/Pages/Header/UrlMacro.h
CNLiveScioLive/Pages/Home/CNHomeBaseViewController.m
CNLiveScioLive/Pages/Home/CNHomeENViewController.m
CNLiveScioLive/Pages/Home/CNHomeModel.h
CNLiveScioLive/Pages/Home/CNHomeViewController.m
CNLiveScioLive/Pages/Home/外宣要闻/Controller/CNLiveHeraldedNewsViewController.m
CNLiveScioLive/Pages/Home/外宣要闻/View/CNLiveNewsLeftPicTableViewCell.m
CNLiveScioLive/Pages/Home/外宣要闻/View/CNLiveNewsNoPicTableViewCell.m
CNLiveScioLive/Pages/Home/外宣要闻/View/CNLiveNewsThreePicTableViewCell.m
CNLiveScioLive/Pages/Home/搜索/Controller/CNLiveSearchViewController.m
CNLiveScioLive/Pages/Home/新闻详情/Controller/VideoDetailViewController.m
CNLiveScioLive/Pages/Home/新闻详情/OldController/MoreSpecialViewController.m
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldArticleDetailViewController.m
CNLiveScioLive/Pages/Home/新闻详情/OldController/Present/VideoDetailPresent.m
CNLiveScioLive/Pages/Home/新闻详情/OldController/SCIOSpecialViewController.m
CNLiveScioLive/Pages/Home/答记者问/Controller/CNLiveReporterAskedViewController.m
CNLiveScioLive/Pages/Home/高级搜索/Controller/CNLiveAdvancedSearchViewController.m
CNLiveScioLive/Pages/Home/高级搜索/Controller/SearchResultViewController.m
CNLiveScioLive/Pages/Home/高级搜索/Controller/SelectedViewController.m
@@ -97,7 +97,7 @@
 #pragma mark - 请求启动页
 -(void)requestLanchImage
 {
-    NSString *urlStr = @"http://app.phonemovie.cnlive.com/gxb/openBanner";
+    NSString *urlStr = REQUESTURL(@"gxb/openBanner");
     NSDictionary *parameters = @{@"params":@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"pageUUID\":\"852cde69-ecd8-11e6-b52e-c7d8a7a18cc4\",\"pageType\":\"channelList\"}"};
     [XWHTTPTool GET:urlStr params:parameters success:^(id json) {
         NSDictionary *dic = [NSDictionary dictionaryWithDictionary:json];
@@ -291,7 +291,7 @@
         return;
     }
-    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/programByContentId";
+    NSString *strUrl = REQUESTURL(@"gxb/api/programByContentId");
     NSString *parameter = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"38_iuvkou3xi05\",\"cmsContentId\":\"%@\"}",idStr];
     NSDictionary *parameters = @{@"params":parameter};
@@ -9,6 +9,12 @@
 #ifndef UrlMacro_h
 #define UrlMacro_h
+#ifdef DEBUG
+#define REQUESTURL(url)  [@"http://test.app.phonemovie.cnlive.com/" stringByAppendingPathComponent:url]
+#else
+#define REQUESTURL(url)  [@"http://app.phonemovie.cnlive.com/" stringByAppendingPathComponent:url]
+#endif
+
 #define IS_STRING_EMPTY(string) (string==nil || string == NULL || [string isKindOfClass:[NSNull class]] || [[string stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] length]==0 || [string isEqualToString:@""] || [string isEqualToString:@"<null>"])
 #define LOCARRAYLIST_PATH [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0] stringByAppendingPathComponent:@"LocArrayList.db"]
@@ -25,7 +31,7 @@
 #define SQLITE_PATH [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0] stringByAppendingPathComponent:@"notice.sqldb"]
 #define SEARCH_HISTORY @"searchHistory.txt"
-#define searchApi @"http://app.phonemovie.cnlive.com/gxb/api/programList"
+#define searchApi REQUESTURL(@"gxb/api/programList")
 #define IKEY         @"0"
@@ -45,7 +51,7 @@
 //#define tuwen(id) [NSString stringWithFormat:@"http://www.scio.gov.cn:9095/video/JsonDataFromGXW.aspx/JsonDataFromGXW.aspx?type=Doc&DocID=%d",id]
 #define tuwen(id) [NSString stringWithFormat:@"http://www.scio.gov.cn:9095/video/JsonDataFromGXW.aspx?type=Doc&DocID=%d",id]
-#define FORECAST @"http://app.phonemovie.cnlive.com/gxb/api/"
+#define FORECAST  REQUESTURL(@"gxb/api/")
 #define yugaoliebiao @"http://www.scio.gov.cn:9095/video/JsonDataFromGXW.aspx?type=DocList&ChannelID=20490"
 //#define newsdetail(id) [NSString stringWithFormat:@"http://www.scio.gov.cn:9095/video/JsonDataFromGXW.aspx/JsonDataFromGXW.aspx?type=Doc&DocID=%d",id]
@@ -31,7 +31,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
 #pragma mark - Data
 - (void)loadData{
-    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
+    NSString *strUrl = REQUESTURL(@"gxb/api/cataloglatest");
     //NSLog(@"%@",strUrl);
     NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"%@\",\"page\":\"%ld\",\"pageSize\":\"10\"}",self.cid,(long)self.pageNo];
     //NSLog(@"%@",categoryId);
@@ -176,30 +176,6 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
         return cell;
     }
-    else if([model.showType isEqualToString:@"1"]){
-        if(model.img && ![model.img isEqualToString:@""]){
-            //一张图 左边
-            CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
-            if (!cell) {
-                cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
-            }
-            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-            cell.model = self.data[indexPath.row];
-            return cell;
-        }
-        //无图
-        CNLiveNewsNoPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsNoPicTableViewCell];
-        if (!cell) {
-            cell = [[CNLiveNewsNoPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsNoPicTableViewCell];
-        }
-//        CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
-//        if (!cell) {
-//            cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
-//        }
-        cell.selectionStyle = UITableViewCellSelectionStyleNone;
-        cell.model = self.data[indexPath.row];
-        return cell;
-    }
     else if([model.showType isEqualToString:@"2"]){
         //三张图
         CNLiveNewsThreePicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsThreePicTableViewCell];
@@ -211,7 +187,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
         return cell;
     }
-    else if([model.showType isEqualToString:@"3"]){
+    else {
         if(model.img){
             //一张图 左边
             CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
@@ -234,21 +210,6 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
         cell.selectionStyle = UITableViewCellSelectionStyleNone;
         cell.model = self.data[indexPath.row];
         return cell;
-        
-    }else{
-        //无图
-        CNLiveNewsNoPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsNoPicTableViewCell];
-        if (!cell) {
-            cell = [[CNLiveNewsNoPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsNoPicTableViewCell];
-        }
-//        CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
-//        if (!cell) {
-//            cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
-//        }
-        cell.selectionStyle = UITableViewCellSelectionStyleNone;
-        cell.model = self.data[indexPath.row];
-        return cell;
-        
     }
 }
@@ -34,7 +34,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
 #pragma mark - Data
 - (void)loadData{
-    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
+    NSString *strUrl = REQUESTURL(@"gxb/api/cataloglatest");
     NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"38_ivkou3xi05\",\"categoryId\":\"%@\",\"page\":\"%ld\",\"pageSize\":\"10\"}",@"wz/scio/",(long)self.pageNo];
     NSDictionary *parameters = @{@"params":categoryId};
@@ -215,30 +215,6 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
         return cell;
     }
-    else if([model.showType isEqualToString:@"1"]){
-        if(model.img && ![model.img isEqualToString:@""]){
-            //一张图 左边
-            CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
-            if (!cell) {
-                cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
-            }
-            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-            cell.model = self.data[indexPath.row];
-            return cell;
-        }
-        //无图
-        CNLiveNewsNoPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsNoPicTableViewCell];
-        if (!cell) {
-            cell = [[CNLiveNewsNoPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsNoPicTableViewCell];
-        }
-//        CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
-//        if (!cell) {
-//            cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
-//        }
-        cell.selectionStyle = UITableViewCellSelectionStyleNone;
-        cell.model = self.data[indexPath.row];
-        return cell;
-    }
     else if([model.showType isEqualToString:@"2"]){
         //三张图
         CNLiveNewsThreePicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsThreePicTableViewCell];
@@ -250,7 +226,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
         return cell;
     }
-    else if([model.showType isEqualToString:@"3"]){
+    else{
         if(model.img){
             //一张图 左边
             CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
@@ -274,22 +250,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
         cell.model = self.data[indexPath.row];
         return cell;
-    }else{
-        //无图
-        CNLiveNewsNoPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsNoPicTableViewCell];
-        if (!cell) {
-            cell = [[CNLiveNewsNoPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsNoPicTableViewCell];
-        }
-//        CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
-//        if (!cell) {
-//            cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
-//        }
-        cell.selectionStyle = UITableViewCellSelectionStyleNone;
-        cell.model = self.data[indexPath.row];
-        return cell;
-        
     }
-    
 }
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
     CNHomeModel *model = self.data[indexPath.row];
@@ -13,6 +13,8 @@
 @property (nonatomic, copy) NSString *title;
 @property (nonatomic, copy) NSString *uuid;
 @property (nonatomic, copy) NSString *subTitle;
+@property (nonatomic, copy) NSString *titleColor;
+@property (nonatomic, copy) NSString *tagsColor;
 @property (nonatomic, copy) NSString *ID;
@@ -24,7 +24,7 @@
 @implementation CNHomeViewController
 #pragma mark - Data
 - (void)getData{
-    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/page";
+    NSString *strUrl = REQUESTURL(@"gxb/api/page");
      NSDictionary *parameters = @{@"params":@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"pageUUID\":\"852cde69-ecd8-11e6-b52e-c7d8a7a18cc4\",\"pageType\":\"channelList\"}"};
     if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
@@ -93,9 +93,9 @@
             }
             if(controllers.count > 0){
                 self.segmentControl.titles = titles;
-                if (ininav[@"textColor"]) {
-                    self.segmentControl.titleSelectColor = [UIColor colorWithHexString:ininav[@"textColor"]];
-                [self.segmentControl setBottomViewColor:[UIColor colorWithHexString:ininav[@"textColor"]]];
+                if (ininavArray[0][@"textColor"]) {
+                    self.segmentControl.titleSelectColor = [UIColor colorWithHexString:ininavArray[0][@"textColor"]];
+                [self.segmentControl setBottomViewColor:[UIColor colorWithHexString:ininavArray[0][@"textColor"]]];
                 }
                 self.segmentControl.viewControllers = controllers;
             }
@@ -34,7 +34,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
 #pragma mark - Data
 - (void)loadData{
-    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
+    NSString *strUrl = REQUESTURL(@"gxb/api/cataloglatest");
     //NSLog(@"%@",strUrl);
     NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"%@\",\"page\":\"%ld\",\"pageSize\":\"10\"}",self.cid,(long)self.pageNo];
     //NSLog(@"%@",categoryId);
@@ -212,30 +212,6 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
         return cell;
     }
-    else if([model.showType isEqualToString:@"1"]){
-        if(model.img && ![model.img isEqualToString:@""]){
-            //一张图 左边
-            CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
-            if (!cell) {
-                cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
-            }
-            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-            cell.model = self.data[indexPath.row];
-            return cell;
-        }
-        //无图
-        CNLiveNewsNoPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsNoPicTableViewCell];
-        if (!cell) {
-            cell = [[CNLiveNewsNoPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsNoPicTableViewCell];
-        }
-//        CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
-//        if (!cell) {
-//            cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
-//        }
-        cell.selectionStyle = UITableViewCellSelectionStyleNone;
-        cell.model = self.data[indexPath.row];
-        return cell;
-    }
     else if([model.showType isEqualToString:@"2"]){
         //三张图
         CNLiveNewsThreePicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsThreePicTableViewCell];
@@ -246,45 +222,25 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
         cell.model = self.data[indexPath.row];
         return cell;
-    }
-    else if([model.showType isEqualToString:@"3"]){
+    }else{
+ 
         if(model.img){
-            //一张图 左边
-            CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
-            if (!cell) {
-                cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
-            }
-            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-            cell.model = self.data[indexPath.row];
-            return cell;
-        }
-        //无图
-        CNLiveNewsNoPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsNoPicTableViewCell];
+        CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
         if (!cell) {
-            cell = [[CNLiveNewsNoPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsNoPicTableViewCell];
+            cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
         }
-//        CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
-//        if (!cell) {
-//            cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
-//        }
         cell.selectionStyle = UITableViewCellSelectionStyleNone;
         cell.model = self.data[indexPath.row];
         return cell;
-        
-    }else{
+        }
         //无图
         CNLiveNewsNoPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsNoPicTableViewCell];
         if (!cell) {
             cell = [[CNLiveNewsNoPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsNoPicTableViewCell];
         }
-//        CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
-//        if (!cell) {
-//            cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
-//        }
         cell.selectionStyle = UITableViewCellSelectionStyleNone;
         cell.model = self.data[indexPath.row];
         return cell;
-        
     }
@@ -80,7 +80,12 @@
     _titleLabel.text = model.title;
     _timeLabel.text = [model.createDate componentsSeparatedByString:@" "][0];
     [_picImage sd_setImageWithURL:[NSURL URLWithString:model.img] placeholderImage:[UIImage imageNamed:@"placeholder"]];
-
+    if (model.titleColor) {
+        _titleLabel.textColor = [UIColor colorWithHexString:model.titleColor];
+    }
+    if (model.tagsColor) {
+        _projectLabel.backgroundColor = [UIColor colorWithHexString:model.tagsColor];
+    }
     //专题
     if(model.tags && ![model.tags isEqualToString:@""]){
         _projectLabel.text = model.tags;
@@ -63,6 +63,12 @@
 - (void)setModel:(CNHomeModel *)model{
     _model = model;
     _titleLabel.text = model.title;
+    if (model.titleColor) {
+        _titleLabel.textColor = [UIColor colorWithHexString:model.titleColor];
+    }
+    if (model.tagsColor) {
+        _projectLabel.backgroundColor = [UIColor colorWithHexString:model.tagsColor];
+    }
     _timeLabel.text = [model.createDate componentsSeparatedByString:@" "][0];
     if(model.tags && ![model.tags isEqualToString:@""]){
@@ -94,7 +94,12 @@
         _projectLabel.text = model.subjecttag;
     }
-    
+    if (model.titleColor) {
+        _titleLabel.textColor = [UIColor colorWithHexString:model.titleColor];
+    }
+    if (model.tagsColor) {
+        _projectLabel.backgroundColor = [UIColor colorWithHexString:model.tagsColor];
+    }
     [_leftImage sd_setImageWithURL:[NSURL URLWithString:model.img] placeholderImage:[UIImage imageNamed:@"placeholder"]];
     [_picImage sd_setImageWithURL:[NSURL URLWithString:model.imgSmall] placeholderImage:[UIImage imageNamed:@"placeholder"]];
     [_rightImage sd_setImageWithURL:[NSURL URLWithString:model.imgBig] placeholderImage:[UIImage imageNamed:@"placeholder"]];
@@ -214,7 +214,7 @@
     [self loadScreenData];
 }
 - (void)loadScreenData {
-    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/page";
+    NSString *strUrl = REQUESTURL(@"gxb/api/page");
     NSLog(@"%@",strUrl);
     NSDictionary *parameters = @{@"params":@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"pageUUID\":\"b73ec15c-0d1b-11e6-b082-c7d8a7a18cc4\",\"pageType\":\"channelList\"}"};
     NSLog(@"%@",parameters);
@@ -484,6 +484,12 @@
                 if ([text isEqualToString:@"<null>"]) {
                     text = @"";
                 }
+                if (_dic[@"titleColor"]) {
+                    cell.titleLabel.textColor = [UIColor colorWithHexString:_dic[@"titleColor"]];
+                }
+                if (_dic[@"tagsColor"]) {
+                    cell.tagsLabel.backgroundColor = [UIColor colorWithHexString:_dic[@"tagsColor"]];
+                }
                 cell.tagsLabel.text  = text;
                 [cell reSetTagFrame];
                 return cell;
@@ -49,7 +49,7 @@ static NSString *newsLeftPicTableViewCell = @&quot;CNLiveNewsLeftPicTableViewCell&quot;;
         [AlertViewTool showHUDAddedToView:self.view text:CustomStr(@"NetworkiInterruption")];
         return;
     }
-    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/programRelative";
+    NSString *strUrl = REQUESTURL(@"gxb/api/programRelative");
     NSLog(@"%@",strUrl);
     NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"cmsContentId\":\"%@\"}",self.model.cmsContentId];
     NSLog(@"%@",categoryId);
@@ -120,7 +120,7 @@
 - (void)loadData {
     self.isAll = NO;
     self.pageNumber = 1;
-    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
+    NSString *strUrl = REQUESTURL(@"gxb/api/cataloglatest");
     NSLog(@"%@",strUrl);
     NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"%@\",\"page\":\"%ld\",\"pageSize\":\"10\"}",_dictionary[@"cid"],(long)self.pageNumber];
     NSLog(@"%@",categoryId);
@@ -173,7 +173,7 @@
         return;
     }
     self.pageNumber++;
-    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
+    NSString *strUrl = REQUESTURL(@"gxb/api/cataloglatest");
     NSLog(@"%@",strUrl);
     NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"%@\",\"page\":\"%ld\",\"pageSize\":\"10\"}",_dictionary[@"cid"],(long)self.pageNumber];
     NSLog(@"%@",categoryId);
@@ -91,7 +91,7 @@
     // 详情数据
     NSDictionary *parameters = @{@"params":[NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"type\":\"program\",\"id\":\"%@\"}", _dictionary[@"cmsContentId"]]};
     AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
-    [manager POST:@"http://app.phonemovie.cnlive.com/gxb/api/programDetail"
+    [manager POST:REQUESTURL(@"gxb/api/programDetail")
        parameters:parameters headers:nil
          progress:^(NSProgress * _Nonnull uploadProgress) {}
           success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
@@ -126,7 +126,7 @@
         [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
         return;
     }
-    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/programRelative";
+    NSString *strUrl = REQUESTURL(@"gxb/api/programRelative");
     NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"cmsContentId\":\"%@\"}",_dictionary[@"cmsContentId"]];
     NSDictionary *parameters = @{@"params":categoryId};
     AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
@@ -16,7 +16,7 @@
         [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
         return;
     }
-    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/programDetail";
+    NSString *strUrl = REQUESTURL(@"gxb/api/programDetail");
     NSLog(@"%@",strUrl);
     NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"type\":\"program\",\"id\":\"%@\"}",reportId];
     NSLog(@"%@",categoryId);
@@ -49,7 +49,7 @@
         [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
         return;
     }
-    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/programRelative";
+    NSString *strUrl = REQUESTURL(@"gxb/api/programRelative");
     NSLog(@"%@",strUrl);
     NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"cmsContentId\":\"%@\"}",reportId];
     NSLog(@"%@",categoryId);
@@ -205,7 +205,7 @@
 - (void)loadData {
     self.isAll = NO;
     self.pageNumber = 1;
-    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/objectContent";
+    NSString *strUrl = REQUESTURL(@"gxb/api/objectContent");
     NSLog(@"%@",strUrl);
     NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"cmsContentId\":\"%@\"}",_dictionary[@"cmsContentId"]];
     NSLog(@"%@",categoryId);
@@ -260,7 +260,7 @@
         return;
     }
     self.pageNumber++;
-    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
+    NSString *strUrl = REQUESTURL(@"gxb/api/cataloglatest");
     NSLog(@"%@",strUrl);//,\"page\":\"%ld\",\"pageSize\":\"10\"
     NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"cmsContentId\":\"%@\"}",_dictionary[@"cmsContentId"]];//,(long)self.pageNumber
     NSLog(@"%@",categoryId);
@@ -439,6 +439,12 @@
         cell.titleLabel.text = _dic[@"title"];
         cell.timeLabel.text  = _dic[@"createDate"];
+        if (_dic[@"titleColor"]) {
+            cell.tintColor = [UIColor colorWithHexString:_dic[@"titleColor"]];
+        }
+        if (_dic[@"tagsColor"]) {
+            cell.tagsLabel.backgroundColor = [UIColor colorWithHexString:_dic[@"tagsColor"]];
+        }
         NSString *text = [NSString stringWithFormat:@"%@",_dic[@"tags"]];
         if ([text isEqualToString:@"<null>"]) {
             text = @"";
@@ -29,7 +29,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
 #pragma mark - Data
 - (void)loadData{
-    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
+    NSString *strUrl = REQUESTURL(@"gxb/api/cataloglatest");
     //NSLog(@"%@",strUrl);
     NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"%@\",\"page\":\"%ld\",\"pageSize\":\"10\"}",self.cid,(long)self.pageNo];
     //NSLog(@"%@",categoryId);
@@ -181,30 +181,6 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
         return cell;
     }
-    else if([model.showType isEqualToString:@"1"]){
-        if(model.img && ![model.img isEqualToString:@""]){
-            //一张图 左边
-            CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
-            if (!cell) {
-                cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
-            }
-            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-            cell.model = self.data[indexPath.row];
-            return cell;
-        }
-        //无图
-                CNLiveNewsNoPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsNoPicTableViewCell];
-                if (!cell) {
-                    cell = [[CNLiveNewsNoPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsNoPicTableViewCell];
-                }
-//        CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
-//        if (!cell) {
-//            cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
-//        }
-        cell.selectionStyle = UITableViewCellSelectionStyleNone;
-        cell.model = self.data[indexPath.row];
-        return cell;
-    }
     else if([model.showType isEqualToString:@"2"]){
         //三张图
         CNLiveNewsThreePicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsThreePicTableViewCell];
@@ -216,7 +192,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
         return cell;
     }
-    else if([model.showType isEqualToString:@"3"]){
+    else{
         if(model.img){
             //一张图 左边
             CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
@@ -240,23 +216,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
         cell.model = self.data[indexPath.row];
         return cell;
-    }else{
-        //无图
-                CNLiveNewsNoPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsNoPicTableViewCell];
-                if (!cell) {
-                    cell = [[CNLiveNewsNoPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsNoPicTableViewCell];
-                }
-//        CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
-//        if (!cell) {
-//            cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
-//        }
-        cell.selectionStyle = UITableViewCellSelectionStyleNone;
-        cell.model = self.data[indexPath.row];
-        return cell;
-        
     }
-    
-    
 }
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
     CNHomeModel *model = self.data[indexPath.row];
@@ -152,7 +152,7 @@
 - (void)searchApiWithKeywords:(NSString *)keywords {
-    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/seniorProgramList";
+    NSString *strUrl = REQUESTURL(@"gxb/api/seniorProgramList");
     NSMutableDictionary *param = [NSMutableDictionary dictionaryWithDictionary:self.paramDict];
     [param setObject:@"i" forKey:@"plat"];
@@ -297,7 +297,7 @@
 - (void)loadMoreData {
-    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/seniorProgramList";
+    NSString *strUrl = REQUESTURL(@"gxb/api/seniorProgramList");
     NSMutableDictionary *param = [NSMutableDictionary dictionaryWithDictionary:self.moreParam];
     [param setObject:[NSString stringWithFormat:@"%ld",(long)self.page] forKey:@"page"];
@@ -70,7 +70,7 @@
 - (void)getList {
-    NSString *strUrl = [NSString stringWithFormat:@"http://app.phonemovie.cnlive.com/gxb/api/%@",self.url];
+    NSString *strUrl = [NSString stringWithFormat:@"%@%@",REQUESTURL(@"gxb/api/"),self.url];
     NSMutableDictionary *param = [NSMutableDictionary dictionary];
     [param setObject:@"i" forKey:@"plat"];
     [param setObject:@"5.0" forKey:@"version"];
@@ -234,7 +234,7 @@
 - (void)getMediaList
 {
-    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/mediaList";
+    NSString *strUrl = REQUESTURL(@"gxb/api/mediaList");
     NSMutableDictionary *param = [NSMutableDictionary dictionary];
     [param setObject:@"i" forKey:@"plat"];
@@ -66,7 +66,7 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
     }];
 }
 - (void)loadData{
-    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
+    NSString *strUrl = REQUESTURL(@"gxb/api/cataloglatest");
     NSLog(@"%@",strUrl);
     NSString *josnParameters = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"spzl/fbhhf/\",\"page\":\"%ld\",\"pageSize\":\"%@\"}",(long)self.pageNo,REQUEST_PAGE_SIZE];
     NSLog(@"%@",josnParameters);
@@ -146,7 +146,7 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
     }];
 }
 - (void)loadYGData {
-        NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
+        NSString *strUrl = REQUESTURL(@"gxb/api/cataloglatest");
         //NSLog(@"%@",strUrl);
         NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"wz/fbhgg/\",\"page\":\"1\",\"pageSize\":\"1\"}"];
         //NSLog(@"%@",categoryId);
@@ -542,7 +542,7 @@
         [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
         return;
     }
-    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/programRelative";
+    NSString *strUrl = REQUESTURL(@"gxb/api/programRelative");
     NSLog(@"%@",strUrl);
     NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"cmsContentId\":\"%@\"}",_dictionary[@"cmsContentId"]];
     NSLog(@"%@",categoryId);
@@ -25,7 +25,7 @@ static NSString *myAnnouncementsTableViewCell = @&quot;CNMyAnnouncementsTableViewCell
 #pragma mark - Data
 - (void)loadData{
-    NSString *url = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
+    NSString *url = REQUESTURL(@"gxb/api/cataloglatest");
     NSLog(@"%@",url);
     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"];
     NSLog(@"%@",josnParameters);
@@ -27,7 +27,7 @@ static NSString *newsoundBaseRecommendTableViewCell = @&quot;CNNewsoundBaseRecommendT
 #pragma mark - Data
 - (void)getData{
-    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/page";
+    NSString *strUrl = REQUESTURL(@"gxb/api/page");
     NSLog(@"%@",strUrl);
     NSString *josnParameters = [NSString stringWithFormat:@"{\"plat\":\"%@\",\"version\":\"5.0\",\"appid\":\"gxb\",\"pageUUID\":\"%@\",\"pageType\":\"%@\"}",self.plat, self.pageUUID, self.recommendKey];
 //    @"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
 }
 - (void)loadData{
-    NSString *url = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
+    NSString *url = REQUESTURL(@"gxb/api/cataloglatest");
     NSLog(@"%@",url);
     NSString *josnParameters = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"spzl/%@/\",\"page\":\"%ld\",\"pageSize\":\"%@\"}",self.latestKey,(long)self.pageNo,REQUEST_PAGE_SIZE];
     NSLog(@"%@",josnParameters);
@@ -87,7 +87,7 @@ static const NSInteger margin = 34;
 //国新之声推荐
 - (void)loadVoiceTopic {
-    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/page";
+    NSString *strUrl = REQUESTURL(@"gxb/api/page");
     NSLog(@"%@",strUrl);
     NSDictionary *parameters = @{@"params":@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"pageUUID\":\"d6262244-b059-11e6-b220-c7d8a7a18cc4\",\"pageType\":\"index\"}"};
     AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
@@ -122,7 +122,7 @@ static const NSInteger margin = 34;
     self.pageNumber = 1;
     [self.tableView.mj_footer setHidden:NO];
-    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
+    NSString *strUrl = REQUESTURL(@"gxb/api/cataloglatest");
     NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"spzl/gxzs/\",\"page\":\"%ld\",\"pageSize\":\"10\"}",(long)self.pageNumber];
@@ -185,7 +185,7 @@ static const NSInteger margin = 34;
 //VOS专题
 - (void)loadVOSTopic {
-    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/page";
+    NSString *strUrl = REQUESTURL(@"gxb/api/page");
     NSLog(@"%@",strUrl);
     NSDictionary *parameters = @{@"params":@"{\"plat\":\"a\",\"version\":\"5.0\",\"appid\":\"gxb\",\"pageUUID\":\"bca5bdd0-259a-11e8-908c-c7d8a7a18cc4\",\"pageType\":\"channelList\"}"};
     AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
@@ -222,7 +222,7 @@ static const NSInteger margin = 34;
     self.engPageNumber = 1;
     [self.enTableView.mj_footer setHidden:NO];
-    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
+    NSString *strUrl = REQUESTURL(@"gxb/api/cataloglatest");
     NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"a\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"spzl/news/\",\"page\":\"%ld\"}",(long)self.engPageNumber];
@@ -287,7 +287,7 @@ static const NSInteger margin = 34;
 - (void)loadMoreOfGXZS {
     self.pageNumber++;
-    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
+    NSString *strUrl = REQUESTURL(@"gxb/api/cataloglatest");
     NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"spzl/gxzs/\",\"page\":\"%ld\",\"pageSize\":\"10\"}",(long)self.pageNumber];
@@ -343,7 +343,7 @@ static const NSInteger margin = 34;
 - (void)loadMoreOfVOS {
     self.engPageNumber++;
-    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
+    NSString *strUrl = REQUESTURL(@"gxb/api/cataloglatest");
     NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"a\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"spzl/news/\",\"page\":\"%ld\"}",(long)self.engPageNumber];