中英文推送

zhangxiaowen
1 parent 67bf26e2
Showing 11 changed files with 102 additions and 36 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
CNLiveScioLive/AppDelegate.m
CNLiveScioLive/Pages/Header/PrefixHeader.pch
CNLiveScioLive/Pages/Home/CNHomeBaseViewController.m
CNLiveScioLive/Pages/Home/CNHomeENViewController.m
CNLiveScioLive/Pages/Home/外宣要闻/Controller/CNLiveHeraldedNewsViewController.m
CNLiveScioLive/Pages/Home/外宣要闻/View/CNLiveNewsLeftPicTableViewCell.m
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldArticleDetailViewController.m
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldVideoDetailViewController.m
CNLiveScioLive/Pages/Home/答记者问/Controller/CNLiveReporterAskedViewController.m
CNLiveScioLive/Pages/My/设置/View/CNLiveSettingTableViewCell.m
@@ -1499,8 +1499,8 @@
 		08585DD7215B70DA00FC2CA2 /* JSONKit */ = {
 			isa = PBXGroup;
 			children = (
-				08585DD8215B70DA00FC2CA2 /* JSONKit.m */,
 				08585DD9215B70DA00FC2CA2 /* JSONKit.h */,
+				08585DD8215B70DA00FC2CA2 /* JSONKit.m */,
 			);
 			path = JSONKit;
 			sourceTree = "<group>";
@@ -27,6 +27,14 @@
 //    [AvoidCrash makeAllEffective];
     self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
     self.window.backgroundColor = [UIColor whiteColor];
+    
+    //推送
+    [self registerRemoteNotification];
+    [self registerNotification:launchOptions];
+    
+    //版本更新
+    [self checkAppUpdate];
+
     //收藏
     [[DBAction sharedDBAction] createTable];
@@ -37,10 +45,6 @@
     //语言
     [self setApplicationLanguage];
-    
-    //推送
-    [self registerRemoteNotification];
-    [self registerNotification:launchOptions];
     [self initializeSDKConfiguration];
@@ -65,7 +69,7 @@
     }
     [self.window makeKeyAndVisible];
-
+    
     return YES;
 }
 //语言
@@ -117,7 +121,7 @@
 - (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.
-    _isPush = NO;
+    self.isPush = NO;
 }
