Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/ScioLive

张旭
2 parents 67e6588e 7986b10b
Showing 65 changed files with 702 additions and 993 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
CNLiveScioLive/AppDelegate.m
CNLiveScioLive/Assets.xcassets/Home/cnlive_CN.imageset/Contents.json
CNLiveScioLive/Assets.xcassets/Home/cnlive_CN.imageset/cnlive_CN@3x.png
CNLiveScioLive/Assets.xcassets/Home/cnlive_EN.imageset/Contents.json
CNLiveScioLive/Assets.xcassets/Home/cnlive_EN.imageset/cnlive_EN@3x.png
CNLiveScioLive/Assets.xcassets/Home/cnlive_additional_screening.imageset/Contents.json
CNLiveScioLive/Assets.xcassets/Home/cnlive_blue_search.imageset/Contents.json
CNLiveScioLive/Assets.xcassets/Home/cnlive_blue_search.imageset/cnlive_blue_search@3x.png
CNLiveScioLive/Assets.xcassets/Home/cnlive_classification.imageset/Contents.json
CNLiveScioLive/Assets.xcassets/Home/cnlive_classification.imageset/cnlive_classification@3x.png
CNLiveScioLive/Assets.xcassets/Home/cnlive_column.imageset/Contents.json
CNLiveScioLive/Assets.xcassets/Home/cnlive_column.imageset/cnlive_column@3x.png
CNLiveScioLive/Assets.xcassets/Home/cnlive_icon.imageset/Contents.json
CNLiveScioLive/Assets.xcassets/Home/cnlive_icon.imageset/cnlive_icon@3x.png
CNLiveScioLive/Assets.xcassets/Home/cnlive_pitch.imageset/Contents.json
CNLiveScioLive/Assets.xcassets/Home/cnlive_scan.imageset/Contents.json
CNLiveScioLive/Assets.xcassets/common/placeholder.imageset/91620976418_.pic_hd.jpg
CNLiveScioLive/Assets.xcassets/common/placeholder.imageset/Contents.json
CNLiveScioLive/Assets.xcassets/common/placeholder.imageset/placeholder@2x.png
@@ -13,7 +13,6 @@
 		080AB4C8217AD4F4008BA78F /* TemplateShareManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 080AB4C5217AD4F4008BA78F /* TemplateShareManager.m */; };
 		0816B5E42648C23A005E1F8C /* UIColor+CNGray.m in Sources */ = {isa = PBXBuildFile; fileRef = 0816B5E32648C23A005E1F8C /* UIColor+CNGray.m */; };
 		0816B5E92648C320005E1F8C /* WKWebView+CNGray.m in Sources */ = {isa = PBXBuildFile; fileRef = 0816B5E82648C320005E1F8C /* WKWebView+CNGray.m */; };
-		0836125A264BA2BF00A18E52 /* UILabel+CNGray.m in Sources */ = {isa = PBXBuildFile; fileRef = 08361259264BA2BF00A18E52 /* UILabel+CNGray.m */; };
 		083847E1215C5DDD00186618 /* VPImageCropperViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 083847E0215C5DDD00186618 /* VPImageCropperViewController.m */; };
 		083847E2215C5DDD00186618 /* VPImageCropperViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 083847E0215C5DDD00186618 /* VPImageCropperViewController.m */; };
 		083847E3215C5DDD00186618 /* VPImageCropperViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 083847E0215C5DDD00186618 /* VPImageCropperViewController.m */; };
@@ -91,9 +90,6 @@
 		084ACE3B2154C8310089E035 /* CNLiveNewsUpPicTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 084ACE3A2154C8310089E035 /* CNLiveNewsUpPicTableViewCell.m */; };
 		084ACE3C2154C8310089E035 /* CNLiveNewsUpPicTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 084ACE3A2154C8310089E035 /* CNLiveNewsUpPicTableViewCell.m */; };
 		084ACE3D2154C8310089E035 /* CNLiveNewsUpPicTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 084ACE3A2154C8310089E035 /* CNLiveNewsUpPicTableViewCell.m */; };
-		084ACE402154D7F70089E035 /* CNHomeBaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 084ACE3F2154D7F70089E035 /* CNHomeBaseViewController.m */; };
-		084ACE412154D7F70089E035 /* CNHomeBaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 084ACE3F2154D7F70089E035 /* CNHomeBaseViewController.m */; };
-		084ACE422154D7F70089E035 /* CNHomeBaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 084ACE3F2154D7F70089E035 /* CNHomeBaseViewController.m */; };
 		08515D07215B81E900411756 /* TopNoticeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08515D06215B81E900411756 /* TopNoticeViewController.m */; };
 		08515D08215B81E900411756 /* TopNoticeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08515D06215B81E900411756 /* TopNoticeViewController.m */; };
 		08515D09215B81E900411756 /* TopNoticeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08515D06215B81E900411756 /* TopNoticeViewController.m */; };
@@ -741,8 +737,6 @@
 		0816B5E32648C23A005E1F8C /* UIColor+CNGray.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIColor+CNGray.m"; sourceTree = "<group>"; };
 		0816B5E72648C320005E1F8C /* WKWebView+CNGray.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "WKWebView+CNGray.h"; sourceTree = "<group>"; };
 		0816B5E82648C320005E1F8C /* WKWebView+CNGray.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "WKWebView+CNGray.m"; sourceTree = "<group>"; };
-		08361258264BA2BF00A18E52 /* UILabel+CNGray.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UILabel+CNGray.h"; sourceTree = "<group>"; };
-		08361259264BA2BF00A18E52 /* UILabel+CNGray.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UILabel+CNGray.m"; sourceTree = "<group>"; };
 		083847DF215C5DDD00186618 /* VPImageCropperViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VPImageCropperViewController.h; sourceTree = "<group>"; };
 		083847E0215C5DDD00186618 /* VPImageCropperViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VPImageCropperViewController.m; sourceTree = "<group>"; };
 		0838483C215C838B00186618 /* CNLiveENTabBarController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CNLiveENTabBarController.h; sourceTree = "<group>"; };
@@ -795,8 +789,6 @@
 		084ACE352154C6D60089E035 /* CNLiveNewsLeftPicTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CNLiveNewsLeftPicTableViewCell.m; sourceTree = "<group>"; };
 		084ACE392154C8310089E035 /* CNLiveNewsUpPicTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CNLiveNewsUpPicTableViewCell.h; sourceTree = "<group>"; };
 		084ACE3A2154C8310089E035 /* CNLiveNewsUpPicTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CNLiveNewsUpPicTableViewCell.m; sourceTree = "<group>"; };
-		084ACE3E2154D7F70089E035 /* CNHomeBaseViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CNHomeBaseViewController.h; sourceTree = "<group>"; };
-		084ACE3F2154D7F70089E035 /* CNHomeBaseViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CNHomeBaseViewController.m; sourceTree = "<group>"; };
 		08515D05215B81E900411756 /* TopNoticeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TopNoticeViewController.h; sourceTree = "<group>"; };
 		08515D06215B81E900411756 /* TopNoticeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopNoticeViewController.m; sourceTree = "<group>"; };
 		08585CE3215B302C00FC2CA2 /* CNLiveSearchViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CNLiveSearchViewController.h; sourceTree = "<group>"; };
@@ -1816,8 +1808,6 @@
 			children = (
 				08C09000214FB0E600E23D16 /* CNHomeViewController.h */,
 				08C09001214FB0E600E23D16 /* CNHomeViewController.m */,
-				084ACE3E2154D7F70089E035 /* CNHomeBaseViewController.h */,
-				084ACE3F2154D7F70089E035 /* CNHomeBaseViewController.m */,
 				08384845215C98A000186618 /* CNHomeENViewController.h */,
 				08384846215C98A000186618 /* CNHomeENViewController.m */,
 				084ACE202154B1270089E035 /* CNHomeModel.h */,
@@ -2255,8 +2245,6 @@
 				0816B5E32648C23A005E1F8C /* UIColor+CNGray.m */,
 				0816B5E72648C320005E1F8C /* WKWebView+CNGray.h */,
 				0816B5E82648C320005E1F8C /* WKWebView+CNGray.m */,
-				08361258264BA2BF00A18E52 /* UILabel+CNGray.h */,
-				08361259264BA2BF00A18E52 /* UILabel+CNGray.m */,
 			);
 			path = ImageGray;
 			sourceTree = "<group>";
@@ -2845,7 +2833,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0836125A264BA2BF00A18E52 /* UILabel+CNGray.m in Sources */,
 				08B5C5822153400700F5476E /* CNNewsoundBaseModel.m in Sources */,
 				08585DB5215B4DA300FC2CA2 /* CNLiveAdvancedSearchViewController.m in Sources */,
 				08C28A30263932960065B372 /* UIImageView+CNGrayImage.m in Sources */,
@@ -2872,7 +2859,6 @@
 				08585D86215B4C7200FC2CA2 /* PGDatePicker+Common.m in Sources */,
 				08C090732150C79C00E23D16 /* UIView+ViewController.m in Sources */,
 				085D86D1215A3BFD0037D480 /* CNLiveUserUpdateViewController.m in Sources */,
-				084ACE402154D7F70089E035 /* CNHomeBaseViewController.m in Sources */,
 				08C08FE3214FA01B00E23D16 /* CNLiveViewController.m in Sources */,
 				0838483E215C838B00186618 /* CNLiveENTabBarController.m in Sources */,
 				085D86C7215A20A50037D480 /* CNLiveUserSettingViewController.m in Sources */,
@@ -3149,7 +3135,6 @@
 				08B5C5AD21535D4400F5476E /* NSString+Validation.m in Sources */,
 				08384853215CA74700186618 /* SCIOSpecialViewController.m in Sources */,
 				08384869215CAB1C00186618 /* YWWebScrollView.m in Sources */,
-				084ACE412154D7F70089E035 /* CNHomeBaseViewController.m in Sources */,
 				084ACE19215481870089E035 /* NoDataView.m in Sources */,
 				0870DACF215F1CE6008DC811 /* VideoPlayBackViewController.m in Sources */,
 				08B5C5A221534DC700F5476E /* CNLiveRegisterEmailViewController.m in Sources */,
@@ -3304,7 +3289,6 @@
 				08B5C5AE21535D4400F5476E /* NSString+Validation.m in Sources */,
 				08384854215CA74700186618 /* SCIOSpecialViewController.m in Sources */,
 				0838486A215CAB1C00186618 /* YWWebScrollView.m in Sources */,
-				084ACE422154D7F70089E035 /* CNHomeBaseViewController.m in Sources */,
 				084ACE1A215481870089E035 /* NoDataView.m in Sources */,
 				0870DAD0215F1CE6008DC811 /* VideoPlayBackViewController.m in Sources */,
 				08B5C5A321534DC700F5476E /* CNLiveRegisterEmailViewController.m in Sources */,
@@ -17,6 +17,8 @@
 @interface AppDelegate ()<XGPushDelegate>
 {
     UIImageView *imageView;
+    NSTimer *connectionTimer;
+    BOOL done;
 }
 @property (nonatomic, assign) BOOL isPush;   //区分普通启动还是推送
 @property (nonatomic, copy) NSString *type;  //区分首页还是直播   还是id
@@ -58,17 +60,11 @@
     [self checkAppUpdate];
     [self initializeSDKConfiguration];
-    [self requestLanchImage];
-    NSData *data = [[NSUserDefaults standardUserDefaults] objectForKey:@"lanchImage"];
-    if (data.length>0) {
-        UIViewController *VC = [[UIViewController alloc] init];
-        imageView= [[UIImageView alloc ] initWithFrame :[ UIScreen mainScreen ]. bounds ];
-        [imageView setImage:[UIImage imageWithData:data]];
-        [VC.view addSubview:imageView];
-        self.window.rootViewController = VC;
-        [self performSelector:@selector(removeImage) withObject:nil afterDelay:3];
-        [self.window makeKeyAndVisible];
-    }
+    [self requestLanchImage:0];
+    do{
+        [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:1.0]];
+
+    }while (!done);
     return YES;
 }
 -(void)addRootViewController
@@ -92,10 +88,11 @@
         CNLiveENTabBarController *liveTab = [[CNLiveENTabBarController alloc] init];
         self.window.rootViewController = liveTab;
     }
+    done = YES;
     [self.window makeKeyAndVisible];
 }
 #pragma mark - 请求启动页
--(void)requestLanchImage
+-(void)requestLanchImage:(int)time
 {
     NSString *urlStr = REQUESTURL(@"gxb/openBanner");
     NSDictionary *parameters = @{@"params":@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"pageUUID\":\"852cde69-ecd8-11e6-b52e-c7d8a7a18cc4\",\"pageType\":\"channelList\"}"};
@@ -103,7 +100,7 @@
         NSDictionary *dic = [NSDictionary dictionaryWithDictionary:json];
         NSURL *url = [NSURL URLWithString:dic[@"data"][@"image"]];
         NSString * mode = dic[@"grayMode"];
-        if (mode.intValue == 1) {
+        if (mode&&mode.intValue == 1) {
             [[NSUserDefaults standardUserDefaults] setBool:YES forKey:ISGRAYMODE];
         }else{
             [[NSUserDefaults standardUserDefaults] setBool:NO forKey:ISGRAYMODE];
@@ -115,9 +112,17 @@
             [[NSUserDefaults standardUserDefaults] setValue:nil forKey:HOMETITLECOLOR];
         }
         NSData *data = [[NSUserDefaults standardUserDefaults] objectForKey:@"lanchImage"];
-        if (data.length<=0) {
+        NSString *errorCode = dic[@"errorCode"];
             [self addRootViewController];
-        }
+        if (errorCode.intValue == 0) {
+            if (data.length>0) {
+                self->imageView= [[UIImageView alloc ] initWithFrame :[ UIScreen mainScreen ]. bounds ];
+                [self->imageView setImage:[UIImage imageWithData:data]];
+                [AppKeyWindow addSubview:self->imageView];
+                self->imageView.contentMode= UIViewContentModeScaleAspectFill;
+                [self performSelector:@selector(removeImage) withObject:nil afterDelay:3];
+                self->done = YES;
+            }
         NSURLSessionConfiguration *configuration = [ NSURLSessionConfiguration defaultSessionConfiguration ];
        AFURLSessionManager *manager = [[ AFURLSessionManager alloc ] initWithSessionConfiguration :configuration];
        NSURLRequest *request = [ NSURLRequest requestWithURL :url];
@@ -133,15 +138,16 @@
        }];
        [downloadTask resume ];
-        
+        }
     } failure:^(NSError *error) {
-        [self requestLanchImage];
+        [self addRootViewController];
+        
     }];
