no message

zhangxiaowen
1 parent 192a2bef
Showing 14 changed files with 80 additions and 51 deletions
CNLiveScioLive/Pages/Base/CNLiveBaseNavigationController.m
CNLiveScioLive/Pages/Base/CNLiveBaseViewController.m
CNLiveScioLive/Pages/Base/CNLiveENTabBarController.m
CNLiveScioLive/Pages/Base/CNLiveTabBarController.m
CNLiveScioLive/Pages/Home/CNHomeBaseViewController.m
CNLiveScioLive/Pages/Home/CNHomeViewController.m
CNLiveScioLive/Pages/Home/外宣要闻/View/CNLiveNewsLeftPicTableViewCell.m
CNLiveScioLive/Pages/Home/外宣要闻/View/CNLiveNewsUpPicTableViewCell.m
CNLiveScioLive/Pages/Home/新闻详情/OldController/BaseViewController.h
CNLiveScioLive/Pages/Home/新闻详情/OldController/BaseViewController.m
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldVideoDetailViewController.m
CNLiveScioLive/Pages/Home/答记者问/Controller/CNLiveReporterAskedViewController.m
CNLiveScioLive/Pages/Live/Controller/GraphicLiveViewController.m
CNLiveScioLive/Pages/Tools/CNLivePlayer/CNLivePlayerController.m
@@ -13,7 +13,6 @@
 @end
 @implementation CNLiveBaseNavigationController
-
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
@@ -64,4 +63,18 @@
     return self.childViewControllers.count > 1;
 }
+
+- (BOOL)shouldAutorotate {
+    return self.topViewController.shouldAutorotate;
+    
+}
+
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
+    return self.topViewController.supportedInterfaceOrientations;
+}
+
+- (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation {
+    return self.topViewController.preferredInterfaceOrientationForPresentation;
+}
+
 @end
@@ -28,7 +28,7 @@
     [self setUpNavigationBar];
     self.view.backgroundColor = [UIColor whiteColor];
-    [self.navigationController setNavigationBarHidden:NO];
+//    [self.navigationController setNavigationBarHidden:NO];
 }
@@ -179,9 +179,11 @@
 - (BOOL)shouldAutorotate {
     return NO;
+    
 }
+
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations {
     return UIInterfaceOrientationMaskPortrait;
+    
 }
-
 @end
@@ -118,4 +118,13 @@
     // Dispose of any resources that can be recreated.
 }
+- (BOOL)shouldAutorotate{
+    return self.selectedViewController.shouldAutorotate;
+}
+
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations{
+    return [self.selectedViewController supportedInterfaceOrientations];
+
+}
+
 @end
@@ -128,5 +128,13 @@
     // Pass the selected object to the new view controller.
 }
 */
+- (BOOL)shouldAutorotate{
+    return self.selectedViewController.shouldAutorotate;
+}
+
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations{
+    return [self.selectedViewController supportedInterfaceOrientations];
+    
+}
 @end
@@ -370,4 +370,5 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
     return _data;
 }
+
 @end
@@ -219,4 +219,5 @@
     }
     return _data;
 }
+
 @end
@@ -123,7 +123,12 @@
         _playImage.hidden = NO;
         _playImage.frame = CGRectMake(10+5+((80*MainScale)*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"]) {
+    }
+    else if ([_model.type isEqualToString:@"subject"]) {
+        _playImage.hidden = YES;
+        
+    }
+    else if ([_model.type isEqualToString:@"article"]) {
         _playImage.hidden = YES;
     }
@@ -130,14 +130,16 @@
         }];
-    } else if ([_model.type isEqualToString:@"subject"]) {
+    }
+    else if ([_model.type isEqualToString:@"subject"]) {
         _playImage.hidden = YES;
-//        [_projectLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-//            make.right.equalTo(self->_backgroundImage.mas_right).with.offset(-10);
-//            make.bottom.equalTo(self->_backgroundImage.mas_bottom).with.offset(-10);
-//        }];
     }
+    else if ([_model.type isEqualToString:@"article"]) {
+        _playImage.hidden = YES;
+        
+    }
+    
     [_projectLabel mas_updateConstraints:^(MASConstraintMaker *make) {
         make.right.equalTo(self->_backgroundImage.mas_right).with.offset(-10);
         make.bottom.equalTo(self->_backgroundImage.mas_bottom).with.offset(-5);
@@ -8,4 +8,5 @@
 #import <UIKit/UIKit.h>
 @interface BaseViewController : UIViewController
-@end
 \ No newline at end of file
+
+@end
@@ -16,10 +16,13 @@
     [[UIApplication sharedApplication] setStatusBarOrientation:UIInterfaceOrientationPortrait];
 }
+
 - (BOOL)shouldAutorotate {
     return NO;
 }
+
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations {
     return UIInterfaceOrientationMaskPortrait;
 }
+
 @end
@@ -66,31 +66,9 @@
     NSString* strHtml = [[NSString alloc] initWithFormat:@"%@%@%@%@%@",htmlHeader,htmldate,htmlForm,htmlBody,htmlFooter];
     return strHtml;
 }
