发布会预告接口修改

yanglingyu
1 parent 308cbb07
Showing 5 changed files with 92 additions and 49 deletions
CNLiveScioLive/Pages/Header/UrlMacro.h
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldArticleDetailViewController.m
CNLiveScioLive/Pages/Live/Controller/CNLiveViewController.m
CNLiveScioLive/Pages/Live/Controller/TopNoticeViewController.h
CNLiveScioLive/Pages/Live/Controller/TopNoticeViewController.m
@@ -45,7 +45,7 @@
 //#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 yugao @"http://www.scio.gov.cn:9095/video/JsonDataFromGXW.aspx?type=DocList&Top=1&ChannelID=20490"
+#define FORECAST @"http://app.phonemovie.cnlive.com/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]
@@ -89,7 +89,7 @@
 }
 - (void)getDetailsData {
     // 详情数据
-    NSDictionary *parameters = @{@"params":[NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"type\":\"article\",\"id\":\"%@\"}", _dictionary[@"cmsContentId"]]};
+    NSDictionary *parameters = @{@"params":[NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"type\":\"program\",\"id\":\"%@\"}", _dictionary[@"cmsContentId"]]};
     AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
     [manager POST:@"http://app.phonemovie.cnlive.com/gxb/api/programDetail"
        parameters:parameters headers:nil
@@ -19,7 +19,7 @@
 @interface CNLiveViewController ()<UITableViewDelegate,UITableViewDataSource>{
     NSArray *_newsArray;
-
+    NSDictionary *_dictionary;
 }
 @property (nonatomic, strong) UITableView *tableView;
 @property (nonatomic, strong) CNLiveHeaderView *header;
@@ -145,11 +145,32 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
     }];
 }
