no message

zhangxiaowen
1 parent c0419aa5
Showing 6 changed files with 42 additions and 15 deletions
CNLiveScioLive/Pages/Live/Controller/CNLiveViewController.m
CNLiveScioLive/Pages/Live/Controller/GraphicLiveViewController.h
CNLiveScioLive/Pages/Live/Controller/GraphicLiveViewController.m
CNLiveScioLive/Pages/Live/Controller/VideoPlayBackViewController.m
CNLiveScioLive/Pages/Live/Model/CNLiveModel.h
CNLiveScioLive/Pages/Live/View/CNLiveTableViewCell.m
@@ -173,6 +173,8 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
     self.navigationController.navigationBar.barTintColor = [UIColor whiteColor];
     self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName:[UIColor whiteColor], NSFontAttributeName:[UIFont systemFontOfSize:18]};
+    [self.navigationController setNavigationBarHidden:NO];
+
 }
 - (void)viewDidLoad {
@@ -54,5 +54,7 @@ typedef NS_ENUM(NSInteger, PlayerType) {
 @property (nonatomic, assign) PlayerType type;
 @property (nonatomic, strong) NSArray *relatedArray;
--(id)initWithDictionary:(NSDictionary*)dictionary;
+
+- (id)initWithDictionary:(NSDictionary*)dictionary;
+
 @end
@@ -16,7 +16,8 @@
     [self.videoController stop];
     [self.navigationController popViewControllerAnimated:YES];
 }
-- (id)initWithDictionary:(NSDictionary*)dictionary {
+
+- (id)initWithDictionary:(NSDictionary *)dictionary {
     if (self = [super init]) {
         _dictionary = [NSDictionary dictionaryWithDictionary:dictionary];
         int status = [_dictionary[@"status"] intValue];
@@ -44,12 +45,14 @@
     }
     return self;
 }
+
 - (NSString *)setHTMLString {
     NSString* htmlBody = [[NSString alloc] initWithFormat:@"<p><font style=\"font-size:%@px;\">%@</font></p>",fontArray[fontIndex],[_dic objectForKey:@"Content"]];
     NSString* htmlFooter = @"</body></html>";
     NSString* strHtml = [[NSString alloc] initWithFormat:@"%@%@",htmlBody,htmlFooter];
     return strHtml;
 }
+
 - (void)loadData {
     if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
         [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
@@ -89,12 +92,14 @@
     [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryAmbient error: &error];
     [[AVAudioSession sharedInstance] setActive:YES error:nil];
 }
+
 - (void)viewWillDisappear:(BOOL)animated {
     [super viewWillDisappear:animated];
     [self.liveController stop];
     self.liveController = nil;
     [self.navigationController setNavigationBarHidden:NO];
 }
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     self.view.backgroundColor = [UIColor whiteColor];
@@ -168,7 +173,8 @@
 - (void)loadMovieView {
     [[NSUserDefaults standardUserDefaults] setObject:@0 forKey:@"GraphicLive_DidLockScreen"];
     imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, iPhoneX ? 44 : 0, MainScreenWidth, videoHeight)];
-    imageView.image = [UIImage imageNamed:@"cnlive_placeholder"];
+//    imageView.image = [UIImage imageNamed:@"cnlive_placeholder"];
+    [imageView sd_setImageWithURL:[NSURL URLWithString:_dictionary[@"poster"]] placeholderImage:[UIImage imageNamed:@"cnlive_placeholder"]];
     [self.view addSubview:imageView];
     UIButton *backButton = [UIButton buttonWithType:UIButtonTypeCustom];
@@ -23,25 +23,35 @@
     [self.videoController stop];
     [self.navigationController popToRootViewControllerAnimated:YES];
 }
--(id)initWithDictionary:(NSDictionary*)dictionary{
+- (id)initWithDictionary:(NSDictionary*)dictionary{
     if (self = [super init]) {
         _dictionary = [NSDictionary dictionaryWithDictionary:dictionary];
-        if (![_dictionary[@"videoUrl"] isEqualToString:@""]) {
-            isPlay = YES;
-            url = _dictionary[@"videoUrl"];
-            if (0 == [url length]) {
-                url = _dictionary[@"uploadVideoUrl"];
+        if ([_dictionary[@"videoFlag"] isEqualToString:@"1"]) {
+            if (![_dictionary[@"videoUrl"] isEqualToString:@""]) {
+                isPlay = YES;
+                url = _dictionary[@"videoUrl"];
+                if (0 == [url length]) {
+                    url = _dictionary[@"uploadVideoUrl"];
+                }
+                url = [url stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+                movieUrl = [NSURL URLWithString:url];
+                
+            } else {
+                isPlay = NO;
             }
-            url = [url stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
-            movieUrl = [NSURL URLWithString:url];
+            
         } else {
             isPlay = NO;
+            
         }
+        
         NSLog(@"movieUrl -> %@",movieUrl);
         videoHeight = MainScreenWidth * (9.0 / 16.0);
+
     }
     return self;
 }
+
 - (NSString *)setHTMLString {
 //    NSString* htmlHeader = [[NSString alloc] initWithFormat:@"<html><p><font style=\"font-size:20px;\"><strong>%@</strong></font><br>%@</p><body>",[_dicArticle objectForKey:@"Tittle"],[_dicArticle objectForKey:@"PublishDateTime"]];
     NSString* htmlBody = [[NSString alloc] initWithFormat:@"<p><font style=\"font-size:%@px;\">%@</font></p>",fontArray[fontIndex],[_dicArticle objectForKey:@"Content"]];
@@ -126,6 +136,7 @@
     [shareButton addTarget:self action:@selector(shareButtonTaped:) forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:shareButton];
     [shareButton setTag:30000];
+    
 }
 - (void)shareButtonTaped:(id)sender {
     UIButton *btn = (UIButton *)sender;
@@ -297,13 +308,13 @@
 - (void)loadMovieView {
     [[NSUserDefaults standardUserDefaults] setObject:@0 forKey:@"GraphicLive_DidLockScreen"];
     imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, iPhoneX ? 44 : 0, MainScreenWidth, videoHeight)];
-    imageView.image = [UIImage imageNamed:@"backDefault1"];
+    [imageView sd_setImageWithURL:[NSURL URLWithString:_dictionary[@"poster"]] placeholderImage:[UIImage imageNamed:@"cnlive_placeholder"]];
     [self.view addSubview:imageView];
     UIButton *backButton = [UIButton buttonWithType:UIButtonTypeCustom];
     [backButton addTarget:self action:@selector(Pop:) forControlEvents:UIControlEventTouchUpInside];
-    [backButton setImage:[UIImage imageNamed:@"navigationBack"] forState:UIControlStateNormal];
-    [backButton setFrame:CGRectMake(0, 20, 44, 44)];
+    [backButton setImage:[UIImage imageNamed:@"cnlive_white_back"] forState:UIControlStateNormal];
+    [backButton setFrame:CGRectMake(0, StatusBarHeight, 44, 44)];
     [self.view addSubview:backButton];
 }
@@ -18,6 +18,12 @@
 @property (nonatomic, copy) NSString *img;
 @property (nonatomic, copy) NSString *selectedImage;
 @property (nonatomic, copy) NSString *createDate;
+@property (nonatomic, copy) NSString *liveShow;//liveShow 展示标识 0:APP不展示 1:展示
+
+
+@property (nonatomic, copy) NSString *liveFlag;//liveFlag 直播标识 0：视频直播 1：图文直播
+
+@property (nonatomic, copy) NSString *videoFlag;//videoFlag 0 图文回放 1视频回放
 /*
@@ -39,7 +45,6 @@
  }
  */
-@property (nonatomic, copy) NSString *liveFlag;
 @property (nonatomic, copy) NSString *activityId;
 @property (nonatomic, copy) NSString *playbackId;
 @property (nonatomic, copy) NSString *checkinfo;
@@ -67,6 +67,7 @@
     _titleLabel.text = model.title;
     _timeLabel.text = model.createDate;
     [_picImage sd_setImageWithURL:[NSURL URLWithString:model.img] placeholderImage:[UIImage imageNamed:@"placeholder"]];
+    _playImage.hidden = [model.videoFlag isEqualToString:@"0"];
     [self layoutSubviews];
 }