+   
 }
 -(void)removeImage{
     [imageView removeFromSuperview];
     imageView = nil;
-    [self addRootViewController];
 }
 //语言
 #pragma mark - 语言
@@ -187,6 +193,7 @@
 - (void)applicationDidEnterBackground:(UIApplication *)application {
+    [[NSNotificationCenter defaultCenter] postNotificationName:RESIGNACTIVE object:nil];
     // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
     // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
 }
@@ -195,13 +202,34 @@
 - (void)applicationWillEnterForeground:(UIApplication *)application {
     // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
     self.isPush = NO;
-
+    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];
+        if (dic[@"homeTitleColor"]&&![dic[@"homeTitleColor"] isEqualToString:@""]) {
+            [[NSUserDefaults standardUserDefaults] setValue:dic[@"homeTitleColor"] forKey:HOMETITLECOLOR];
+        }else
+        {
+            [[NSUserDefaults standardUserDefaults] setValue:nil forKey:HOMETITLECOLOR];
+        }
+        NSString * mode = dic[@"grayMode"];
+        if (mode&&mode.intValue == 1 && ![[NSUserDefaults standardUserDefaults] boolForKey:ISGRAYMODE]) {
+            [[NSUserDefaults standardUserDefaults] setBool:YES forKey:ISGRAYMODE];
+            [self addRootViewController];
+        }else if (mode&&mode.intValue == 0 && [[NSUserDefaults standardUserDefaults] boolForKey:ISGRAYMODE]){
+            [[NSUserDefaults standardUserDefaults] setBool:NO forKey:ISGRAYMODE];
+            [self addRootViewController];
+        }
+        
+    } failure:^(NSError *error) {
+        
+    }];
 }
 - (void)applicationDidBecomeActive:(UIApplication *)application {
     // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
-    
+    [[NSNotificationCenter defaultCenter] postNotificationName:BECOMEACTIVE object:nil];
     if (self.isPush) {
         if([self.window.rootViewController isKindOfClass:[XLSlideMenu class]]){
             XLSlideMenu *menu = (XLSlideMenu *)self.window.rootViewController;
@@ -535,27 +563,30 @@
     NSDictionary *infoDict = [[NSBundle mainBundle] infoDictionary];
     NSString *nowVersion = [infoDict objectForKey:@"CFBundleShortVersionString"];
     NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"https://itunes.apple.com/lookup?id=%@", uAppId]];
-    NSString * file =  [NSString stringWithContentsOfURL:url encoding:NSUTF8StringEncoding error:nil];
-    NSDictionary *dic = [file objectFromJSONString];
-    NSDictionary *results = [[dic objectForKey:@"results"] firstObject];
-    NSString *newVersion =[results objectForKey:@"version"];
-    if([newVersion compare:nowVersion options:NSNumericSearch] == NSOrderedDescending) {
-        [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"upDate"];
-        UIAlertView *alert = [[UIAlertView alloc] initWithTitle:CustomStr(@"VersionUpdate")
-                                                        message:[results objectForKey:@"releaseNotes"]
-                                                       delegate:self
-                                              cancelButtonTitle:CustomStr(@"Cancel")
-                                              otherButtonTitles:CustomStr(@"Update"),nil];
-        [alert show];
-        return;
-    }
-}
-- (void)alertView:(UIAlertView*)alertView clickedButtonAtIndex:(NSInteger)buttonIndex{
-    if(buttonIndex == 1){
-        // 此处加入应用在app store的地址，方便用户去更新，一种实现方式如下：
-        NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"https://itunes.apple.com/us/app/id%@?ls=1&mt=8", uAppId]];
-        [[UIApplication sharedApplication] openURL:url];
-    }
+    dispatch_async(dispatch_get_global_queue(0, 0), ^{
+        NSString * file =  [NSString stringWithContentsOfURL:url encoding:NSUTF8StringEncoding error:nil];
+        NSDictionary *dic = [file objectFromJSONString];
+        if (dic.count<=0) { 
+            return;
+        }
+        NSDictionary *results = [[dic objectForKey:@"results"] firstObject];
+        NSString *newVersion =[results objectForKey:@"version"];
+        if([newVersion compare:nowVersion options:NSNumericSearch] == NSOrderedDescending) {
+            [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"upDate"];
+            dispatch_async(dispatch_get_main_queue(), ^{
+                UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:CustomStr(@"VersionUpdate") message:[results objectForKey:@"releaseNotes"] preferredStyle:UIAlertControllerStyleAlert];
+                UIAlertAction *action1 = [UIAlertAction actionWithTitle:CustomStr(@"Update") style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+                    NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"https://itunes.apple.com/us/app/id%@?ls=1&mt=8", uAppId]];
+                    [[UIApplication sharedApplication] openURL:url];
+                }];
+                UIAlertAction *action2 = [UIAlertAction actionWithTitle:CustomStr(@"Cancel") style:UIAlertActionStyleCancel handler:nil];
+                [alertVC addAction:action2];
+                [alertVC addAction:action1];
+                [self.window.rootViewController presentViewController:alertVC animated:YES completion:nil];
+            });
+        }
+    });
+    
 }
 - (BOOL)shouldAutorotate {
     return NO;
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "cnlive_CN.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "cnlive_CN@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cnlive_CN@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
 \ No newline at end of file
+}
@@ -5,18 +5,17 @@
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "cnlive_EN@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cnlive_EN@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
 \ No newline at end of file
+}
@@ -5,18 +5,18 @@
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "cnlive_additional_screening@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "cnlive_additional_screening@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
 \ No newline at end of file
+}
@@ -5,18 +5,17 @@
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "cnlive_blue_search@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cnlive_blue_search@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
 \ No newline at end of file
+}
@@ -5,18 +5,17 @@
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "cnlive_classification@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cnlive_classification@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
 \ No newline at end of file
+}
@@ -5,18 +5,18 @@
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "cnlive_column@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "cnlive_column@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
 \ No newline at end of file
+}
@@ -5,18 +5,17 @@
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "cnlive_icon@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cnlive_icon@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
 \ No newline at end of file
+}
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "cnlive_pitch.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "cnlive_pitch@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "cnlive_pitch@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
 \ No newline at end of file
+}
@@ -5,18 +5,18 @@
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "cnlive_scan@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "cnlive_scan@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
 \ No newline at end of file
+}
@@ -5,8 +5,8 @@
       "scale" : "1x"
     },
     {
+      "filename" : "91620976418_.pic_hd.jpg",
       "idiom" : "universal",
-      "filename" : "placeholder@2x.png",
       "scale" : "2x"
     },
     {
@@ -15,7 +15,7 @@
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
 \ No newline at end of file
+}
@@ -5,18 +5,17 @@
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "my_tabbar@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "my_tabbar@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
 \ No newline at end of file
+}
@@ -5,18 +5,17 @@
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "my_tabbar_sel@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "my_tabbar_sel@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
 \ No newline at end of file
+}
@@ -60,7 +60,12 @@
     [headerButton setImage:[UIImage imageNamed:@"cnlive_icon"] forState:UIControlStateSelected];
     [headerButton setTitle:_name forState:UIControlStateNormal];
+    if (HOMETITLECOLORSTR) {
+        [headerButton setTitleColor:[UIColor colorWithHexString:HOMETITLECOLORSTR] forState:UIControlStateNormal];
+    }else{
     [headerButton setTitleColor:Color_Blue forState:UIControlStateNormal];
+    }
+
     headerButton.titleLabel.font = [UIFont systemFontOfSize:15];
     headerButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;//居左显示
@@ -83,7 +88,11 @@
     self.navigationItem.rightBarButtonItem = item2;
 }
-
+-(BOOL)forceEnableInteractivePopGestureRecognizer
+{
+    return YES;
+    
+}
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
@@ -83,7 +83,6 @@
 #import "UIImageView+CNGrayImage.h"
 #import "UIColor+CNGray.h"
 #import "WKWebView+CNGray.h"
-#import "UILabel+CNGray.h"
 //友盟统计
 #import <UMCommon/MobClick.h>
 #import <UMCommon/UMConfigure.h>
@@ -151,4 +151,8 @@ NO)
 #define leftImageCellWidth (MainScreenWidth*3/8)
 #define threeImageCellWidth ((cellItemWidth - 16)/3)
+//通知
+#define RESIGNACTIVE @"resignActive"
+#define BECOMEACTIVE @"becomeActive"
+
 #endif /* SystemMacro_h */
@@ -9,8 +9,8 @@
 #ifndef UrlMacro_h
 #define UrlMacro_h
-#define REQUESTURL(url)  [@"http://test.app.phonemovie.cnlive.com/" stringByAppendingPathComponent:url]                             //测试环境
-//#define REQUESTURL(url)  [@"http://app.phonemovie.cnlive.com/" stringByAppendingPathComponent:url]                            //正式环境
+//#define REQUESTURL(url)  [@"http://test.app.phonemovie.cnlive.com/" stringByAppendingPathComponent:url]                             //测试环境
+#define REQUESTURL(url)  [@"http://app.phonemovie.cnlive.com/" stringByAppendingPathComponent:url]                            //正式环境
 #define IS_STRING_EMPTY(string) (string==nil || string == NULL || [string isKindOfClass:[NSNull class]] || [[string stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] length]==0 || [string isEqualToString:@""] || [string isEqualToString:@"<null>"])
@@ -48,7 +48,6 @@
 //#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  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]