@@ -125,8 +129,8 @@
 - (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.
-    if (_isPush) {
-        if([self.window.rootViewController isKindOfClass:[UITabBarController class]]){
+    if (self.isPush) {
+        if([self.window.rootViewController isKindOfClass:[XLSlideMenu class]]){
             XLSlideMenu *menu = (XLSlideMenu *)self.window.rootViewController;
             CNLiveTabBarController *tabVC = (CNLiveTabBarController *)menu.rootViewController;
@@ -137,17 +141,29 @@
             }else{
                 //1选中答记者问或者国新视界
                 tabVC.selectedIndex = 0;
-                
                 //2请求跳转
                 [self getDataById:_type];
             }
+        }else if([self.window.rootViewController isKindOfClass:[UITabBarController class]]){
+            CNLiveENTabBarController *tabVC = (CNLiveENTabBarController *)self.window.rootViewController;
+            //直播
+            if([self.type isEqualToString:@"1"]){
+                tabVC.selectedIndex = 1;
+                
+            }else{
+                //1选中答记者问或者国新视界
+                tabVC.selectedIndex = 0;
+                
+                //2请求跳转
+                [self getDataById:_type];
+            }
         }
     }
 }
 - (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error {
     NSLog(@"[XGDemo] register APNS fail.\n[XGDemo] reason : %@", error);
-    [[NSNotificationCenter defaultCenter] postNotificationName:@"registerDeviceFailed" object:nil];
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"RegisterDeviceFailed" object:nil];
 }
 -(void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo{
@@ -270,11 +286,15 @@
                                                                         error:&err];
               NSDictionary *dic = dicData[@"program"];
               if(dic){
-                  if([self.window.rootViewController isKindOfClass:[UITabBarController class]] && self.window.rootViewController.childViewControllers.count > 0){
-                      UINavigationController *nav = self.window.rootViewController.childViewControllers[0];
+                  XLSlideMenu *menu = (XLSlideMenu *)self.window.rootViewController;
+                  CNLiveTabBarController *tabVC = (CNLiveTabBarController *)menu.rootViewController;
+                  
+                  if([self.window.rootViewController isKindOfClass:[XLSlideMenu class]] && tabVC.childViewControllers.count > 0){
+                      UINavigationController *nav = tabVC.childViewControllers[0];
                       //判断推送消息是中文还是英文(初始化sdk配置)
                       [self initializeSDKConfigurationByLanguage:YES];
+                      
                       //视频
                       if([@"program" isEqualToString:dic[@"type"]]){
                           OldVideoDetailViewController *vc = [[OldVideoDetailViewController alloc] initWithDictionary:dic];
@@ -346,7 +366,7 @@
 // App 用户选择通知中的行为
 // App 用户在通知中心清除消息
 // 无论本地推送还是远程推送都会走这个回调
-- (void)xgPushUserNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void (^)(void))completionHandler {
+- (void)xgPushUserNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void (^)(void))completionHandler  API_AVAILABLE(ios(10.0)){
     //当APP在前台运行时，不做处理
     if( [UIApplication sharedApplication].applicationState == UIApplicationStateActive){
@@ -367,15 +387,23 @@
         NSLog(@"click from Action2");
     }
-    [[XGPush defaultManager] reportXGNotificationResponse:response];
+    if (@available(iOS 10.0, *)) {
+        [[XGPush defaultManager] reportXGNotificationResponse:response];
+    } else {
+        // Fallback on earlier versions
+    }
     completionHandler();
 }
 // App 在前台弹通知需要调用这个接口
-- (void)xgPushUserNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(UNNotificationPresentationOptions))completionHandler {
+- (void)xgPushUserNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(UNNotificationPresentationOptions))completionHandler  API_AVAILABLE(ios(10.0)){
     [[XGPush defaultManager] reportXGNotificationInfo:notification.request.content.userInfo];
-    completionHandler(UNNotificationPresentationOptionBadge | UNNotificationPresentationOptionSound | UNNotificationPresentationOptionAlert);
+    if (@available(iOS 10.0, *)) {
+        completionHandler(UNNotificationPresentationOptionBadge | UNNotificationPresentationOptionSound | UNNotificationPresentationOptionAlert);
+    } else {
+        // Fallback on earlier versions
+    }
 }
 #endif
 #pragma mark - XGPushDelegate
@@ -397,6 +425,7 @@
     NSLog(@"token:%@",deviceToken);
     NSLog(@"%s, result %@, error %@", __FUNCTION__, error?@"NO":@"OK", error);
 }
+#pragma mark - SDK Configuration
 - (void)initializeSDKConfiguration{
     //注册APP
     [CNLiveStat registerApp:CNLiveAppId appKey:CNLiveAppKey];
@@ -438,5 +467,32 @@
     }
 }
+#pragma mark - 版本更新
+- (void)checkAppUpdate{
+    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:@"版本更新"
+                                                        message:[results objectForKey:@"releaseNotes"]
+                                                       delegate:self
+                                              cancelButtonTitle:@"取消"
+                                              otherButtonTitles:@"更新",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];
+    }
+}
 @end
@@ -78,6 +78,7 @@
 #import "WXApi.h"
 #import "MobClick.h"
 #import "Reachability.h"
+#import "JSONKit.h"
 //Category
 #import "UIView+Extension.h"
@@ -134,7 +134,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
     }
     else if([model.showType isEqualToString:@"1"]){
         if(model.img && ![model.img isEqualToString:@""]){
-            return 120;//一张图 左边
+            return 80*MainScale+20;//一张图 左边
         }
         return 80;//无图
     }
@@ -144,7 +144,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
     }
     else if([model.showType isEqualToString:@"3"]){
         if(model.img && ![model.img isEqualToString:@""]){
-            return 120;//一张图 左边
+            return 80*MainScale+20;//一张图 左边
         }
         return 80;//无图
@@ -142,7 +142,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
     }
     else if([model.showType isEqualToString:@"1"]){
         if(model.img && ![model.img isEqualToString:@""]){
-            return 120;//一张图 左边
+            return 80*MainScale+20;//一张图 左边
         }
         return 80;//无图
     }
@@ -152,7 +152,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
     }
     else if([model.showType isEqualToString:@"3"]){
         if(model.img && ![model.img isEqualToString:@""]){
-            return 120;//一张图 左边
+            return 80*MainScale+20;//一张图 左边
         }
         return 80;//无图
@@ -167,7 +167,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
     }
     else if([model.showType isEqualToString:@"1"]){
         if(model.img && ![model.img isEqualToString:@""]){
-            return 120;//一张图 左边
+            return 80*MainScale+20;//一张图 左边
         }
         return 80;//无图
     }