-
+- (void)loadYGData {
+        NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
+        //NSLog(@"%@",strUrl);
+        NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"wz/fbhgg/\",\"page\":\"1\",\"pageSize\":\"1\"}"];
+        //NSLog(@"%@",categoryId);
+        if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
+            [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
+            return;
+        }
+        NSDictionary *parameters = @{@"params":categoryId};
+        AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
+        [manager POST:strUrl parameters:parameters headers:nil  progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, NSDictionary *responseObject) {
+            // 请求成功，解析数据
+            self->_dictionary = [NSDictionary dictionaryWithDictionary:responseObject];
+        }
+         failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
+             // 请求失败
+             [AlertViewTool showHUDViewText:CustomStr(@"ServerBusy")];
+             
+         }];
+}
 - (void)loadUpData{
     _pageNo = 1;
     if(!_isRefreshing){
         _isRefreshing = YES;
+        [self loadYGData];
         [self loadData];
         if(!_isLoaded){
             [self getData];
@@ -186,7 +207,7 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
     _isRefreshing = NO;
     _isLoaded = NO;
     [self loadData];
-
+    [self loadYGData];
     [self.view addSubview:self.tableView];
     self.tableView.tableHeaderView = self.header;
     __weak typeof(self) weakSelf = self;
@@ -366,6 +387,7 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
     }else if (indexPath.section == 1){
         //查看发布会预告
         TopNoticeViewController *vc = [[TopNoticeViewController alloc] init];
+        vc.forecaseDic = _dictionary;
         vc.hidesBottomBarWhenPushed = YES;
         [self.navigationController pushViewController:vc animated:YES];
         return;
@@ -10,6 +10,6 @@
 #import "CNLiveBaseViewController.h"
 @interface TopNoticeViewController : CNLiveBaseViewController<WKNavigationDelegate>{
     WKWebView *_webView;
-    NSDictionary *_dictionary;
 }
+@property (nonatomic , strong) NSDictionary *forecaseDic;
 @end
@@ -11,6 +11,10 @@
 //#import <ShareSDK/ShareSDK.h>
 @interface TopNoticeViewController ()<WKNavigationDelegate>
+{
+    NSDictionary *headerDic;
+    NSDictionary *bodyDic;
+}
 @property (nonatomic, strong) NSArray *fontArray;
 @property (nonatomic, assign) NSInteger fontIndex;
@@ -18,7 +22,7 @@
 @implementation TopNoticeViewController
 #pragma mark - Data
-- (void)loadTrailerData {
+-(void)loadHeaderData{
     if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
         [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
         return;
@@ -27,21 +31,52 @@
     AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
     manager.responseSerializer = [AFHTTPResponseSerializer serializer];
-    [manager POST:yugao parameters:nil headers:nil  progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject){
+    NSString *josnParameters = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"cmsContentId\":\"%@\"}",self.forecaseDic[@"programs"][0][@"cmsContentId"]];
+    NSLog(@"%@",josnParameters);
+    NSDictionary *parameters = @{@"params":josnParameters
+                                };
+    NSString *urlStr = [NSString stringWithFormat:@"%@%@",FORECAST,@"programByContentId"];
+    [manager POST:urlStr parameters:parameters headers:nil  progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, id responseObject) {
         [AlertViewTool hideHUDView];
         // 请求成功，解析数据
         NSString * jsonString = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding];
         NSLog(@"jsonString == %@",jsonString);
-        NSArray *arr = [jsonString objectFromJSONString];
-        NSDictionary *dic = [arr objectAtIndex:0];
-//        NSString* htmlHeader = [[NSString alloc] initWithFormat:@"<html><p><font style=\"font-size:20px;\"><strong>%@</strong></font><br>%@</p><body>",[dic objectForKey:@"Tittle"],[dic objectForKey:@"PublishDateTime"]];
-        NSString* htmlHeader = [[NSString alloc] initWithFormat:@"<html><p><font style=\"font-size:20px;\"><strong>%@</strong></font><br>%@</p><style type=\"text/css\">    img{width: 100%% !important;    height: auto !important;}</style><body>",[dic objectForKey:@"Tittle"],[dic objectForKey:@"PublishDateTime"]];
+        NSDictionary *dic = [jsonString objectFromJSONString];
+        self -> headerDic = dic[@"program"];
+
+        [self loadWebView];
-        NSString* htmlBody   = [dic objectForKey:@"Content"];
-        NSString* htmlFooter = @"</body></html>";
-        NSString* strHtml = [[NSString alloc] initWithFormat:@"%@%@%@",htmlHeader,htmlBody,htmlFooter];
-        [self->_webView loadHTMLString:strHtml baseURL:nil];
+    } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
+        // 请求失败
+        NSLog(@"%@", [error localizedDescription]);
+        [AlertViewTool hideHUDView];
+        [AlertViewTool showHUDViewText:CustomStr(@"ServerBusy")];
+         
+    }];
+}
+- (void)loadBodyData {
+    if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
+        [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
+        return;
+    }
+    [AlertViewTool showHUDView];
+    
+    AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
+    manager.responseSerializer = [AFHTTPResponseSerializer serializer];
+    NSString *josnParameters = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"type\":\"program\",\"id\":\"%@\"}",self.forecaseDic[@"programs"][0][@"cmsContentId"]];
+    NSLog(@"%@",josnParameters);
+    NSDictionary *parameters = @{@"params":josnParameters
+                                };
+    NSString *urlStr = [NSString stringWithFormat:@"%@%@",FORECAST,@"programDetail"];
+    [manager POST:urlStr parameters:parameters headers:nil  progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, id responseObject) {
+        [AlertViewTool hideHUDView];
+        // 请求成功，解析数据
+        NSString * jsonString = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding];
+        NSLog(@"jsonString == %@",jsonString);
+        
+        self->bodyDic = [jsonString objectFromJSONString];
+        [self loadWebView];
     } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
         // 请求失败
@@ -51,33 +86,18 @@
     }];
 }