-//
-//  CNHomeBaseViewController.h
-//  CNLiveScioLive
-//
-//  Created by CNLive-zxw on 2018/9/21.
-//  Copyright © 2018年 CNLive. All rights reserved.
-//
-
-#import "CNLiveBaseViewController.h"
-
-@interface CNHomeBaseViewController : CNLiveBaseViewController
-@property (nonatomic, copy) NSString *cid;
-
-@end
-//
-//  CNHomeBaseViewController.m
-//  CNLiveScioLive
-//
-//  Created by CNLive-zxw on 2018/9/21.
-//  Copyright © 2018年 CNLive. All rights reserved.
-//
-
-#import "CNHomeBaseViewController.h"
-#import "CNHomeModel.h"
-
-#import "CNLiveNewsNoPicTableViewCell.h"
-#import "CNLiveNewsThreePicTableViewCell.h"
-#import "CNLiveNewsLeftPicTableViewCell.h"
-#import "CNLiveNewsUpPicTableViewCell.h"
-
-
-@interface CNHomeBaseViewController ()<UITableViewDelegate,UITableViewDataSource>
-@property (nonatomic, strong) UITableView *tableView;
-@property (nonatomic, strong) NSMutableArray *data;
-@property (nonatomic, assign) NSInteger pageNo;
-@property (nonatomic, assign) BOOL isRefreshing;
-
-@end
-
-@implementation CNHomeBaseViewController
-static NSString *newsNoPicTableViewCell = @"CNLiveNewsNoPicTableViewCell";
-static NSString *newsThreePicTableViewCell = @"CNLiveNewsThreePicTableViewCell";
-static NSString *newsLeftPicTableViewCell = @"CNLiveNewsLeftPicTableViewCell";
-static NSString *newsUpPicTableViewCell = @"CNLiveNewsUpPicTableViewCell";
-
-#pragma mark - Data
-- (void)loadData{
-    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);
-    NSDictionary *parameters = @{@"params":categoryId};
-    
-    if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
-        [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
-        [self.tableView.mj_header endRefreshing];
-        [self.tableView.mj_footer endRefreshing];
-        self->_isRefreshing = NO;
-        return;
-    }
-    [AlertViewTool showHUDView];
-    [XWHTTPTool POST:strUrl params:parameters success:^(id json) {
-        [AlertViewTool hideHUDView];
-        
-        // 请求成功，解析数据
-        NSDictionary *dic = [NSDictionary dictionaryWithDictionary:json];
-        
-        if ([dic[@"errorCode"] isEqualToString:@"0"]) {
-
-            if ([dic[@"programs"] isKindOfClass:[NSArray class]]) {
-                NSArray *lists = dic[@"programs"];
-                if(self->_pageNo == 1&&lists.count > 0){
-                    [self.data removeAllObjects];
-                }
-                self->_pageNo++;
-                for (NSDictionary *dics in lists) {
-                    [CNHomeModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{
-                        return @{ @"ID" : @"id" ,@"Description" : @"description" };
-                    }];
-                    NSLog(@"%@",dics);
-                    [self.data addObject:[CNHomeModel mj_objectWithKeyValues:dics]];
-                    
-                }
-            }
-            
-        } else {
-            [AlertViewTool showHUDViewText:dic[@"errorMessage"]];
-
-        }
-        [self.tableView.mj_header endRefreshing];
-        
-        if ([dic[@"nextCursor"] isEqualToString:@"0"]) {
-            [self.tableView.mj_footer endRefreshingWithNoMoreData];
-            
-        } else {
-            [self.tableView.mj_footer endRefreshing];
-            
-        }
-        [self.tableView reloadData];
-        self->_isRefreshing = NO;
-
-        
-    } failure:^(NSError *error) {
-        [AlertViewTool hideHUDView];
-        [AlertViewTool showHUDViewText:CustomStr(@"ServerBusy")];
-        self->_isRefreshing = NO;
-        
-    }];
-}
-
-- (void)loadUpData{
-    _pageNo = 1;
-    if(!_isRefreshing){
-        _isRefreshing = YES;
-        [self loadData];
-    }
-}
-- (void)loadMoreData{
-    if(!_isRefreshing){
-        _isRefreshing = YES;
-        [self loadData];
-    }
-}
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    
-    _pageNo = 1;
-    _isRefreshing = NO;
-    
-    [self loadData];
-    [self.view addSubview:self.tableView];
-    
-    // Do any additional setup after loading the view.
-}
-
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
-}
-#pragma mark - UITableViewDelegate
-- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
-    CNHomeModel *model = self.data[indexPath.row];
-    if([model.showType isEqualToString:@"0"]){
-        return 200*MainHScale+85;//一张图 上边
-        
-    }
-    else if([model.showType isEqualToString:@"1"]){
-        if(model.img && ![model.img isEqualToString:@""]){
-            return 80*MainScale+20;//一张图 左边
-        }
-//        return model.titleHeight+40;//无图
-        return 80*MainScale+20;//一张图 左边
-
-    }
-    else if([model.showType isEqualToString:@"2"]){
-        return (MainScreenWidth-20-20)/3.0+85;//三张图
-
-    }
-    else if([model.showType isEqualToString:@"3"]){
-        if(model.img && ![model.img isEqualToString:@""]){
-            return 80*MainScale+20;//一张图 左边
-        }
-//        return model.titleHeight+40;//无图
-        return 80*MainScale+20;//一张图 左边
-
-    }else{
-//        return model.titleHeight+40;//无图
-        return 80*MainScale+20;//一张图 左边
-
-    }
-}
-
-#pragma mark - UITableViewDataSource
-- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
-    return self.data.count;
-    
-}
-
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
-    CNHomeModel *model = self.data[indexPath.row];
-    if([model.showType isEqualToString:@"0"]){
-        //一张图 上边
-        CNLiveNewsUpPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsUpPicTableViewCell];
-        if (!cell) {
-            cell = [[CNLiveNewsUpPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsUpPicTableViewCell];
-        }
-        cell.selectionStyle = UITableViewCellSelectionStyleNone;
-        cell.model = self.data[indexPath.row];
-        return cell;
-        
-    }
-    else if([model.showType isEqualToString:@"2"]){
-        //三张图
-        CNLiveNewsThreePicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsThreePicTableViewCell];
-        if (!cell) {
-            cell = [[CNLiveNewsThreePicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsThreePicTableViewCell];
-        }
-        cell.selectionStyle = UITableViewCellSelectionStyleNone;
-        cell.model = self.data[indexPath.row];
-        return cell;
-        
-    }
-    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];
-        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];
-    [self pushViewControllerWithModel:model];
-}
-/*
- #pragma mark - Navigation
- 
- // In a storyboard-based application, you will often want to do a little preparation before navigation
- - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
- // Get the new view controller using [segue destinationViewController].
- // Pass the selected object to the new view controller.
- }
- */
-#pragma mark - Action
-- (void)pushViewControllerWithModel:(CNHomeModel *)model {
-    NSDictionary *_dic = [model toDictionary];
-    if ([@"program" isEqualToString:_dic[@"type"]]) {
-        //视频
-        OldVideoDetailViewController *vc = [[OldVideoDetailViewController alloc] initWithDictionary:_dic];
-        vc.title = _dic[@"cmsColumnName"];
-        vc.hidesBottomBarWhenPushed = YES;
-        [self.navigationController pushViewController:vc animated:YES];
-        
-    } else if ([@"article" isEqualToString:_dic[@"type"]]) {
-        //文章
-        OldArticleDetailViewController *vc = [[OldArticleDetailViewController alloc] initWithDictionary:_dic];
-        vc.title = _dic[@"cmsColumnName"];
-        vc.hidesBottomBarWhenPushed = YES;
-        [self.navigationController pushViewController:vc animated:YES];
-        
-    } else if ([@"subject" isEqualToString:_dic[@"type"]]) {
-        SCIOSpecialViewController *vc = [[SCIOSpecialViewController alloc] initWithDictionary:_dic];
-        vc.title = @"国新专题";
-        vc.hidesBottomBarWhenPushed = YES;
-        [self.navigationController pushViewController:vc animated:YES];
-        
-    } else if ([@"LK" isEqualToString:_dic[@"type"]]) {
-        OldArticleDetailViewController *vc = [[OldArticleDetailViewController alloc] initWithDictionary:_dic];
-        vc.title = _dic[@"cmsColumnName"];
-        vc.hidesBottomBarWhenPushed = YES;
-       [self.navigationController pushViewController:vc animated:YES];
-        
-    }
-}
-#pragma mark - Lazy Laoding
-- (UITableView *)tableView{
-    if(!_tableView){
-        _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, MainScreenHeight-45-NavBarHeight-TabBarHeight) style:UITableViewStylePlain];
-        _tableView.delegate = self;
-        _tableView.dataSource = self;
-        _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
-        _tableView.backgroundColor = HEXCOLOR(0xebebeb);
-        _tableView.estimatedRowHeight = 0;
-        _tableView.estimatedSectionHeaderHeight = 0;
-        _tableView.estimatedSectionFooterHeight = 0;
-        
-        [_tableView registerClass:[CNLiveNewsLeftPicTableViewCell class] forCellReuseIdentifier:newsLeftPicTableViewCell];
-        [_tableView registerClass:[CNLiveNewsNoPicTableViewCell class] forCellReuseIdentifier:newsNoPicTableViewCell];
-        [_tableView registerClass:[CNLiveNewsUpPicTableViewCell class] forCellReuseIdentifier:newsUpPicTableViewCell];
-        [_tableView registerClass:[CNLiveNewsThreePicTableViewCell class] forCellReuseIdentifier:newsThreePicTableViewCell];
-        
-        //  设置上拉加载
-        MJRefreshGifHeader *header = [MJRefreshGifHeader headerWithRefreshingTarget:self refreshingAction:@selector(loadUpData)];
-        NSMutableArray *refreshingImages = [NSMutableArray array];
-        for (NSUInteger i = 0; i < 4; i++) {
-            UIImage *image = [UIImage imageNamed:[NSString stringWithFormat:@"refresh_animation%lu", (unsigned long)i]];
-            [refreshingImages addObject:image];
-        }
-        [header setImages:refreshingImages forState:MJRefreshStateRefreshing];
-        header.lastUpdatedTimeLabel.hidden = YES;
-        header.stateLabel.hidden = YES;
-        _tableView.mj_header = header;
-
-        //  设置下拉刷新
-        MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(loadMoreData)];
-        [footer setTitle:CustomStr(@"RefreshBackFooterIdleText") forState:MJRefreshStateIdle];
-        [footer setTitle:CustomStr(@"RefreshBackFooterPullingText") forState:MJRefreshStatePulling];
-        [footer setTitle:CustomStr(@"RefreshBackFooterRefreshingText") forState:MJRefreshStateRefreshing];
-        [footer setTitle:CustomStr(@"RefreshBackFooterNoMoreDataText") forState:MJRefreshStateNoMoreData];
-        _tableView.mj_footer = footer;
-        
-    }
-    return _tableView;
-}
-
-- (NSMutableArray *)data{
-    if(!_data){
-        _data = [[NSMutableArray alloc] init];
-    }
-    return _data;
-}
-
-
-@end
@@ -41,6 +41,10 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
     NSLog(@"%@",parameters);
     if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
+        NSData *data = [[NSUserDefaults standardUserDefaults] objectForKey:@"ENHome"];
+        if (data && self.pageNo == 1) {
+            [self dealDictionaryData:data];
+        }
         [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
         [self.tableView.mj_header endRefreshing];
         [self.tableView.mj_footer endRefreshing];
@@ -50,59 +54,22 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
     [AlertViewTool showHUDView];
     [XWHTTPTool POST:strUrl params:parameters success:^(id json) {
-        [MBProgressHUD hideHUDForView:self.view animated:YES];
         [AlertViewTool hideHUDView];
         // 请求成功，解析数据
         NSDictionary *dic = [NSDictionary dictionaryWithDictionary:json];
         if ([dic[@"errorCode"] isEqualToString:@"0"]) {
-            if ([dic[@"programs"] isKindOfClass:[NSArray class]]) {
-                
-                NSArray *lists = dic[@"programs"];
-                if(self->_pageNo == 1&&lists.count > 0){
-                    [self.data removeAllObjects];
-                    
-                }
-                self->_pageNo++;
-                for (NSDictionary *dics in lists) {
-                    [CNHomeModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{
-                        return @{ @"ID" : @"id" ,@"Description" : @"description" };
-                    }];
-                    NSLog(@"%@",dics);
-                    [self.data addObject:[CNHomeModel mj_objectWithKeyValues:dics]];
-                    
-                }
-            
+            NSData *data = [dic mj_JSONData];
+            if (self.pageNo==1) {
+                [[NSUserDefaults standardUserDefaults] setObject:data forKey:@"ENHome"];
             }
-            NSDictionary *ttName = dic[@"ttName"];
-            NSArray *programs = ttName[@"programs"];
-
-            if ([programs isKindOfClass:[NSArray class]]) {
-                [self.banner removeAllObjects];
-                for (NSDictionary *dics in programs) {
-                    [CNHomeModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{
-                        return @{ @"ID" : @"id" ,@"Description" : @"description" };
-                    }];
-                    
-                    NSLog(@"%@",dics);
-                    [self.banner addObject:[CNHomeModel mj_objectWithKeyValues:dics]];
-                }
-                
-                NSMutableArray *titles = [NSMutableArray array];
-                NSMutableArray *imagesURLStrings = [NSMutableArray array];
-                for(int i = 0; i < self.banner.count; i++){
-                    CNHomeModel *model = self.banner[i];
-                    [titles addObject:model.title];
-                    [imagesURLStrings addObject:model.img];
-
-                }
-                self.cycleScrollView.titlesGroup = titles;
-                self.cycleScrollView.imageURLStringsGroup = imagesURLStrings;
-                
-            }
-            
+            [self dealDictionaryData:data];
         } else {
+            NSData *data = [[NSUserDefaults standardUserDefaults] objectForKey:@"ENHome"];
+            if (data && self.pageNo == 1) {
+                [self dealDictionaryData:data];
+            }
             [AlertViewTool showHUDViewText:dic[@"errorMessage"]];
         }
@@ -115,18 +82,81 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
             [self.tableView.mj_footer endRefreshing];
         }
-        [self.tableView reloadData];
+        
         self->_isRefreshing = NO;
     } failure:^(NSError *error) {
         [AlertViewTool hideHUDView];
         self->_isRefreshing = NO;
+        [self.tableView.mj_footer endRefreshing];
+        [self.tableView.mj_header endRefreshing];
         [AlertViewTool showHUDViewText:CustomStr(@"ServerBusy")];
+        NSData *data = [[NSUserDefaults standardUserDefaults] objectForKey:@"ENHome"];
+        if (data && self.pageNo == 1) {
+            [self dealDictionaryData:data];
+        }
+       
     }];
 }