@@ -178,7 +178,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
     }
     else if([model.showType isEqualToString:@"3"]){
         if(model.img && ![model.img isEqualToString:@""]){
-            return 120;//一张图 左边
+            return 80*MainScale+20;//一张图 左边
         }
         return 80;//无图
@@ -403,6 +403,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
         _cycleScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill;
         _cycleScrollView.titleLabelTextColor = [UIColor whiteColor];
         _cycleScrollView.titleLabelBackgroundColor = [UIColor clearColor];
+        _cycleScrollView.titleLabelTextAlignment = NSTextAlignmentLeft;
         _cycleScrollView.delegate = self;
     }
     return _cycleScrollView;
@@ -48,7 +48,7 @@
         [self.contentView addSubview:_playImage];
         _titleLabel = [[UILabel alloc] init];
-        _titleLabel.numberOfLines = 0;
+        _titleLabel.numberOfLines = 2;
         _titleLabel.lineBreakMode = NSLineBreakByTruncatingTail;
         _titleLabel.textColor = HEXCOLOR(0x333333);
         _titleLabel.font = [UIFont systemFontOfSize:16];
@@ -101,9 +101,9 @@
     [_picImage mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self->_backgroundImage.mas_left).with.offset(5);
         make.top.equalTo(self->_backgroundImage.mas_top).with.offset(5);
-        make.width.offset(120);
         make.bottom.equalTo(self->_backgroundImage.mas_bottom).with.offset(-5);
-        
+        make.width.offset((self->_backgroundImage.height-10)*16.0/9.0);
+
     }];
     [_titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -120,7 +120,7 @@
     }];
     if ([_model.type isEqualToString:@"program"]) {
         _playImage.hidden = NO;
-        _playImage.frame = CGRectMake(10+5+(120-30)/2.0, (self.contentView.height-30)/2.0, 30, 30);
+        _playImage.frame = CGRectMake(10+5+((self->_backgroundImage.height-10)*16.0/9.0-30*MainScale)/2.0, (self.contentView.height-30*MainScale)/2.0, 30*MainScale, 30*MainScale);
     } else if ([_model.type isEqualToString:@"subject"]) {
         _playImage.hidden = YES;
@@ -120,6 +120,10 @@
     self.navigationItem.title = _dictionary[@"cmsColumnName"];
 }
+- (void)viewDidDisappear:(BOOL)animated{
+    [(AppDelegate *)[UIApplication sharedApplication].delegate initializeSDKConfiguration];
+    
+}
 - (void)goBack{
     [(AppDelegate *)[UIApplication sharedApplication].delegate initializeSDKConfiguration];
     [self.navigationController popViewControllerAnimated:YES];
@@ -341,7 +341,10 @@
     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];
@@ -138,7 +138,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
     }
     else if([model.showType isEqualToString:@"1"]){
         if(model.img && ![model.img isEqualToString:@""]){
-            return 120;//一张图 左边
+            return 80*MainScale+20;//一张图 左边
         }
         return 80;//无图
     }
@@ -148,7 +148,7 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
     }
     else if([model.showType isEqualToString:@"3"]){
         if(model.img && ![model.img isEqualToString:@""]){
-            return 120;//一张图 左边
+            return 80*MainScale+20;//一张图 左边
         }
         return 80;//无图
@@ -70,13 +70,14 @@ static const NSInteger margin = 10;
     }];
-    [_line mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(self.contentView.mas_left).with.offset(0);
-        make.right.equalTo(self.contentView.mas_right).with.offset(0);
-        make.bottom.equalTo(self.contentView.mas_bottom).with.offset(-0.5);
-        make.height.offset(0.5);
-
-    }];
+//    [_line mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.left.equalTo(self.contentView.mas_left).with.offset(0);
+//        make.right.equalTo(self.contentView.mas_right).with.offset(0);
+//        make.bottom.equalTo(self.contentView.mas_bottom).with.offset(-0.5);
+//        make.height.offset(0.5);
+//
+//    }];
+    _line.frame = CGRectMake(0, self.contentView.height-0.5, MainScreenWidth, 0.5);
 }