直播流及时更新

yanglingyu
1 parent 4de6d3e9
Showing 3 changed files with 74 additions and 41 deletions
CNLiveScioLive/Pages/Live/Controller/CNLiveViewController.m
CNLiveScioLive/Pages/Live/Controller/GraphicLiveViewController.h
CNLiveScioLive/Pages/Live/Controller/GraphicLiveViewController.m
@@ -59,7 +59,6 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
         NSData *data = [dic mj_JSONData];
         [[NSUserDefaults standardUserDefaults] setObject:data forKey:@"LiveHeader"];
         [self dealDictionaryData:data];
-//        self->_isLoaded = YES;
  
     } failure:^(NSError *error) {
         [MBProgressHUD hideHUDForView:self.view animated:YES];
@@ -202,9 +201,7 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
         _isRefreshing = YES;
         [self loadYGData];
         [self loadData];
-        if(!_isLoaded){
-            [self getData];
-        }
+        [self getData];
     }
 }
 - (void)loadMoreData{
@@ -212,8 +209,6 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
         _isRefreshing = YES;
         [self loadData];
     }
-//    [self.tableView.mj_footer endRefreshing];
-//    [AlertViewTool showHUDViewText:@"查看往期发布会回放,请点击搜索按钮" block:nil duration:1.5];
  
 }
 - (void)viewWillAppear:(BOOL)animated{
@@ -239,7 +234,6 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
  
     _pageNo = 1;
     _isRefreshing = NO;
-    _isLoaded = NO;
     [self loadData];
     [self loadYGData];
     [self.view addSubview:self.tableView];
@@ -255,6 +249,9 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
         GraphicLiveViewController *vc = [[GraphicLiveViewController alloc] initWithDictionary:dic];
         vc.relatedArray = [NSArray arrayWithArray:blockSelf->_newsArray];
         vc.hidesBottomBarWhenPushed = YES;
+        vc.reloadData = ^{
+            [weakSelf loadUpData];
+        };
         [weakSelf.navigationController pushViewController:vc animated:YES];
         return;
     };
@@ -423,6 +420,10 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
         GraphicLiveViewController *vc = [[GraphicLiveViewController alloc] initWithDictionary:dic];
         vc.relatedArray = [NSArray arrayWithArray:_newsArray];
         vc.hidesBottomBarWhenPushed = YES;
+        MJWeakSelf
+        vc.reloadData = ^{
+            [weakSelf loadUpData];
+        };
         [self.navigationController pushViewController:vc animated:YES];
         return;
  
@@ -18,6 +18,7 @@ typedef NS_ENUM(NSInteger, PlayerType) {
     PlayerTypeNormal // 普通URL模式
 };
  