-//- (void)setNaviation{
-//    [self.navigationController.navigationBar setBarTintColor:HEXCOLOR(0x195ac9)];
-//    [self.navigationController.navigationBar setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:[UIFont systemFontOfSize:20],NSFontAttributeName,[UIColor whiteColor],NSForegroundColorAttributeName,nil]];
-//    UIButton *leftButton = [UIButton buttonWithType:UIButtonTypeCustom];
-//    [leftButton addTarget:self action:@selector(Pop:) forControlEvents:UIControlEventTouchUpInside];
-//    [leftButton setImage:[UIImage imageNamed:@"cnlive_white_back"] forState:UIControlStateNormal];
-//    [leftButton setFrame:CGRectMake(0, 0, 44, 44)];
-//    self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:leftButton];
-//    self.navigationItem.hidesBackButton = YES;
-//    self.navigationItem.backBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStylePlain target:nil action:nil];
-//}
+
 #pragma mark - UI
-//- (void)setUpNavigationBar{
-//    self.navigationController.navigationBar.barTintColor = Color_Blue;
-//    self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName:[UIColor whiteColor], NSFontAttributeName:[UIFont systemFontOfSize:18]};
-//    //左
-//    UIButton *headerButton = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 20, 20)];
-//    headerButton.layer.cornerRadius = 2.0;
-//    headerButton.layer.masksToBounds = true;
-//    [headerButton setImage:[UIImage imageNamed:@"cnlive_white_back"] forState:UIControlStateNormal];
-//    [headerButton addTarget:self action:@selector(goBack) forControlEvents:UIControlEventTouchUpInside];
-//    self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:headerButton];
-//    self.navigationItem.title = _dictionary[@"cmsColumnName"];
-//
-//}
+
 - (void)loadShareView {
     UIImageView *lineImage = [[UIImageView alloc] init];
     if (iPhoneX) {
@@ -246,6 +224,7 @@
     [[AVAudioSession sharedInstance] setCategory: AVAudioSessionCategoryPlayback error: &error];
     [[AVAudioSession sharedInstance] setActive:YES error:nil];
 }
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     [self loadShareView];
@@ -325,7 +304,7 @@
         } authFailed:^(NSDictionary *errorInfo) {
             NSLog(@"初始化点播播放器失败%@", errorInfo);
         }];
-        
+
         [[NSUserDefaults standardUserDefaults] setObject:@0 forKey:@"ZXVideoPlayer_DidLockScreen"];
         __weak typeof(self) weakSelf = self;
         self.liveController.videoPlayerGoBackBlock = ^{
@@ -486,14 +465,14 @@
               if ([_dic[@"errorCode"] isEqualToString:@"0"]) {
                   NSArray *array = _dic[@"programs"];
                   if (0 != [array count]) {
-                      _newsArray = [NSArray arrayWithArray:array];
-                      [self.tableView setFrame:CGRectMake(0, [heightArr[fontIndex] floatValue], MainScreenWidth, 36 + 86*_newsArray.count)];
+                      self->_newsArray = [NSArray arrayWithArray:array];
+                      [self.tableView setFrame:CGRectMake(0, [self->heightArr[self->fontIndex] floatValue], MainScreenWidth, 36 + 86*self->_newsArray.count)];
                   } else {
                       //                      [self.errorLabe setFrame:CGRectMake(12, [heightArr[fontIndex] floatValue], MainScreenWidth - 24, 20)];
                       //                      self.errorLabe.hidden = NO;
                   }
                   NSLog(@"%@",NSStringFromCGRect(self.tableView.frame));
-                  [backgroundView setContentSize:CGSizeMake(MainScreenWidth, [heightArr[fontIndex] floatValue] + self.tableView.frame.size.height)];
+                  [self->backgroundView setContentSize:CGSizeMake(MainScreenWidth, [heightArr[self->fontIndex] floatValue] + self.tableView.frame.size.height)];
                   [self.tableView reloadData];
               } else {
                   [AlertViewTool showHUDViewText:_dic[@"errorMessage"]];
@@ -603,14 +582,19 @@
     if ([cell respondsToSelector:@selector(setLayoutMargins:)])
         [cell setLayoutMargins:UIEdgeInsetsZero];
 }
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
 }
+
 - (BOOL)shouldAutorotate {
     return ![[[NSUserDefaults standardUserDefaults] objectForKey:@"ZXVideoPlayer_DidLockScreen"] boolValue];
+    
 }
+
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations {
     return UIInterfaceOrientationMaskAllButUpsideDown;
+    
 }
 @end
@@ -391,4 +391,5 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
     }
     return _data;
 }
+
 @end
@@ -251,7 +251,6 @@
 - (void)webViewDidFinishLoad:(UIWebView *)webView{
     if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
-        [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
         [self setUpUIWithTag:webView.tag Height:0];
         return;
     }