+-(void)dealDictionaryData:(NSData *)data
+{
+    NSDictionary *dic = [data mj_JSONObject];
+    if ([dic[@"programs"] isKindOfClass:[NSArray class]]) {
+        
+        NSArray *lists = dic[@"programs"];
+        if(self->_pageNo == 1&&lists.count > 0){
+            [self.data removeAllObjects];
+            
+        }
+        self->_pageNo++;
+        for (NSDictionary *dics in lists) {
+            [CNHomeModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{
+                return @{ @"ID" : @"id" ,@"Description" : @"description" };
+            }];
+            NSLog(@"%@",dics);
+            [self.data addObject:[CNHomeModel mj_objectWithKeyValues:dics]];
+            
+        }
+    
+    }
+    NSDictionary *ttName = dic[@"ttName"];
+    NSArray *programs = ttName[@"programs"];
+
+    if ([programs isKindOfClass:[NSArray class]]) {
+        [self.banner removeAllObjects];
+        for (NSDictionary *dics in programs) {
+            [CNHomeModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{
+                return @{ @"ID" : @"id" ,@"Description" : @"description" };
+            }];
+            
+            NSLog(@"%@",dics);
+            [self.banner addObject:[CNHomeModel mj_objectWithKeyValues:dics]];
+        }
+        
+        NSMutableArray *titles = [NSMutableArray array];
+        NSMutableArray *imagesURLStrings = [NSMutableArray array];
+        for(int i = 0; i < self.banner.count; i++){
+            CNHomeModel *model = self.banner[i];
+            [titles addObject:model.title];
+            [imagesURLStrings addObject:model.img];
+        }
+        if (titles.count!=0) {
+        self.tableView.tableHeaderView = self.cycleScrollView;
+        self.cycleScrollView.titlesGroup = titles;
+        self.cycleScrollView.imageURLStringsGroup = imagesURLStrings;
+        }
+        
+    }else
+    {
+        if (self.pageNo == 2) {
+            self.tableView.tableHeaderView = nil;
+        }
+    }
+    [self.tableView reloadData];
+}
 - (void)loadUpData{
     _pageNo = 1;
     if(!_isRefreshing){
@@ -151,7 +181,6 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
     _isRefreshing = NO;
     [self.view addSubview:self.tableView];
-    self.tableView.tableHeaderView = self.cycleScrollView;
     [self loadData];
@@ -227,7 +256,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
     }
     else{
-        if(model.img){
+        if(model.img&&![model.img isEqualToString:@""]){
             //一张图 左边
             CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
             if (!cell) {
@@ -15,6 +15,7 @@
 @property (nonatomic, copy) NSString *subTitle;
 @property (nonatomic, copy) NSString *titleColor;
 @property (nonatomic, copy) NSString *tagsColor;
+@property (nonatomic, copy) NSString *textColor;
 @property (nonatomic, copy) NSString *ID;
@@ -14,8 +14,6 @@
 #import "CNLiveHeraldedNewsViewController.h"
 #import "CNLiveReporterAskedViewController.h"
-#import "CNHomeBaseViewController.h"
-
 @interface CNHomeViewController ()
 @property (nonatomic, strong) NSMutableArray *data;
 @property (nonatomic, strong) UIButton *reFreshBtn;
@@ -29,97 +27,52 @@
      NSDictionary *parameters = @{@"params":@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"pageUUID\":\"852cde69-ecd8-11e6-b52e-c7d8a7a18cc4\",\"pageType\":\"channelList\"}"};
     if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
-        [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
-        if (!_reFreshBtn &&self.data.count == 0) {
-            [self.view addSubview:self.reFreshBtn];
+        NSData *data = [[NSUserDefaults standardUserDefaults] objectForKey:@"homeList"];
+        if (data) {
+            [self dealDictionaryData:data];
         }
+        [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
+//        if (!_reFreshBtn &&self.data.count == 0) {
+//            [self.view addSubview:self.reFreshBtn];
+//        }
         return;
     }
-    [AlertViewTool showHUDView];
+//    [AlertViewTool showHUDView];
     [XWHTTPTool POST:strUrl params:parameters success:^(id json) {
-        if (self->_reFreshBtn) {
-            [self->_reFreshBtn removeFromSuperview];
-        }
-        [AlertViewTool hideHUDView];
+//        if (self->_reFreshBtn) {
+//            [self->_reFreshBtn removeFromSuperview];
+//        }
+//        [AlertViewTool hideHUDView];
         // 请求成功，解析数据
         NSDictionary *dic = [NSDictionary dictionaryWithDictionary:json];
         if ([dic[@"errorCode"] isEqualToString:@"0"]) {
-            
-            NSDictionary *ininav = dic[@"ininav"];
-            NSArray *ininavArray = ininav[@"programs"];
-            
-            if ([ininavArray isKindOfClass:[NSArray class]]) {
-                for (NSDictionary *dics in ininavArray) {
-                    [CNHomeModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{
-                        return @{ @"ID" : @"id" ,@"Description" : @"description" };
-                    }];
-                    
-                    NSLog(@"%@",dics);
-                    [self.data addObject:[CNHomeModel mj_objectWithKeyValues:dics]];
-                    
-                }
-                
-            }
-            
-            NSMutableArray *controllers = [NSMutableArray array];
-            NSMutableArray *titles = [NSMutableArray array];
-            
-            for(int i = 0; i < self.data.count; i++){
-                CNHomeModel *model = self.data[i];
-                [titles addObject:model.title];
-                if ([model.cid isEqualToString:@"wz/toutiao/"]) {
-                    //外宣要闻
-                    CNLiveHeraldedNewsViewController *vc = [[CNLiveHeraldedNewsViewController alloc] init];
-                    vc.cid = model.cid;
-                    [controllers addObject:vc];
-                    
-                }else if ([model.cid isEqualToString:@"spzl/djzw/"]) {
-                    //答记者问
-                    CNLiveReporterAskedViewController *vc = [[CNLiveReporterAskedViewController alloc] init];
-                    vc.cid = model.cid;
-                    [controllers addObject:vc];
-                    
-                }else{
-                    //基本
-                    CNHomeBaseViewController *vc = [[CNHomeBaseViewController alloc] init];
-                    vc.cid = model.cid;
-                    [controllers addObject:vc];
-                    
-                }
-                
-            }
-            if(controllers.count > 0){
-                self.segmentControl.titles = titles;
-                if (HOMETITLECOLORSTR) {
-                    self.segmentControl.titleNormalColor = segementColor_title_color;
-                    self.segmentControl.titleSelectColor = [UIColor colorWithHexString:HOMETITLECOLORSTR];
-                [self.segmentControl setBottomViewColor:[UIColor colorWithHexString:HOMETITLECOLORSTR]];
-                }else{
-                if (ininavArray[0][@"textColor"]&&![ininavArray[0][@"textColor"] isEqualToString:@""]) {
-
-                    self.segmentControl.titleSelectColor = [UIColor colorWithHexString:ininavArray[0][@"textColor"]];
-                    [self.segmentControl setBottomViewColor:[UIColor colorWithHexString:ininavArray[0][@"textColor"]]];
-                    }
-                }
-                self.segmentControl.viewControllers = controllers;
-            }
-            NSDictionary *dic = @{@"titles":titles};
-            [[NSNotificationCenter defaultCenter] postNotificationName:@"CNHomeRightViewController" object:nil userInfo:dic];
+            NSData *data = [dic mj_JSONData];
+            [[NSUserDefaults standardUserDefaults] setObject:data forKey:@"homeList"];
+            [self dealDictionaryData:data];
         } else {
+            NSData *data = [[NSUserDefaults standardUserDefaults] objectForKey:@"homeList"];
+            if (data) {
+                [self dealDictionaryData:data];
+            }
             [AlertViewTool hideHUDView];
             [AlertViewTool showHUDViewText:dic[@"errorMessage"]];
-            if (!self->_reFreshBtn &&self.data.count == 0) {
-                [self.view addSubview:self.reFreshBtn];
-            }
+//            if (!self->_reFreshBtn &&self.data.count == 0) {
+//                [self.view addSubview:self.reFreshBtn];
+//            }
         }
     } failure:^(NSError *error) {
+        NSData *data = [[NSUserDefaults standardUserDefaults] objectForKey:@"homeList"];
+        if (data) {
+            [self dealDictionaryData:data];
+        }
+
         [AlertViewTool hideHUDView];
         [AlertViewTool showHUDViewText:CustomStr(@"ServerBusy")];
         if (!self->_reFreshBtn &&self.data.count == 0) {
@@ -127,6 +80,59 @@
         }
     }];
 }
+-(void)dealDictionaryData:(NSData *)data
+{
+    NSDictionary *dic = [data mj_JSONObject];
+    NSDictionary *ininav = dic[@"ininav"];
+    NSArray *ininavArray = ininav[@"programs"];
+    
+    if ([ininavArray isKindOfClass:[NSArray class]]) {
+        for (NSDictionary *dics in ininavArray) {
+            [CNHomeModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{
+                return @{ @"ID" : @"id" ,@"Description" : @"description" };
+            }];
+            
+            NSLog(@"%@",dics);
+            [self.data addObject:[CNHomeModel mj_objectWithKeyValues:dics]];
+            
+        }
+        
+    }
+    
+    NSMutableArray *controllers = [NSMutableArray array];
+    NSMutableArray *titles = [NSMutableArray array];
+    NSMutableArray *colors = [NSMutableArray array];
+    for(int i = 0; i < self.data.count; i++){
+        CNHomeModel *model = self.data[i];
+        [titles addObject:model.title];
+        if (!model.textColor) {
+            model.textColor = @"";
+        }
+        [colors addObject:model.textColor];
+        if ([model.cid isEqualToString:@"spzl/djzw/"]) {
+            //答记者问
+            CNLiveReporterAskedViewController *vc = [[CNLiveReporterAskedViewController alloc] init];
+            vc.cid = model.cid;
+            [controllers addObject:vc];
+            
+        }else{
+            //其他
+            CNLiveHeraldedNewsViewController *vc = [[CNLiveHeraldedNewsViewController alloc] init];
+            vc.cid = model.cid;
+            [controllers addObject:vc];
+        }
+        
+    }
+    if(controllers.count > 0){
+        NSMutableArray *textArray = [NSMutableArray array];
+        [textArray addObject:titles];
+        [textArray addObject:colors];
+        self.segmentControl.titles = textArray;
+        self.segmentControl.viewControllers = controllers;
+    }
+    NSDictionary *dic1 = @{@"titles":titles};
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"CNHomeRightViewController" object:nil userInfo:dic1];
+}
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     [self.navigationController setNavigationBarHidden:NO];
@@ -149,7 +155,11 @@
     headerButton.layer.masksToBounds = true;
     [headerButton setImage:[UIImage imageNamed:@"cnlive_icon"] forState:UIControlStateNormal];
     [headerButton setTitle:@"国新" forState:UIControlStateNormal];
+    if (HOMETITLECOLORSTR) {
+        [headerButton setTitleColor:[UIColor colorWithHexString:HOMETITLECOLORSTR] forState:UIControlStateNormal];
+    }else{
     [headerButton setTitleColor:Color_Blue forState:UIControlStateNormal];
+    }
     headerButton.titleLabel.font = [UIFont systemFontOfSize:15];
     headerButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;//居左显示
@@ -41,6 +41,10 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
     NSDictionary *parameters = @{@"params":categoryId};
     if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
+      NSData *data = [[NSUserDefaults standardUserDefaults] objectForKey:self.cid];
+        if (data && self.pageNo == 1) {
+            [self dealDictionaryData:data];
+        }
         [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
         [self.tableView.mj_header endRefreshing];
         [self.tableView.mj_footer endRefreshing];
@@ -48,62 +52,27 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
         return;
     }
-    [AlertViewTool showHUDView];
+//    [AlertViewTool showHUDView];
     [XWHTTPTool POST:strUrl params:parameters success:^(id json) {
-        [AlertViewTool hideHUDView];
+//        [AlertViewTool hideHUDView];
         // 请求成功，解析数据
         NSDictionary *dic = [NSDictionary dictionaryWithDictionary:json];
         if ([dic[@"errorCode"] isEqualToString:@"0"]) {
-            if ([dic[@"programs"] isKindOfClass:[NSArray class]]) {
-                NSArray *lists = dic[@"programs"];
-                if(self->_pageNo == 1&&lists.count > 0){
-                    [self.data removeAllObjects];
-                    
-                }
-                self->_pageNo++;
-
-                for (NSDictionary *dics in lists) {
-                    [CNHomeModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{
-                        return @{ @"ID" : @"id" ,@"Description" : @"description" };
-                    }];
-                    NSLog(@"%@",dics);
-                    [self.data addObject:[CNHomeModel mj_objectWithKeyValues:dics]];
-                    
-                }
-                
-            }
-            NSDictionary *ttName = dic[@"ttName"];
-            NSArray *programs = ttName[@"programs"];
-
-            if ([programs isKindOfClass:[NSArray class]]) {
-                [self.banner removeAllObjects];
-                for (NSDictionary *dics in programs) {
-                    [CNHomeModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{
-                        return @{ @"ID" : @"id" ,@"Description" : @"description" };
-                    }];
-                    
-                    NSLog(@"%@",dics);
-                    [self.banner addObject:[CNHomeModel mj_objectWithKeyValues:dics]];
-                }
-                
-                NSMutableArray *titles = [NSMutableArray array];
-                NSMutableArray *imagesURLStrings = [NSMutableArray array];
-                for(int i = 0; i < self.banner.count; i++){
-                    CNHomeModel *model = self.banner[i];
-                    [titles addObject:model.title];
-                    [imagesURLStrings addObject:model.img];
-
-                }
-                self.cycleScrollView.titlesGroup = titles;
-                self.cycleScrollView.imageURLStringsGroup = imagesURLStrings;
+            NSData *data = [dic mj_JSONData];
+            if (self -> _pageNo == 1) {
+                [[NSUserDefaults standardUserDefaults] setObject:data forKey:self.cid];
             }
+            [self dealDictionaryData:data];
         } else {
             [AlertViewTool showHUDViewText:dic[@"errorMessage"]];
-
+            NSData *data = [[NSUserDefaults standardUserDefaults] objectForKey:self.cid];
+              if (data &&self.pageNo == 1) {
+                  [self dealDictionaryData:data];
+              }
         }
         [self.tableView.mj_header endRefreshing];
@@ -114,18 +83,85 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
             [self.tableView.mj_footer endRefreshing];
         }
-        [self.tableView reloadData];
+        
         self->_isRefreshing = NO;
     } failure:^(NSError *error) {
+        [AlertViewTool hideHUDView];
+        [self.tableView.mj_header endRefreshing];
+        [self.tableView.mj_footer endRefreshing];
         [AlertViewTool showHUDViewText:CustomStr(@"ServerBusy")];
         self->_isRefreshing = NO;
-        [AlertViewTool hideHUDView];
+        
+        NSData *data = [[NSUserDefaults standardUserDefaults] objectForKey:self.cid];
+          if (data &&self.pageNo == 1) {
+              [self dealDictionaryData:data];
+          }
+        
     }];
 }
+-(void)dealDictionaryData:(NSData *)data
+{
+    NSDictionary *dic = [data mj_JSONObject];
+    if ([dic[@"programs"] isKindOfClass:[NSArray class]]) {
+        NSArray *lists = dic[@"programs"];
+        if(self->_pageNo == 1&&lists.count > 0){
+            [self.data removeAllObjects];
+            
+        }
+       
+        
+        self->_pageNo++;
+
+        for (NSDictionary *dics in lists) {
+            [CNHomeModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{
+                return @{ @"ID" : @"id" ,@"Description" : @"description" };
+            }];
+            NSLog(@"%@",dics);
+            [self.data addObject:[CNHomeModel mj_objectWithKeyValues:dics]];
+            
+        }
+        
+    }
+    NSDictionary *ttName = dic[@"ttName"];
+    NSArray *programs = ttName[@"programs"];
+
+    if ([programs isKindOfClass:[NSArray class]]) {
+        [self.banner removeAllObjects];
+        for (NSDictionary *dics in programs) {
+            [CNHomeModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{
+                return @{ @"ID" : @"id" ,@"Description" : @"description" };
+            }];
+            
+            NSLog(@"%@",dics);
+            [self.banner addObject:[CNHomeModel mj_objectWithKeyValues:dics]];
+        }
+        
+        NSMutableArray *titles = [NSMutableArray array];
+        NSMutableArray *imagesURLStrings = [NSMutableArray array];
+        for(int i = 0; i < self.banner.count; i++){
+            CNHomeModel *model = self.banner[i];
+            [titles addObject:model.title];
+            [imagesURLStrings addObject:model.img];
+
+        }
+        if (titles.count!=0) {
+        self.tableView.tableHeaderView = self.cycleScrollView;
+        self.cycleScrollView.titlesGroup = titles;
+        self.cycleScrollView.imageURLStringsGroup = imagesURLStrings;
+        }
+    }else
+    {
+        if (self.pageNo == 2) {
+            self.tableView.tableHeaderView = nil;
+        }
+    }
+    [self.tableView reloadData];
+}
+
 - (void)loadUpData{
     _pageNo = 1;
     if(!_isRefreshing){
@@ -148,7 +184,6 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
     [self loadData];
     [self.view addSubview:self.tableView];
-    self.tableView.tableHeaderView = self.cycleScrollView;
     // Do any additional setup after loading the view.
 }
@@ -224,7 +259,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
     }else{
-        if(model.img){
+        if(model.img&&![model.img isEqualToString:@""]){
         CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
         if (!cell) {
             cell = [[CNLiveNewsLeftPicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:newsLeftPicTableViewCell];
@@ -159,8 +159,8 @@
     }];
     [_playImage mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.centerX.offset(self->_picImage.centerX);
-        make.centerY.offset(self->_picImage.centerY-40);
+        make.left.equalTo(self->_picImage).offset(5);
+        make.bottom.equalTo(self->_picImage).offset(-5);
         make.width.offset(50);
         make.height.offset(50);
@@ -80,17 +80,13 @@
     _titleLabel.text = model.title;
     _timeLabel.text = [model.createDate componentsSeparatedByString:@" "][0];
     [_picImage sd_setImageWithURL:[NSURL URLWithString:model.img] placeholderImage:[UIImage imageNamed:@"placeholder"]];
-    if (model.titleColor) {
+    if (model.titleColor &&![model.titleColor isEqualToString:@""]) {
         _titleLabel.textColor = [UIColor colorWithHexString:model.titleColor];
     }
-    if (HOMETITLECOLORSTR) {
-        _projectLabel.backgroundColor = [UIColor colorWithHexString:HOMETITLECOLORSTR];
-    }else{
-        if (model.tagsColor) {
+        if (model.tagsColor&&![model.tagsColor isEqualToString:@""]) {
         _projectLabel.backgroundColor = [UIColor colorWithHexString:model.tagsColor];
         }
-    }
     //专题
     if(model.tags && ![model.tags isEqualToString:@""]){
         _projectLabel.text = model.tags;
@@ -137,8 +133,8 @@
     }];
     [_playImage mas_remakeConstraints:^(MASConstraintMaker *make) {
-        make.centerX.equalTo(self->_picImage.mas_centerX);
-        make.centerY.equalTo(self->_picImage.mas_centerY);
+        make.left.equalTo(self->_picImage).offset(5);
+        make.bottom.equalTo(self->_picImage).offset(-5);
         make.width.height.offset(30*MainScale);
     }];
@@ -63,17 +63,13 @@
 - (void)setModel:(CNHomeModel *)model{
     _model = model;
     _titleLabel.text = model.title;
-    if (model.titleColor) {
+    if (model.titleColor &&![model.titleColor isEqualToString:@""]) {
         _titleLabel.textColor = [UIColor colorWithHexString:model.titleColor];
     }
-    
-    if (HOMETITLECOLORSTR) {
-        _projectLabel.backgroundColor = [UIColor colorWithHexString:HOMETITLECOLORSTR];
-    }else{
-        if (model.tagsColor) {
+        if (model.tagsColor&&![model.tagsColor isEqualToString:@""]) {
+        
         _projectLabel.backgroundColor = [UIColor colorWithHexString:model.tagsColor];
         }
-    }
     _timeLabel.text = [model.createDate componentsSeparatedByString:@" "][0];
     if(model.tags && ![model.tags isEqualToString:@""]){
@@ -94,16 +94,13 @@
         _projectLabel.text = model.subjecttag;
     }
-    if (model.titleColor) {
+    if (model.titleColor &&![model.titleColor isEqualToString:@""]) {
         _titleLabel.textColor = [UIColor colorWithHexString:model.titleColor];
     }
-    if (HOMETITLECOLORSTR) {
-        _projectLabel.backgroundColor = [UIColor colorWithHexString:HOMETITLECOLORSTR];
-    }else{
-        if (model.tagsColor) {
+        if (model.tagsColor&&![model.tagsColor isEqualToString:@""]) {
+        
         _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"]];
@@ -123,8 +123,8 @@
     if ([_model.type isEqualToString:@"program"]) {
         _playImage.hidden = NO;
         [_playImage mas_updateConstraints:^(MASConstraintMaker *make) {
-            make.left.equalTo(self->_backgroundImage.mas_left).with.offset((MainScreenWidth-20-50)/2);
-            make.top.equalTo(self->_picImage.mas_top).with.offset((200*MainHScale-50)/2);
+            make.left.equalTo(self->_picImage).offset(5);
+            make.bottom.equalTo(self->_picImage).offset(-5);
             make.width.offset(50);
             make.height.offset(50);
@@ -484,10 +484,12 @@
                 if ([text isEqualToString:@"<null>"]) {
                     text = @"";
                 }
-                if (_dic[@"titleColor"]) {
+                NSString *titleColor = _dic[@"titleColor"];
+                if (titleColor&&![titleColor isEqualToString:@""]) {
                     cell.titleLabel.textColor = [UIColor colorWithHexString:_dic[@"titleColor"]];
                 }
-                if (_dic[@"tagsColor"]) {
+                NSString *tagsColor = _dic[@"tagsColor"];
+                if (tagsColor&&![tagsColor isEqualToString:@""]) {
                     cell.tagsLabel.backgroundColor = [UIColor colorWithHexString:_dic[@"tagsColor"]];
                 }
                 cell.tagsLabel.text  = text;
@@ -16,7 +16,11 @@
 //    [[UIApplication sharedApplication] setStatusBarOrientation:UIInterfaceOrientationPortrait];
 }
-
+-(BOOL)forceEnableInteractivePopGestureRecognizer
+{
+    return YES;
+    
+}
 - (BOOL)shouldAutorotate {
     return NO;
 }
@@ -6,7 +6,6 @@
 //  Copyright © 2018年 CNLive. All rights reserved.
 //
-#import "ZXVideoPlayerController.h"
 #import "CNLiveMyCollectionViewController.h"
 #import "CNLivePlayerController.h"
 #import "BaseViewController.h"
@@ -29,7 +28,6 @@
 }
 @property (strong, nonatomic) UILabel *errorLabe;
 @property (strong, nonatomic) UITableView *tableView;
-@property (strong, nonatomic) ZXVideoPlayerController *videoController;
 @property (nonatomic, strong) CNLivePlayerController *liveController;
@@ -22,18 +22,7 @@
 @end
 @implementation OldVideoDetailViewController
 - (void)Pop:(id)sender{
-//    [self.videoController stop];
-    for(UIViewController *controller in self.navigationController.viewControllers) {
-        if([controller isKindOfClass:[CNLiveMyCollectionViewController class]]) {
-            [self.navigationController popViewControllerAnimated:YES];
-            return;
-        }
-        if ([controller isKindOfClass:[SearchResultViewController class]]) {
-            [self.navigationController popViewControllerAnimated:YES];
-            return;
-        }
-    }
-    [self.navigationController popToRootViewControllerAnimated:YES];
+    [self.navigationController popViewControllerAnimated:YES];
 }
 - (id)initWithDictionary:(NSDictionary *)dictionary{
     if (self = [super init]) {
@@ -50,9 +39,9 @@
                 NSData *data = [NSData dataWithContentsOfURL:[NSURL URLWithString:self->_dictionary[@"imgSmall"]]];
                     self->bgImg = [UIImage imageWithData:data];
                 dispatch_async(dispatch_get_main_queue(), ^{
-                    if (self.videoController && self->bgImg) {
-                        self.videoController.view.contentMode=UIViewContentModeScaleToFill;
-                            self.videoController.view.layer.contents = (__bridge id _Nullable) (self->bgImg.CGImage);
+                    if (self.liveController && self->bgImg) {
+                        self.liveController.view.contentMode=UIViewContentModeScaleToFill;
+                            self.liveController.view.layer.contents = (__bridge id _Nullable) (self->bgImg.CGImage);
                     }
                 });
@@ -95,7 +84,6 @@
 {
     [self.liveController stop];
     self.liveController = nil;
-    self.videoController = nil;
     NSLog(@"delloc");
 }
 - (void)loadShareView {
@@ -201,7 +189,6 @@
 }
 - (void)viewWillDisappear:(BOOL)animated {
     [super viewWillDisappear:animated];
-    [self.videoController stop];
     [self.liveController stopShow];
 //    self.liveController = nil;
     [self.navigationController setNavigationBarHidden:NO];
@@ -269,11 +256,7 @@
     [backgroundView addSubview:self.errorLabe];
     self.errorLabe.text = @"没有数据";
     self.errorLabe.hidden = YES;
-    if ([_dictionary[@"playType"] isEqualToString:@"1"]) {
         [self addCNLivePlayer];
-    } else {
-        [self addZXVideo:movieUrl];
-    }
 }
 // CNLivePlayer
@@ -289,19 +272,28 @@
         [backButton addTarget:self action:@selector(backButtonAction:) forControlEvents:UIControlEventTouchUpInside];
         [bgView addSubview:backButton];
         [self.view addSubview:bgView];
-        
+        self.liveController = [[CNLivePlayerController alloc] initWithContentURL:[NSURL URLWithString:self -> url]];
+        if (!(nil==bgImg)) {
+            self.liveController.view.contentMode=UIViewContentModeScaleToFill;
+                self.liveController.view.layer.contents = (__bridge id _Nullable)(self->bgImg.CGImage);
+        }
+        [[AVAudioSession sharedInstance] setActive:YES error:nil];
+        [bgView removeFromSuperview];
+        [self.liveController configPlayerWithFrame:frame isLiving:NO];
+        [self.liveController showInView:self.view];
         // 点播
-        self.liveController = [[CNLivePlayerController alloc] initVodPlayWithVId:_dictionary[@"uuid"] authSuccess:^{
-            NSError *error = nil;
-            [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayback error: &error];
-            [[AVAudioSession sharedInstance] setActive:YES error:nil];
-            
-            [bgView removeFromSuperview];
-            [self.liveController configPlayerWithFrame:frame isLiving:NO];
-            [self.liveController showInView:self.view];
-        } authFailed:^(NSDictionary *errorInfo) {
-            NSLog(@"初始化点播播放器失败%@", errorInfo);
-        }];
+//        self.liveController = [[CNLivePlayerController alloc] initVodPlayWithVId:_dictionary[@"uuid"] authSuccess:^{
+//            [self.liveController reload:[NSURL URLWithString:self->url]];
+//            NSError *error = nil;
+//            [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayback error: &error];
+//            [[AVAudioSession sharedInstance] setActive:YES error:nil];
+//
+//            [bgView removeFromSuperview];
+//            [self.liveController configPlayerWithFrame:frame isLiving:NO];
+//            [self.liveController showInView:self.view];
+//        } authFailed:^(NSDictionary *errorInfo) {
+//            NSLog(@"初始化点播播放器失败%@", errorInfo);
+//        }];
         self.liveController.delegate = self;
         [[NSUserDefaults standardUserDefaults] setObject:@0 forKey:@"ZXVideoPlayer_DidLockScreen"];
@@ -312,44 +304,6 @@
             [strongSelf.liveController destroyPlayer];
 //            strongSelf.liveController = nil;
             [strongSelf Pop:nil];
-        };
-    }
-    ZXVideo *video = [[ZXVideo alloc] init];
-    video.title = _dictionary[@"title"];
-    video.playUrl = url;
-    self.liveController.video = video;
-}
-- (void)viewDidDisappear:(BOOL)animated{
-    [(AppDelegate *)[UIApplication sharedApplication].delegate initializeSDKConfiguration];
-
-}
-- (void)backButtonAction:(UIButton *)sender {
-    [(AppDelegate *)[UIApplication sharedApplication].delegate initializeSDKConfiguration];
-    [self.navigationController popViewControllerAnimated:YES];
-}
-
-- (void)addZXVideo:(NSURL *)videoUrl {
-    if (!self.videoController) {
-        CGRect frame = CGRectMake(0, iPhoneX ? 44 : 0, MainScreenWidth, videoHeight);
-        self.videoController = [[ZXVideoPlayerController alloc] initWithFrame:frame];
-        //增加播放器背景图片
-        if (!(nil==bgImg)) {
-            self.videoController.view.contentMode=UIViewContentModeScaleToFill;
-                self.videoController.view.layer.contents = (__bridge id _Nullable)(self->bgImg.CGImage);
-        }
-        self.liveController.delegate = self;
-        [self.videoController showInView:self.view];
-        
-        __weak typeof(self) weakSelf = self;
-        self.videoController.videoPlayerShare = ^{
-            __strong typeof(self) strongSelf = weakSelf;
-            [strongSelf shareButtonTaped:strongSelf->_shareBtn];
-        };
-        self.videoController.videoPlayerGoBackBlock = ^{
-            __strong typeof(self) strongSelf = weakSelf;
-            [[NSUserDefaults standardUserDefaults] setObject:@0 forKey:@"ZXVideoPlayer_DidLockScreen"];
-//            strongSelf.videoController = nil;
-            [strongSelf Pop:nil];
             //时长统计结束
             if ([strongSelf->_dictionary[@"cmsColumnId"] isEqualToString:@"spzl/djzw/"]) {
                 //记者问答
@@ -375,9 +329,7 @@
             }
         };
- 
     }
-    
     //时长统计开始
     if ([_dictionary[@"cmsColumnId"] isEqualToString:@"spzl/djzw/"]) {
         //记者问答
@@ -402,10 +354,19 @@
         [CNLiveStat beginEvent:@"gxzssc"];
     }
     ZXVideo *video = [[ZXVideo alloc] init];
-    video.playUrl = url;
     video.title = _dictionary[@"title"];
-    self.videoController.video = video;
+    video.playUrl = url;
+    self.liveController.video = video;
+}
+- (void)viewDidDisappear:(BOOL)animated{
+    [(AppDelegate *)[UIApplication sharedApplication].delegate initializeSDKConfiguration];
+
+}
+- (void)backButtonAction:(UIButton *)sender {
+    [(AppDelegate *)[UIApplication sharedApplication].delegate initializeSDKConfiguration];
+    [self.navigationController popViewControllerAnimated:YES];
 }
+
 - (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler {
     NSURL *requestURL = webView.URL;
     if (([[requestURL scheme] isEqualToString: @"http"] || [[requestURL scheme] isEqualToString:@"https"] || [[requestURL scheme] isEqualToString: @"mailto" ]) && (navigationAction.navigationType == WKNavigationTypeLinkActivated)) {
@@ -507,7 +468,8 @@
         [cell.backImage sd_setImageWithURL:[NSURL URLWithString:_dic[@"img"]] placeholderImage:[UIImage imageNamed:@"backDefault"]];
         cell.titleLabel.text = _dic[@"title"];
         cell.timeLabel.text  = _dic[@"createDate"];
-        if (_dic[@"titleColor"]) {
+        NSString *titleColor = _dic[@"titleColor"];
+        if (titleColor && ![titleColor isEqualToString:@""]) {
             cell.timeLabel.textColor = [UIColor colorWithHexString:_dic[@"titleColor"]];
         }
         return cell;
@@ -520,7 +482,7 @@
     return cell;
 }
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-    [tableView deselectRowAtIndexPath:indexPath animated:YES];
+     [tableView deselectRowAtIndexPath:indexPath animated:YES];
     NSLog(@"%@",_newsArray[indexPath.row]);
     NSDictionary *_dic = _newsArray[indexPath.row];
     [self pushViewTo:_dic];
@@ -531,7 +493,7 @@
         vc.title = _dic[@"cmsColumnName"];
         vc.hidesBottomBarWhenPushed = YES;
         NSMutableArray *controllersAry = [NSMutableArray arrayWithArray:self.navigationController.viewControllers];
-           [controllersAry replaceObjectAtIndex:1 withObject:vc];
+           [controllersAry replaceObjectAtIndex:self.navigationController.viewControllers.count-1 withObject:vc];
            [self.navigationController setViewControllers:controllersAry animated:YES];
 //        [self.navigationController pushViewController:vc animated:YES];
@@ -439,10 +439,12 @@
         cell.titleLabel.text = _dic[@"title"];
         cell.timeLabel.text  = _dic[@"createDate"];
-        if (_dic[@"titleColor"]) {
-            cell.tintColor = [UIColor colorWithHexString:_dic[@"titleColor"]];
+        NSString * titleColor = _dic[@"titleColor"];
+        if (titleColor&&![titleColor isEqualToString:@""]) {
+            cell.titleLabel.textColor = [UIColor colorWithHexString:_dic[@"titleColor"]];
         }
-        if (_dic[@"tagsColor"]) {
+        NSString *tagsColor = _dic[@"tagsColor"];
+        if (tagsColor&&![tagsColor isEqualToString:@""]) {
             cell.tagsLabel.backgroundColor = [UIColor colorWithHexString:_dic[@"tagsColor"]];
         }
         NSString *text = [NSString stringWithFormat:@"%@",_dic[@"tags"]];
@@ -36,6 +36,10 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
     NSDictionary *parameters = @{@"params":categoryId};
     if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
+        NSData *data = [[NSUserDefaults standardUserDefaults] objectForKey:self.cid];
+          if (data &&self.pageNo == 1) {
+              [self dealDictionaryData:data];
+          }
         [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
         [self.tableView.mj_header endRefreshing];
         [self.tableView.mj_footer endRefreshing];
@@ -52,29 +56,15 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
         NSDictionary *dic = [NSDictionary dictionaryWithDictionary:json];
         if ([dic[@"errorCode"] isEqualToString:@"0"]) {
-            if ([dic[@"programs"] isKindOfClass:[NSArray class]]) {
-                NSArray *lists = dic[@"programs"];
-                
-                if(self->_pageNo == 1&&lists.count > 0){
-                    [self.data removeAllObjects];
-                    
-                }
-                self->_pageNo++;
-
-                for (NSDictionary *dics in lists) {
-                    [CNHomeModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{
-                        return @{ @"ID" : @"id" ,@"Description" : @"description" };
-                    }];
-                    
-                    NSLog(@"%@",dics);
-                    [self.data addObject:[CNHomeModel mj_objectWithKeyValues:dics]];
-                    
-                }
-                
-            }
+            NSData *data = [dic mj_JSONData];
+            [[NSUserDefaults standardUserDefaults] setObject:data forKey:self.cid];
+            [self dealDictionaryData:data];
         } else {
-            
+            NSData *data = [[NSUserDefaults standardUserDefaults] objectForKey:self.cid];
+              if (data &&self.pageNo == 1) {
+                  [self dealDictionaryData:data];
+              }
             [AlertViewTool showHUDViewText:dic[@"errorMessage"]];
         }
@@ -87,18 +77,51 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
             [self.tableView.mj_footer endRefreshing];
         }
-        [self.tableView reloadData];
+        
         self->_isRefreshing = NO;
     } failure:^(NSError *error) {
+        [AlertViewTool hideHUDView];
         [AlertViewTool showHUDViewText:CustomStr(@"ServerBusy")];
         self->_isRefreshing = NO;
-        [AlertViewTool hideHUDView];
+        [self.tableView.mj_header endRefreshing];
+        [self.tableView.mj_footer endRefreshing];
+        NSData *data = [[NSUserDefaults standardUserDefaults] objectForKey:self.cid];
+          if (data &&self.pageNo == 1) {
+              [self dealDictionaryData:data];
+          }
+        
     }];
 }
+-(void)dealDictionaryData:(NSData *)data
+{
+    NSDictionary *dic = [data mj_JSONObject];
+    if ([dic[@"programs"] isKindOfClass:[NSArray class]]) {
+        NSArray *lists = dic[@"programs"];
+        
+        if(self->_pageNo == 1&&lists.count > 0){
+            [self.data removeAllObjects];
+            
+        }
+        self->_pageNo++;
+
+        for (NSDictionary *dics in lists) {
+            [CNHomeModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{
+                return @{ @"ID" : @"id" ,@"Description" : @"description" };
+            }];
+            
+            NSLog(@"%@",dics);
+            [self.data addObject:[CNHomeModel mj_objectWithKeyValues:dics]];
+            
+        }
+        
+    }
+    [self.tableView reloadData];
+}
+
 - (void)loadUpData{
     _pageNo = 1;
     if(!_isRefreshing){
@@ -193,7 +216,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
     }
     else{
-        if(model.img){
+        if(model.img&&![model.img isEqualToString:@""]){
             //一张图 左边
             CNLiveNewsLeftPicTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:newsLeftPicTableViewCell];
             if (!cell) {
@@ -318,7 +318,7 @@
               NSArray *programs = dic[@"programs"];
               if (programs.count == 0) {
-                  [self.tableView.mj_footer noticeNoMoreData];
+                  [self.tableView.mj_footer endRefreshingWithNoMoreData];
               }else {
                   [self.dataArray addObjectsFromArray:programs];
@@ -70,7 +70,7 @@
 - (void)getList {
-    NSString *strUrl = [NSString stringWithFormat:@"%@%@",REQUESTURL(@"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"];
@@ -42,6 +42,11 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
 - (void)getData{
     [MBProgressHUD showHUDAddedTo:self.view animated:YES];
     if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
+        NSData *data = [[NSUserDefaults standardUserDefaults] objectForKey:@"LiveHeader"];
+        if (data) {
+            [self dealDictionaryData:data];
+        }
+        [MBProgressHUD hideHUDForView:self.view animated:YES];
         [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
         return;
     }
@@ -51,20 +56,31 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
         // 请求成功，解析数据
         NSDictionary *dic = [NSDictionary dictionaryWithDictionary:json];
-        [CNLiveModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{
-            return @{ @"ID" : @"id" ,@"Description" : @"description" };
-        }];
-        self.liveModel = [CNLiveModel mj_objectWithKeyValues:dic];
-        self.header.model = [CNLiveModel mj_objectWithKeyValues:dic];
-        [self.tableView reloadData];
+        NSData *data = [dic mj_JSONData];
+        [[NSUserDefaults standardUserDefaults] setObject:data forKey:@"LiveHeader"];
+        [self dealDictionaryData:data];
 //        self->_isLoaded = YES;
     } failure:^(NSError *error) {
+        NSData *data = [[NSUserDefaults standardUserDefaults] objectForKey:@"LiveHeader"];
+        if (data) {
+            [self dealDictionaryData:data];
+        }
         [AlertViewTool showHUDAddedToView:self.view text:CustomStr(@"ServerBusy")];
         [MBProgressHUD hideHUDForView:self.view animated:YES];
     }];
 }
+-(void)dealDictionaryData:(NSData *)data
+{
+    NSDictionary *dic = [data mj_JSONObject];
+    [CNLiveModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{
+        return @{ @"ID" : @"id" ,@"Description" : @"description" };
+    }];
+    self.liveModel = [CNLiveModel mj_objectWithKeyValues:dic];
+    self.header.model = [CNLiveModel mj_objectWithKeyValues:dic];
+    [self.tableView reloadData];
+}
 - (void)loadData{
     NSString *strUrl = REQUESTURL(@"gxb/api/cataloglatest");
     NSLog(@"%@",strUrl);
@@ -74,6 +90,10 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
     NSLog(@"%@",parameters);
     if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
+        NSData *data = [[NSUserDefaults standardUserDefaults] objectForKey:@"liveList"];
+        if (data && self.pageNo == 1) {
+            [self dealDictionaryListData:data];
+        }
         [AlertViewTool showHUDAddedToView:self.view text:CustomStr(@"NetworkiInterruption")];
         [self.tableView.mj_header endRefreshing];
         [self.tableView.mj_footer endRefreshing];
@@ -90,38 +110,17 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
         NSDictionary *dic = [NSDictionary dictionaryWithDictionary:json];
         if ([dic[@"errorCode"] isEqualToString:@"0"]) {
-//            if ([dic[@"programs"] isKindOfClass:[NSDictionary class]] && [dic[@"programs"] count]) {
-//                NSDictionary *dics = dic[@"programs"];
-//                [CNLiveModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{
-//                    return @{ @"ID" : @"id" ,@"Description" : @"description" };
-//                }];
-//                [self.data addObject:[CNLiveModel mj_objectWithKeyValues:dics]];
-//            }
-            
-            if ([dic[@"programs"] isKindOfClass:[NSArray class]]) {
-                self->_newsArray = dic[@"programs"];
-                NSArray *lists = dic[@"programs"];
-                
-                if(self->_pageNo == 1&&lists.count > 0){
-                    [self.data removeAllObjects];
-                    
-                }
-                self->_pageNo++;
-
-                for (NSDictionary *dics in lists) {
-                    [CNLiveModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{
-                        return @{ @"ID" : @"id" ,@"Description" : @"description" };
-                    }];
-                    
-                    NSLog(@"%@",dics);
-                    [self.data addObject:[CNLiveModel mj_objectWithKeyValues:dics]];
-                    
-                }
-                
+            NSData *data = [dic mj_JSONData];
+            if ( self.pageNo ==1 ) {
+                [[NSUserDefaults standardUserDefaults] setObject:data forKey:@"liveList"];
             }
-            
+            [self dealDictionaryListData:data];
         } else {
+            NSData *data = [[NSUserDefaults standardUserDefaults] objectForKey:@"liveList"];
+            if (data && self.pageNo == 1) {
+                [self dealDictionaryListData:data];
+            }
             [AlertViewTool showHUDAddedToView:self.view text:dic[@"errorMessage"]];
         }
@@ -134,17 +133,48 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
             [self.tableView.mj_footer endRefreshing];
         }
-        [self.tableView reloadData];
+        
         self->_isRefreshing = NO;
     } failure:^(NSError *error) {
+        NSData *data = [[NSUserDefaults standardUserDefaults] objectForKey:@"liveList"];
+        if (data && self.pageNo == 1) {
+            [self dealDictionaryListData:data];
+        }
         self->_isRefreshing = NO;
         [AlertViewTool hideHUDView];
         [AlertViewTool showHUDViewText:CustomStr(@"ServerBusy")];
+        [self.tableView.mj_header endRefreshing];
+        [self.tableView.mj_footer endRefreshing];
     }];
 }
+-(void)dealDictionaryListData:(NSData *)data{
+    NSDictionary *dic = [data mj_JSONObject];
+    if ([dic[@"programs"] isKindOfClass:[NSArray class]]) {
+        self->_newsArray = dic[@"programs"];
+        NSArray *lists = dic[@"programs"];
+        
+        if(self->_pageNo == 1&&lists.count > 0){
+            [self.data removeAllObjects];
+            
+        }
+        self->_pageNo++;
+
+        for (NSDictionary *dics in lists) {
+            [CNLiveModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{
+                return @{ @"ID" : @"id" ,@"Description" : @"description" };
+            }];
+            
+            NSLog(@"%@",dics);
+            [self.data addObject:[CNLiveModel mj_objectWithKeyValues:dics]];
+            
+        }
+        
+    }
+    [self.tableView reloadData];
+}
 - (void)loadYGData {
         NSString *strUrl = REQUESTURL(@"gxb/api/cataloglatest");
         //NSLog(@"%@",strUrl);
@@ -242,7 +272,11 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
     headerButton.layer.masksToBounds = true;
     [headerButton setImage:[UIImage imageNamed:@"cnlive_icon"] forState:UIControlStateNormal];
     [headerButton setTitle:@"直播" forState:UIControlStateNormal];
+    if (HOMETITLECOLORSTR) {
+        [headerButton setTitleColor:[UIColor colorWithHexString:HOMETITLECOLORSTR] forState:UIControlStateNormal];
+    }else{
     [headerButton setTitleColor:Color_Blue forState:UIControlStateNormal];
+    }
     headerButton.titleLabel.font = [UIFont systemFontOfSize:15];
     headerButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;//居左显示
@@ -471,7 +505,7 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
 }
 - (CNLiveHeaderView *)header{
     if(!_header){
-        _header = [[CNLiveHeaderView alloc]initWithFrame:CGRectMake(0, 0, MainScreenWidth, 180)];
+        _header = [[CNLiveHeaderView alloc]initWithFrame:CGRectMake(0, 0, MainScreenWidth, MainScreenWidth*9 /16)];
         _header.backgroundColor = Color_Blue;
     }
     return _header;
@@ -55,14 +55,42 @@
 - (void)loadData {
     if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
+        [self setUpUIWithTag:1000 Height:0];
+        return;
+    }
+    
+    AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
+    manager.responseSerializer = [AFHTTPResponseSerializer serializer];
+    [manager POST:@"http://s.scio.gov.cn/ocms/.content/function_provider/arswitch1.json" parameters:nil headers:nil progress:NULL  success:^(NSURLSessionDataTask *task, id responseObject) {
+        NSLog(@"%@",responseObject);
+        NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:responseObject options:NSJSONReadingMutableContainers error:nil];
+        NSString *errorCode = dic[@"errorCode"];
+        
+        if ([errorCode isEqualToString:@"1"]) {
+            [self requestJsonData:dic[@"docId"]];
+        }
+       
+
+    } failure:^(NSURLSessionDataTask *task, NSError *error) {
+        NSLog(@"%@",error);
+        [self setUpUIWithTag:1000 Height:0];
+
+    }];
+    
+   
+}
+-(void)requestJsonData:(NSString *)docId
+{
+    if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
         [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
         return;
     }
     [AlertViewTool showHUDView];
     AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
     manager.responseSerializer = [AFHTTPResponseSerializer serializer];
-    [manager POST:tuwenzhibo parameters:nil headers:nil  progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
+    [manager POST:tuwen(docId.intValue) parameters:nil headers:nil  progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
           [AlertViewTool hideHUDView];
+        [self setUpUIWithTag:1000 Height:40.0];
           // 请求成功，解析数据
           NSString * jsonString = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding];
           NSArray *arr = [jsonString objectFromJSONString];
@@ -72,7 +100,7 @@
           } else {
               [self->_webView loadHTMLString:@"<html><body>   </body></html>" baseURL:nil];
           }
-
+        
     } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
           // 请求失败
@@ -82,7 +110,6 @@
     }];
 }
-
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     [[JGMusicManager shareMusicManager] playStop];
@@ -96,7 +123,6 @@
 - (void)viewWillDisappear:(BOOL)animated {
     [super viewWillDisappear:animated];
     [self.liveController stopShow];
-//    self.liveController = nil;
     [self.navigationController setNavigationBarHidden:NO];
 }
@@ -117,15 +143,6 @@
     backgroundView.bounces = NO;
     [self.view addSubview:backgroundView];
-    relatedWebView = [[WKWebView alloc] initWithFrame:CGRectZero];
-    relatedWebView.scrollView.backgroundColor = [UIColor whiteColor];
-//    relatedWebView.dataDetectorTypes = UIDataDetectorTypeNone;
-    relatedWebView.backgroundColor = [UIColor whiteColor];
-    relatedWebView.scrollView.bounces = NO;
-    relatedWebView.navigationDelegate = self;
-    relatedWebView.opaque = NO;
-    relatedWebView.tag = 1000;
-    [backgroundView addSubview:relatedWebView];
 //    NSString* htmlHeader = [[NSString alloc] initWithFormat:@"<html><font style=\"font-size:20px;\"><strong>%@</strong></font><br><p>%@</p><p>来源 : 国新网</p><body>",[_dictionary objectForKey:@"title"],[_dictionary objectForKey:@"liveStartDateTime"]];
 //    NSString* htmlFooter = [[NSString alloc] initWithFormat:@"<div class=\"logo\" style=\"text-indent:2em\">%@</div></body></html>",[_dictionary objectForKey:@"Description"]];
@@ -156,16 +173,6 @@
     NSString* strHtml = [[NSString alloc] initWithFormat:@"%@%@",htmlHeader,htmlFooter];
     [relatedWebView loadHTMLString:strHtml baseURL:nil];
-    _webView = [[WKWebView alloc] initWithFrame:CGRectZero];
-    _webView.scrollView.backgroundColor = [UIColor whiteColor];
-//    _webView.dataDetectorTypes = UIDataDetectorTypeNone;
-    _webView.backgroundColor = [UIColor whiteColor];
-    _webView.navigationDelegate = self;
-    _webView.opaque = NO;
-    _webView.tag = 2000;
-    _webView.hidden = YES;
-    [backgroundView addSubview:_webView];
-    
     if (!isPlay) {
         [self loadMovieView];
     } else {
@@ -329,44 +336,51 @@
             [relatedWebView setFrame:CGRectMake(0, 0, MainScreenWidth, descriptionHeight)];
         }];
     }
-    
-    if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
-        [self setUpUIWithTag:webView.tag Height:0];
-        return;
-    }
-    
-    AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
-    manager.responseSerializer = [AFHTTPResponseSerializer serializer];
-    [manager POST:@"http://s.scio.gov.cn/ocms/.content/function_provider/arswitch.json" parameters:nil headers:nil progress:NULL  success:^(NSURLSessionDataTask *task, id responseObject) {
-        NSLog(@"%@",responseObject);
-        NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:responseObject options:NSJSONReadingMutableContainers error:nil];
-        NSString *errorCode = dic[@"errorCode"];
-        [self setUpUIWithTag:webView.tag Height:[errorCode isEqualToString:@"1"]?40.0:0.0];
-
-    } failure:^(NSURLSessionDataTask *task, NSError *error) {
-        NSLog(@"%@",error);
-        [self setUpUIWithTag:webView.tag Height:0];
+    if (webView.tag==2000) {
+        CGFloat width = MainScreenWidth - 20;
+        NSString *string = [NSString stringWithFormat:
+                            @"var script = document.createElement('script');"
+                            "script.type = 'text/javascript';"
+                            "script.text = \"function ResizeImages() { "
+                            "var myimg,oldwidth;"
+                            "var maxwidth=%f;" //缩放系数
+                            "for(i=0;i <document.images.length;i++){"
+                            "myimg = document.images[i];"
+                            "if(myimg.width > maxwidth){"
+                            "oldwidth = myimg.width;"
+                            "myimg.width = maxwidth;"
+                            "myimg.height = myimg.height * (maxwidth/oldwidth);"
+                            "}"
+                            "}"
+                            "}\";"
+                            "document.getElementsByTagName('head')[0].appendChild(script);",width];
-    }];
-    
+        [webView evaluateJavaScript:string completionHandler:nil];
+        [webView evaluateJavaScript:@"ResizeImages();" completionHandler:nil];
+        
+        CGRect frame = webView.frame;
+        frame.size.width = MainScreenWidth;
+        frame.size.height = 1;
+        webView.frame = frame;
+        [webView evaluateJavaScript:@"document.body.scrollHeight"completionHandler:^(id _Nullable result,NSError * _Nullable error){
+            self->graphicLiveHeight = [result floatValue];
+            if (0 == [self->heightArr[self->fontIndex] floatValue]) {
+                [self->heightArr replaceObjectAtIndex:self->fontIndex withObject:[NSString stringWithFormat:@"%f",self->graphicLiveHeight]];
+            }
+            
+            if (self->isShow) {
+                NSLog(@"fontIndex = %d",self->fontIndex);
+                [self->backgroundView setContentSize:CGSizeMake(MainScreenWidth, 40 + self->descriptionHeight + [self->heightArr[self->fontIndex] floatValue] + 221)];
+                [webView setFrame:CGRectMake(0, 40 + self->descriptionHeight, MainScreenWidth, [self->heightArr[self->fontIndex] floatValue])];
+                [self showRelatedInformation:40 + self->descriptionHeight + [self->heightArr[self->fontIndex] floatValue]];
+            }
+        }];
+    }
+   
 }
 - (void)setUpUIWithTag:(NSInteger)tag Height:(NSInteger)height{
     if (1000 == tag) {
-        CGRect frame = relatedWebView.frame;
-        frame.size.width = MainScreenWidth;
-        frame.size.height = 1;
-        relatedWebView.frame = frame;
-//        descriptionHeight = relatedWebView.scrollView.contentSize.height;
-        [relatedWebView evaluateJavaScript:@"document.body.scrollHeight"completionHandler:^(id _Nullable result,NSError * _Nullable error){
-            NSLog(@"scrollHeight高度：%.2f",[result floatValue]);
-            descriptionHeight = [result floatValue];
-            dispatch_async(dispatch_get_main_queue(), ^{
-                [relatedWebView setFrame:CGRectMake(0, 0, MainScreenWidth, descriptionHeight)];
-                
-            });
-        }];
-//        [relatedWebView setFrame:CGRectMake(0, 0, MainScreenWidth, descriptionHeight)];
         lineImage1 = [[UIImageView alloc] initWithFrame:CGRectMake(0, descriptionHeight, MainScreenWidth, 1)];
         lineImage1.backgroundColor = Color_Line;
         [backgroundView addSubview:lineImage1];
@@ -418,58 +432,6 @@
         [self showRelatedInformation:height + descriptionHeight];
-    } else if (2000 == tag) {
-        CGFloat width = MainScreenWidth - 20;
-        NSString *string = [NSString stringWithFormat:
-                            @"var script = document.createElement('script');"
-                            "script.type = 'text/javascript';"
-                            "script.text = \"function ResizeImages() { "
-                            "var myimg,oldwidth;"
-                            "var maxwidth=%f;" //缩放系数
-                            "for(i=0;i <document.images.length;i++){"
-                            "myimg = document.images[i];"
-                            "if(myimg.width > maxwidth){"
-                            "oldwidth = myimg.width;"
-                            "myimg.width = maxwidth;"
-                            "myimg.height = myimg.height * (maxwidth/oldwidth);"
-                            "}"
-                            "}"
-                            "}\";"
-                            "document.getElementsByTagName('head')[0].appendChild(script);",width];
-        
-        [_webView evaluateJavaScript:string completionHandler:nil];
-        [_webView evaluateJavaScript:@"ResizeImages();" completionHandler:nil];
-        
-        CGRect frame = _webView.frame;
-        frame.size.width = MainScreenWidth;
-        frame.size.height = 1;
-        _webView.frame = frame;
-        [_webView evaluateJavaScript:@"document.body.scrollHeight"completionHandler:^(id _Nullable result,NSError * _Nullable error){
-            graphicLiveHeight = [result floatValue];
-            if (0 == [heightArr[fontIndex] floatValue]) {
-                [heightArr replaceObjectAtIndex:fontIndex withObject:[NSString stringWithFormat:@"%f",graphicLiveHeight]];
-            }
-            
-            if (isShow) {
-                NSLog(@"fontIndex = %d",fontIndex);
-                [backgroundView setContentSize:CGSizeMake(MainScreenWidth, 40 + descriptionHeight + [heightArr[fontIndex] floatValue] + 221)];
-                [_webView setFrame:CGRectMake(0, 40 + descriptionHeight, MainScreenWidth, [heightArr[fontIndex] floatValue])];
-                [self showRelatedInformation:40 + descriptionHeight + [heightArr[fontIndex] floatValue]];
-            }
-        }];
-        
-        NSLog(@"%@",NSStringFromCGRect(_webView.frame));
-        NSLog(@"%@",NSStringFromCGSize(_webView.scrollView.contentSize));
-//        if (0 == [heightArr[fontIndex] floatValue]) {
-//            [heightArr replaceObjectAtIndex:fontIndex withObject:[NSString stringWithFormat:@"%f",graphicLiveHeight]];
-//        }
-//
-//        if (isShow) {
-//            NSLog(@"fontIndex = %d",fontIndex);
-//            [backgroundView setContentSize:CGSizeMake(MainScreenWidth, 40 + descriptionHeight + [heightArr[fontIndex] floatValue] + 221)];
-//            [_webView setFrame:CGRectMake(0, 40 + descriptionHeight, MainScreenWidth, [heightArr[fontIndex] floatValue])];
-//            [self showRelatedInformation:40 + descriptionHeight + [heightArr[fontIndex] floatValue]];
-//        }
     }
 }
@@ -35,7 +35,7 @@
     NSLog(@"%@",josnParameters);
     NSDictionary *parameters = @{@"params":josnParameters
                                 };
-    NSString *urlStr = [NSString stringWithFormat:@"%@%@",FORECAST,@"programByContentId"];
+    NSString *urlStr = REQUESTURL(@"gxb/api/programByContentId");
     [manager POST:urlStr parameters:parameters headers:nil  progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, id responseObject) {
         [AlertViewTool hideHUDView];
         // 请求成功，解析数据
@@ -67,7 +67,7 @@
     NSLog(@"%@",josnParameters);
     NSDictionary *parameters = @{@"params":josnParameters
                                 };
-    NSString *urlStr = [NSString stringWithFormat:@"%@%@",FORECAST,@"programDetail"];
+    NSString *urlStr = REQUESTURL(@"gxb/api/programDetail");
     [manager POST:urlStr parameters:parameters headers:nil  progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, id responseObject) {
         [AlertViewTool hideHUDView];
         // 请求成功，解析数据
@@ -562,7 +562,7 @@
                       _newsArray = [NSArray arrayWithArray:array];
                       [self.tableView setFrame:CGRectMake( 0, 40 + relatedWebView.scrollView.contentSize.height, MainScreenWidth, 36 + 86*_newsArray.count)];
                   }
-                  [backgroundView setContentSize:CGSizeMake(MainScreenWidth, [heightArr[fontIndex] floatValue] + self.tableView.frame.size.height)];
+                  [backgroundView setContentSize:CGSizeMake(MainScreenWidth,40 + descriptionHeight + [heightArr[fontIndex] floatValue] + self.tableView.frame.size.height)];
                   [self.tableView reloadData];
               } else {
                   [AlertViewTool showHUDViewText:_dic[@"errorMessage"]];
@@ -677,10 +677,7 @@
     [super didReceiveMemoryWarning];
 }
 - (BOOL)shouldAutorotate {
-//    if (![[[NSUserDefaults standardUserDefaults] objectForKey:@"ZXVideoPlayer_DidPlayBack"] boolValue]) {
-//        return [[[NSUserDefaults standardUserDefaults] objectForKey:@"ZXVideoPlayer_DidPlayBack"] boolValue];
-//    }
-    return ![[[NSUserDefaults standardUserDefaults] objectForKey:@"ZXVideoPlayer_DidLockScreen"] boolValue];
+    return isPlay;
 }
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations {
     return UIInterfaceOrientationMaskAllButUpsideDown;
@@ -29,7 +29,6 @@
         _backgroundImage.contentMode = UIViewContentModeScaleAspectFill;
         _backgroundImage.layer.masksToBounds = YES;
         _backgroundImage.layer.cornerRadius = 2.0;
-        _backgroundImage.image = [UIImage imageNamed:@"cnlive_placeholder"];
         [self addSubview:_backgroundImage];
         _playImage = [UIButton buttonWithType:UIButtonTypeCustom];
@@ -44,8 +43,6 @@
         _stateLabel.textColor = [UIColor whiteColor];
         if ([[NSUserDefaults standardUserDefaults] boolForKey:ISGRAYMODE]) {
             _stateLabel.backgroundColor = [UIColor grayColor];
-        }else if (HOMETITLECOLORSTR){
-            _stateLabel.backgroundColor = [UIColor colorWithHexString:HOMETITLECOLORSTR];
         }else{
         _stateLabel.backgroundColor = [UIColor redColor];
         }
@@ -63,7 +60,7 @@
 }
 - (void)setModel:(CNLiveModel *)model{
     _model = model;
-    [_backgroundImage sd_setImageWithURL:[NSURL URLWithString:model.poster] placeholderImage:[UIImage imageNamed:@"cnlive_placeholder"]];
+    [_backgroundImage sd_setImageWithURL:[NSURL URLWithString:model.poster] placeholderImage:[UIImage imageNamed:@"placeholder"]];
     switch ([model.status intValue]) {
         case 0: {
             _stateLabel.text = @"直播准备";
@@ -137,8 +134,8 @@
     }];
     [_playImage mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.centerX.offset(self->_backgroundImage.centerX);
-        make.centerY.offset(self->_backgroundImage.centerY);
+        make.left.equalTo(self->_backgroundImage).offset(5);
+        make.bottom.equalTo(self->_backgroundImage).offset(-5);
         make.width.offset(40);
         make.height.offset(40);
@@ -88,8 +88,8 @@
     }];
     [_playImage mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(self->_picImage.mas_left).with.offset((80*MainScale*16/9.0-30)/2.0);
-        make.centerY.offset(self->_picImage.centerY);
+        make.left.equalTo(self->_picImage).offset(5);
+        make.bottom.equalTo(self->_picImage).offset(-5);
         make.width.offset(30);
         make.height.offset(30);
@@ -173,11 +173,9 @@ static const NSInteger margin = 34;
           }
           failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
-              // 请求失败
-              [self.tableView.mj_header endRefreshing];
-              NSLog(@"%@", [error localizedDescription]);
-              [AlertViewTool hideHUDView];
-              [AlertViewTool showHUDViewText:CustomStr(@"ServerBusy")];
+        [self.tableView.mj_header endRefreshing];
+        [AlertViewTool hideHUDView];
+        [self.tableView.mj_footer setState:MJRefreshStateIdle];
           }];
@@ -681,7 +679,7 @@ static const NSInteger margin = 34;
         [self.view addSubview:self.tableView];
         //设置下拉刷新
-        MJRefreshGifHeader *header = [MJRefreshGifHeader headerWithRefreshingTarget:self refreshingAction:@selector(loadVoice)];
+        MJRefreshGifHeader *header = [MJRefreshGifHeader headerWithRefreshingTarget:self refreshingAction:@selector(loadVoiceData)];
         [header setImages:refreshingImages forState:MJRefreshStateRefreshing];
         header.lastUpdatedTimeLabel.hidden = YES;
         header.stateLabel.hidden = YES;
@@ -708,7 +706,7 @@ static const NSInteger margin = 34;
         [self.view addSubview:self.enTableView];
         //设置下拉刷新
-        MJRefreshGifHeader *engHeader = [MJRefreshGifHeader headerWithRefreshingTarget:self refreshingAction:@selector(loadVOS)];
+        MJRefreshGifHeader *engHeader = [MJRefreshGifHeader headerWithRefreshingTarget:self refreshingAction:@selector(loadVOSData)];
         [engHeader setImages:refreshingImages forState:MJRefreshStateRefreshing];
         engHeader.lastUpdatedTimeLabel.hidden = YES;
         engHeader.stateLabel.hidden = YES;
@@ -20,7 +20,7 @@
 - (void)getData{
     NSMutableArray *controllers = [NSMutableArray array];
     NSArray *titles = @[CustomStr(@"PhoneNumberRegister"), CustomStr(@"EmailRegister")];
-    
+    NSArray *dTitles = @[titles,@[@"",@""]];
     for(int i = 0; i < titles.count; i++){
         if(i == 0){
@@ -33,7 +33,7 @@
     }
     if(controllers.count > 0){
-        self.segmentControl.titles = titles;
+        self.segmentControl.titles = dTitles;
         self.segmentControl.viewControllers = controllers;
     }
 }
@@ -135,7 +135,7 @@
 //提示
 "NetworkiInterruption" = "网络连接中断";
-"ServerBusy" = "服务器忙";
+"ServerBusy" = "网络异常";
 "PhoneNumberError" = "手机号错误";
 "EmailError" = "邮箱错误";
 "CodeError" = "验证码错误";
@@ -96,11 +96,11 @@
 }
 + (void)showHUDView{
-    [MBProgressHUD showHUDAddedTo:[self getCurrentVC].view animated:YES];
+    [MBProgressHUD showHUDAddedTo:AppKeyWindow animated:YES];
 }
 + (void)hideHUDView{
-    [MBProgressHUD hideHUDForView:[self getCurrentVC].view animated:YES];
+    [MBProgressHUD hideHUDForView:AppKeyWindow animated:YES];
 }
 + (UIViewController *)getCurrentVC{
@@ -34,8 +34,8 @@ static inline NSUInteger hexStrToInt(NSString *str) {
     return result;
 }
-static BOOL hexStrToRGBA(NSString *str,
-                         CGFloat *r, CGFloat *g, CGFloat *b, CGFloat *a) {
+static BOOL hexStrToARGB(NSString *str,
+                         CGFloat *a, CGFloat *r, CGFloat *g, CGFloat *b) {
     str = ({ // Trim blank characters (space and newline) in head and tail.
@@ -63,19 +63,23 @@ static BOOL hexStrToRGBA(NSString *str,
         *b = hexStrToInt([str substringWithRange:NSMakeRange(2, 1)]) / 255.0f;
         if (length == 4)  *a = hexStrToInt([str substringWithRange:NSMakeRange(3, 1)]) / 255.0f;
         else *a = 1;
-    } else {
+    }else if (length == 6){
         *r = hexStrToInt([str substringWithRange:NSMakeRange(0, 2)]) / 255.0f;
         *g = hexStrToInt([str substringWithRange:NSMakeRange(2, 2)]) / 255.0f;
         *b = hexStrToInt([str substringWithRange:NSMakeRange(4, 2)]) / 255.0f;
-        if (length == 8) *a = hexStrToInt([str substringWithRange:NSMakeRange(6, 2)]) / 255.0f;
-        else *a = 1;
+    }
+    else {
+        *a = hexStrToInt([str substringWithRange:NSMakeRange(0, 2)]) / 255.0f;
+        *r = hexStrToInt([str substringWithRange:NSMakeRange(2, 2)]) / 255.0f;
+        *g = hexStrToInt([str substringWithRange:NSMakeRange(4, 2)]) / 255.0f;
+        *b = hexStrToInt([str substringWithRange:NSMakeRange(6, 2)]) / 255.0f;
     }
     return YES;
 }
 + (instancetype)colorWithHexString:(NSString *)hexStr {
     CGFloat r, g, b, a;
-    if (hexStrToRGBA(hexStr, &r, &g, &b, &a)) {
+    if (hexStrToARGB(hexStr, &a, &r, &g, &b)) {
         return [UIColor colorWithRed:r green:g blue:b alpha:1];
     }
     return nil;
@@ -13,6 +13,9 @@
     const int RED = 1;
     const int GREEN = 2;
     const int BLUE = 3;
+    if (sourceImage.scale>2) {
+        return sourceImage;
+    }
     CGRect imageRect = CGRectMake(0, 0, sourceImage.size.width *sourceImage.scale, sourceImage.size.height *sourceImage.scale);
     int width = imageRect.size.width;
     int height = imageRect.size.height;
@@ -25,7 +25,7 @@
         /// 图片使用灰白处理
     BOOL gray = [[NSUserDefaults standardUserDefaults] boolForKey:ISGRAYMODE];
-    if (gray) {
+    if (gray&&[self isMemberOfClass:[UIImageView class]]) {
         image = [UIImage grayImage:image];
     }
     [self xmtSwizzledSetImage:image];
-//
-//  UILabel+CNGray.h
-//  CNLiveScioLive
-//
-//  Created by CNLive on 2021/5/12.
-//  Copyright © 2021 CNLive. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface UILabel (CNGray)
-
-@end
-
-NS_ASSUME_NONNULL_END
-//
-//  UILabel+CNGray.m
-//  CNLiveScioLive
-//
-//  Created by CNLive on 2021/5/12.
-//  Copyright © 2021 CNLive. All rights reserved.
-//
-
-#import "UILabel+CNGray.h"
-#import "UIColor+CNGray.h"
-#import "ZXWKitConst.h"
-
-@implementation UILabel (CNGray)
-+(void)load
-{
-    static dispatch_once_t onceToken;
-        dispatch_once(&onceToken, ^{
-            Method setImage = class_getInstanceMethod(self,@selector(setTextColor:));
-            Method xmtSwizzledSetImage = class_getInstanceMethod(self,@selector(cn_setTextColor:));
-            ///交换IMP
-            method_exchangeImplementations(setImage, xmtSwizzledSetImage);
-        });
-}
--(void)cn_setTextColor:(UIColor *)textColor{
-    if (HOMETITLECOLORSTR) {
-        if (![textColor isEqual:[UIColor whiteColor]]&&![textColor isEqual:segementColor_title_color]) {
-                textColor = [UIColor colorWithHexString:HOMETITLECOLORSTR];
-          
-        }
-    }
-    [self cn_setTextColor:textColor];
-}
-
-@end
@@ -28,6 +28,10 @@
  *  标题数组
  */
 @property (strong, nonatomic) NSArray * titles;
+/**
+ *选中标题颜色
+ */
+@property (strong, nonatomic) NSArray *textColors;
 /**
  *  控制器数组
@@ -90,7 +90,12 @@ typedef NS_ENUM(NSInteger, ScrollCtrlViewScrollStatus) {
             if ([subview isKindOfClass:[ZXWSegment class]]) {
                 ZXWSegment * segment = (ZXWSegment *)subview;
                 segment.titleNormalColor = self.titleNormalColor;
+                NSString *textColor = self.textColors[segment.tag - 1995];
+                if (textColor&&![textColor isEqualToString:@""]) {
+                    segment.titleSelectColor = [UIColor colorWithHexString:textColor];
+                }else{
                 segment.titleSelectColor = self.titleSelectColor;
+                }
                 segment.isTitleScale = self.isTitleScale;
             }
         }
@@ -204,18 +209,18 @@ typedef NS_ENUM(NSInteger, ScrollCtrlViewScrollStatus) {
 #pragma mark - Custom Accessors
 - (void)setTitles:(NSArray *)titles {
-    _titles = titles;
-    
+    _titles = titles[0];
+    _textColors = titles[1];
     // Item的宽度
     CGFloat itemW = 0.0;
     CGFloat itemX = 0.0;
-    for (int i = 0; i < titles.count; i ++) {
+    for (int i = 0; i < _titles.count; i ++) {
         // 判断是滑动还是静止标题栏
         if (self.isScrollTitle == YES) {
             // 滑动标题栏
             // 计算文本标签的Size
-            CGSize labelSize = [self sizeWithText:titles[i] font:segementTitleNormalFont maxSize:CGSizeMake(ZXWkScreen_width, self.height)];
+            CGSize labelSize = [self sizeWithText:_titles[i] font:segementTitleNormalFont maxSize:CGSizeMake(ZXWkScreen_width, self.height)];
             // 计算Item的宽度  Item的宽度 = 本标签的宽度 + 间距
             itemW = labelSize.width + ZXWSegementViewTitlePadding / 2;
             // 设置contentSize
@@ -225,17 +230,21 @@ typedef NS_ENUM(NSInteger, ScrollCtrlViewScrollStatus) {
             // 静止标题栏
             // Item的宽度
-            itemW = ZXWkScreen_width / titles.count;
+            itemW = ZXWkScreen_width / _titles.count;
             // Item的x值
             itemX = i * itemW;
             // 设置contentSize
             self.segementScrollView.contentSize = CGSizeMake(ZXWkScreen_width, 0);
         }
         ZXWSegment * segment = [[ZXWSegment alloc] initWithFrame:CGRectMake(itemX, 0, itemW, self.height)];
-        segment.title = titles[i];
+        segment.title = _titles[i];
         segment.titleNormalColor = self.titleNormalColor;
+        NSString *textColor = _textColors[i];
+        if (textColor&&![textColor isEqualToString:@""]) {
+            segment.titleSelectColor = [UIColor colorWithHexString:textColor];
+        }else{
         segment.titleSelectColor = self.titleSelectColor;
-        
+        }
         segment.titleSelectBold = YES;
         segment.tag = 1995 + i;
         [segment addTarget:self action:@selector(itemAction:) forControlEvents:UIControlEventTouchUpInside];