+typedef void(^DataChanged)(void);
 @interface GraphicLiveViewController : CNLiveBaseViewController<WKNavigationDelegate>{
     UIScrollView *backgroundView;
     UIImageView *imageView;
@@ -54,6 +55,7 @@ typedef NS_ENUM(NSInteger, PlayerType) {
 @property (nonatomic, assign) PlayerType type;
  
 @property (nonatomic, strong) NSArray *relatedArray;
+@property (nonatomic, copy) DataChanged reloadData;
  
 - (id)initWithDictionary:(NSDictionary*)dictionary;
  
@@ -8,6 +8,7 @@
 #import "JSONKit.h"
 #import "GraphicLiveViewController.h"
 #import "VideoPlayBackViewController.h"
+#import "CNLiveModel.h"
  
 @interface GraphicLiveViewController ()<CNLivePlayerControllerDelegate>
 @end
@@ -16,32 +17,72 @@
     [self.videoController stop];
     [self.navigationController popViewControllerAnimated:YES];
 }
+- (void)getData{
+    [MBProgressHUD showHUDAddedTo:self.view animated:YES];
+    [XWHTTPTool POST:LiveUrl params:nil success:^(id json) {
  
+        [MBProgressHUD hideHUDForView:self.view animated:YES];
+        
+        // 请求成功，解析数据
+        NSDictionary *dic = [NSDictionary dictionaryWithDictionary:json];
+        [CNLiveModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{
+            return @{ @"ID" : @"id" ,@"Description" : @"description" };
+        }];
+        CNLiveModel *liveModel = [CNLiveModel mj_objectWithKeyValues:dic];
+        if (![self->_dictionary isEqualToDictionary:[liveModel toDictionary] ]) {
+            self->_dictionary = [liveModel toDictionary];
+            self.reloadData();
+            [self updateUIData];
+        }else{
+            [self updateUIData];
+        }
+        
+//        self->_isLoaded = YES;
+        
+    } failure:^(NSError *error) {
+        [MBProgressHUD hideHUDForView:self.view animated:YES];
+        [AlertViewTool showHUDAddedToView:self.view text:CustomStr(@"ServerBusy")];
+        [self updateUIData];
+    }];
+}
+
+-(void)updateUIData{
+    int status = [_dictionary[@"status"] intValue];
+    int liveFlag = [_dictionary[@"liveFlag"] intValue];
+    if (4 == status) {
+        if (_dictionary[@"playbackId"]) {
+            // 回放
+            isPlay = YES;
+            self.type = PlayerTypeVOD;
+        } else {
+            isPlay = NO;
+        }
+    } else if (1 == status) {
+        // 直播
+        url = _dictionary[@"liveUrl"];
+        if (0 == liveFlag) {
+            isPlay = YES;
+            self.type = PlayerTypeLiving;
+        } else {
+            isPlay = NO;
+            self.type = -1;
+        }
+    }
+    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"], CustomStr(@"Source"), @"国新网"];
+    NSString* htmlFooter = [[NSString alloc] initWithFormat:@"<div class=\"logo\" style=\"text-indent:2em\">%@</div></body></html>",[_dictionary objectForKey:@"Description"]];
+
+    NSString* strHtml = [[NSString alloc] initWithFormat:@"%@%@",htmlHeader,htmlFooter];
+    [relatedWebView loadHTMLString:strHtml baseURL:nil];
+    if (!isPlay) {
+        [self loadMovieView];
+    } else {
+        [self addCNLivePlayerWithURL];
+    }
+}
 - (id)initWithDictionary:(NSDictionary *)dictionary {
     if (self = [super init]) {
         _dictionary = [NSDictionary dictionaryWithDictionary:dictionary];
-        int status = [_dictionary[@"status"] intValue];
-        int liveFlag = [_dictionary[@"liveFlag"] intValue];
-        if (4 == status) {
-            if (_dictionary[@"playbackId"]) {
-                // 回放
-                isPlay = YES;
-                self.type = PlayerTypeVOD;
-            } else {
-                isPlay = NO;
-            }
-        } else if (1 == status) {
-            // 直播
-            url = _dictionary[@"liveUrl"];
-            if (0 == liveFlag) {
-                isPlay = YES;
-                self.type = PlayerTypeLiving;
-            } else {
-                isPlay = NO;
-                self.type = -1;
-            }
-        }
-        videoHeight = MainScreenWidth * (9.0 / 16.0);
+        [self getData];
     }
     return self;
 }
@@ -130,7 +171,7 @@
     fontIndex = (int)[[NSUserDefaults standardUserDefaults] integerForKey:@"FontSize"];
     heightArr = [NSMutableArray arrayWithArray:@[@"0",@"0",@"0"]];
     fontArray = @[@"16",@"20",@"24"];
-    
+    videoHeight = MainScreenWidth * (9.0 / 16.0);
     if (iPhoneX) {
         backgroundView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, videoHeight + 44, MainScreenWidth, MainScreenHeight - videoHeight - 44)];
     } else {
@@ -158,17 +199,6 @@
     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"], CustomStr(@"Source"), @"国新网"];
-    NSString* htmlFooter = [[NSString alloc] initWithFormat:@"<div class=\"logo\" style=\"text-indent:2em\">%@</div></body></html>",[_dictionary objectForKey:@"Description"]];
-
-    NSString* strHtml = [[NSString alloc] initWithFormat:@"%@%@",htmlHeader,htmlFooter];
-    [relatedWebView loadHTMLString:strHtml baseURL:nil];
-    
-    if (!isPlay) {
-        [self loadMovieView];
-    } else {
-        [self addCNLivePlayerWithURL];
-    }
  
     [self loadData];
     isShow = NO;