+- (void)loadWebView
+{
+    if (headerDic && bodyDic) {
+        NSString* htmlHeader = [[NSString alloc] initWithFormat:@"<html><p><font style=\"font-size:20px;\"><strong>%@</strong></font><br>%@</p><style type=\"text/css\">    img{width: 100%% !important;    height: auto !important;}</style><body>",[headerDic objectForKey:@"title"],[headerDic objectForKey:@"publishDate"]];
-- (void)loadData {
-        NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
-        //NSLog(@"%@",strUrl);
-        NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"wz/fbhgg/\",\"page\":\"1\",\"pageSize\":\"1\"}"];
-        //NSLog(@"%@",categoryId);
-        if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
-            [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
-            return;
-        }
-        NSDictionary *parameters = @{@"params":categoryId};
-        AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
-        [manager POST:strUrl parameters:parameters headers:nil  progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, NSDictionary *responseObject) {
-            // 请求成功，解析数据
-            self->_dictionary = [NSDictionary dictionaryWithDictionary:responseObject];
-            dispatch_async(dispatch_get_main_queue(), ^{
-                [self loadShareView];
-            });
-            
-        }
-         failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
-             // 请求失败
-             [AlertViewTool showHUDViewText:CustomStr(@"ServerBusy")];
-             
-         }];
+        NSString* htmlBody   = [bodyDic objectForKey:@"content"];
+        NSString* htmlFooter = @"</body></html>";
+        NSString* strHtml = [[NSString alloc] initWithFormat:@"%@%@%@",htmlHeader,htmlBody,htmlFooter];
+        [self->_webView loadHTMLString:strHtml baseURL:nil];
+    }
+    
 }
-
 - (void)viewDidLoad {
     [super viewDidLoad];
     self.view.backgroundColor = [UIColor whiteColor];
@@ -86,8 +106,9 @@
     _fontIndex = [[NSUserDefaults standardUserDefaults] integerForKey:@"FontSize"];
     [self setUpNavigationBar];
-    [self loadTrailerData];
-    [self loadData];
+    [self loadHeaderData];
+    [self loadBodyData];
+    [self loadShareView];
     [self setUpUI];
 }
@@ -155,7 +176,7 @@
     //收藏按钮
     UIButton *isFavoriteButton = [UIButton buttonWithType:UIButtonTypeCustom];
     isFavoriteButton.tag = 20000;
-    TableData *notice = [[TableData alloc] initWithJSONDictionary:_dictionary[@"programs"][0]];
+    TableData *notice = [[TableData alloc] initWithJSONDictionary:_forecaseDic[@"programs"][0]];
     BOOL isIn = [[DBAction sharedDBAction] isInTable:[User_Defaults objectForKey:Language_Local] notice:notice];
     if (isIn) {
         [isFavoriteButton setImage:[UIImage imageNamed:@"cnlive_isfavorited"] forState:UIControlStateNormal];
@@ -199,7 +220,7 @@
             [_webView evaluateJavaScript:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust= '140%'" completionHandler:nil];
         }
     } else if (20000 == btn.tag) {
-        TableData *notice = [[TableData alloc] initWithJSONDictionary:_dictionary[@"programs"][0]];
+        TableData *notice = [[TableData alloc] initWithJSONDictionary:_forecaseDic[@"programs"][0]];
         BOOL isIn = [[DBAction sharedDBAction] isInTable:[User_Defaults objectForKey:Language_Local] notice:notice];
         if (!isIn) {
             BOOL isInsert = [[DBAction sharedDBAction] insertTable:[User_Defaults objectForKey:Language_Local] notice:notice];
@@ -215,10 +236,10 @@
             }
         }
     } else if (30000 == btn.tag) {
-        NSString *img = [NSString stringWithFormat:@"%@",_dictionary[@"programs"][0][@"img"]];
-        NSString *title = [NSString stringWithFormat:@"%@",_dictionary[@"programs"][0][@"title"]];
-        NSString *text = [NSString stringWithFormat:@"%@",!_dictionary[@"programs"][0][@"desc"]||[_dictionary[@"programs"][0][@"desc"] isEqualToString:@""]?title:_dictionary[@"programs"][0][@"desc"]];
-        NSString *url = [NSString stringWithFormat:@"%@",_dictionary[@"programs"][0][@"pageUrl"]];
+        NSString *img = [NSString stringWithFormat:@"%@",_forecaseDic[@"programs"][0][@"img"]];
+        NSString *title = [NSString stringWithFormat:@"%@",_forecaseDic[@"programs"][0][@"title"]];
+        NSString *text = [NSString stringWithFormat:@"%@",!_forecaseDic[@"programs"][0][@"desc"]||[_forecaseDic[@"programs"][0][@"desc"] isEqualToString:@""]?title:_forecaseDic[@"programs"][0][@"desc"]];
+        NSString *url = [NSString stringWithFormat:@"%@",_forecaseDic[@"programs"][0][@"pageUrl"]];
         [[TemplateShareManager manager] shareImage:img title:title text:text url:url controller:self];
         return;