直播图文详情接口更改

yanglingyu
1 parent e030152b
Showing 2 changed files with 72 additions and 96 deletions
CNLiveScioLive/AppDelegate.m
CNLiveScioLive/Pages/Live/Controller/GraphicLiveViewController.m
@@ -101,10 +101,10 @@
         NSDictionary *dic = [NSDictionary dictionaryWithDictionary:json];
         NSURL *url = [NSURL URLWithString:dic[@"data"][@"image"]];
         NSString * mode = dic[@"grayMode"];
-        if (mode.intValue == 1) {
+        if (mode&&mode.intValue == 1) {
             [[NSUserDefaults standardUserDefaults] setBool:YES forKey:ISGRAYMODE];
         }else{
-            [[NSUserDefaults standardUserDefaults] setBool:YES forKey:ISGRAYMODE];
+            [[NSUserDefaults standardUserDefaults] setBool:NO forKey:ISGRAYMODE];
         }
         if (dic[@"homeTitleColor"]&&![dic[@"homeTitleColor"] isEqualToString:@""]) {
             [[NSUserDefaults standardUserDefaults] setValue:dic[@"homeTitleColor"] forKey:HOMETITLECOLOR];
@@ -55,14 +55,42 @@
 - (void)loadData {
     if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
+        [self setUpUIWithTag:1000 Height:0];
+        return;
+    }
+    
+    AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
+    manager.responseSerializer = [AFHTTPResponseSerializer serializer];
+    [manager POST:@"http://s.scio.gov.cn/ocms/.content/function_provider/arswitch1.json" parameters:nil headers:nil progress:NULL  success:^(NSURLSessionDataTask *task, id responseObject) {
+        NSLog(@"%@",responseObject);
+        NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:responseObject options:NSJSONReadingMutableContainers error:nil];
+        NSString *errorCode = dic[@"errorCode"];
+        
+        if ([errorCode isEqualToString:@"1"]) {
+            [self requestJsonData:dic[@"docId"]];
+        }
+       
+
+    } failure:^(NSURLSessionDataTask *task, NSError *error) {
+        NSLog(@"%@",error);
+        [self setUpUIWithTag:1000 Height:0];
+
+    }];
+    
+   
+}
+-(void)requestJsonData:(NSString *)docId
+{
+    if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
         [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
         return;
     }
     [AlertViewTool showHUDView];
     AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
     manager.responseSerializer = [AFHTTPResponseSerializer serializer];
-    [manager POST:tuwenzhibo parameters:nil headers:nil  progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
+    [manager POST:tuwen(docId.intValue) parameters:nil headers:nil  progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
           [AlertViewTool hideHUDView];
+        [self setUpUIWithTag:1000 Height:40.0];
           // 请求成功，解析数据
           NSString * jsonString = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding];
           NSArray *arr = [jsonString objectFromJSONString];
@@ -72,7 +100,7 @@
           } else {
               [self->_webView loadHTMLString:@"<html><body>   </body></html>" baseURL:nil];
           }
-
+        
     } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
           // 请求失败
@@ -82,7 +110,6 @@
     }];
 }
-
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     [[JGMusicManager shareMusicManager] playStop];
@@ -96,7 +123,6 @@
 - (void)viewWillDisappear:(BOOL)animated {
     [super viewWillDisappear:animated];
     [self.liveController stopShow];
-//    self.liveController = nil;
     [self.navigationController setNavigationBarHidden:NO];
 }
@@ -117,15 +143,6 @@
     backgroundView.bounces = NO;
     [self.view addSubview:backgroundView];
-    relatedWebView = [[WKWebView alloc] initWithFrame:CGRectZero];
-    relatedWebView.scrollView.backgroundColor = [UIColor whiteColor];
-//    relatedWebView.dataDetectorTypes = UIDataDetectorTypeNone;
-    relatedWebView.backgroundColor = [UIColor whiteColor];
-    relatedWebView.scrollView.bounces = NO;
-    relatedWebView.navigationDelegate = self;
-    relatedWebView.opaque = NO;
-    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"]];
 //    NSString* htmlFooter = [[NSString alloc] initWithFormat:@"<div class=\"logo\" style=\"text-indent:2em\">%@</div></body></html>",[_dictionary objectForKey:@"Description"]];
@@ -156,16 +173,6 @@
     NSString* strHtml = [[NSString alloc] initWithFormat:@"%@%@",htmlHeader,htmlFooter];
     [relatedWebView loadHTMLString:strHtml baseURL:nil];
-    _webView = [[WKWebView alloc] initWithFrame:CGRectZero];
-    _webView.scrollView.backgroundColor = [UIColor whiteColor];
-//    _webView.dataDetectorTypes = UIDataDetectorTypeNone;
-    _webView.backgroundColor = [UIColor whiteColor];
-    _webView.navigationDelegate = self;
-    _webView.opaque = NO;
-    _webView.tag = 2000;
-    _webView.hidden = YES;
-    [backgroundView addSubview:_webView];
-    
     if (!isPlay) {
         [self loadMovieView];
     } else {
@@ -329,26 +336,47 @@
             [relatedWebView setFrame:CGRectMake(0, 0, MainScreenWidth, descriptionHeight)];
         }];
     }
-    
-    if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
-        [self setUpUIWithTag:webView.tag Height:0];
-        return;
-    }
-    
-    AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
-    manager.responseSerializer = [AFHTTPResponseSerializer serializer];
-    [manager POST:@"http://s.scio.gov.cn/ocms/.content/function_provider/arswitch.json" parameters:nil headers:nil progress:NULL  success:^(NSURLSessionDataTask *task, id responseObject) {
-        NSLog(@"%@",responseObject);
-        NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:responseObject options:NSJSONReadingMutableContainers error:nil];
-        NSString *errorCode = dic[@"errorCode"];
-        [self setUpUIWithTag:webView.tag Height:[errorCode isEqualToString:@"1"]?40.0:0.0];
-
-    } failure:^(NSURLSessionDataTask *task, NSError *error) {
-        NSLog(@"%@",error);
-        [self setUpUIWithTag:webView.tag Height:0];
+    if (webView.tag==2000) {
+        CGFloat width = MainScreenWidth - 20;
+        NSString *string = [NSString stringWithFormat:
+                            @"var script = document.createElement('script');"
+                            "script.type = 'text/javascript';"
+                            "script.text = \"function ResizeImages() { "
+                            "var myimg,oldwidth;"
+                            "var maxwidth=%f;" //缩放系数
+                            "for(i=0;i <document.images.length;i++){"
+                            "myimg = document.images[i];"
+                            "if(myimg.width > maxwidth){"
+                            "oldwidth = myimg.width;"
+                            "myimg.width = maxwidth;"
+                            "myimg.height = myimg.height * (maxwidth/oldwidth);"
+                            "}"
+                            "}"
+                            "}\";"
+                            "document.getElementsByTagName('head')[0].appendChild(script);",width];
-    }];
-    
+        [webView evaluateJavaScript:string completionHandler:nil];
+        [webView evaluateJavaScript:@"ResizeImages();" completionHandler:nil];
+        
+        CGRect frame = webView.frame;
+        frame.size.width = MainScreenWidth;
+        frame.size.height = 1;
+        webView.frame = frame;
+        [webView evaluateJavaScript:@"document.body.scrollHeight"completionHandler:^(id _Nullable result,NSError * _Nullable error){
+            self->graphicLiveHeight = [result floatValue];
+            if (0 == [self->heightArr[self->fontIndex] floatValue]) {
+                [self->heightArr replaceObjectAtIndex:self->fontIndex withObject:[NSString stringWithFormat:@"%f",self->graphicLiveHeight]];
+            }
+            
+            if (self->isShow) {
+                NSLog(@"fontIndex = %d",self->fontIndex);
+                [self->backgroundView setContentSize:CGSizeMake(MainScreenWidth, 40 + self->descriptionHeight + [self->heightArr[self->fontIndex] floatValue] + 221)];
+                [webView setFrame:CGRectMake(0, 40 + self->descriptionHeight, MainScreenWidth, [self->heightArr[self->fontIndex] floatValue])];
+                [self showRelatedInformation:40 + self->descriptionHeight + [self->heightArr[self->fontIndex] floatValue]];
+            }
+        }];
+    }
+   
 }
 - (void)setUpUIWithTag:(NSInteger)tag Height:(NSInteger)height{
@@ -418,58 +446,6 @@
         [self showRelatedInformation:height + descriptionHeight];
-    } else if (2000 == tag) {
-        CGFloat width = MainScreenWidth - 20;
-        NSString *string = [NSString stringWithFormat:
-                            @"var script = document.createElement('script');"
-                            "script.type = 'text/javascript';"
-                            "script.text = \"function ResizeImages() { "
-                            "var myimg,oldwidth;"
-                            "var maxwidth=%f;" //缩放系数
-                            "for(i=0;i <document.images.length;i++){"
-                            "myimg = document.images[i];"
-                            "if(myimg.width > maxwidth){"
-                            "oldwidth = myimg.width;"
-                            "myimg.width = maxwidth;"
-                            "myimg.height = myimg.height * (maxwidth/oldwidth);"
-                            "}"
-                            "}"
-                            "}\";"
-                            "document.getElementsByTagName('head')[0].appendChild(script);",width];
-        
-        [_webView evaluateJavaScript:string completionHandler:nil];
-        [_webView evaluateJavaScript:@"ResizeImages();" completionHandler:nil];
-        
-        CGRect frame = _webView.frame;
-        frame.size.width = MainScreenWidth;
-        frame.size.height = 1;
-        _webView.frame = frame;
-        [_webView evaluateJavaScript:@"document.body.scrollHeight"completionHandler:^(id _Nullable result,NSError * _Nullable error){
-            graphicLiveHeight = [result floatValue];
-            if (0 == [heightArr[fontIndex] floatValue]) {
-                [heightArr replaceObjectAtIndex:fontIndex withObject:[NSString stringWithFormat:@"%f",graphicLiveHeight]];
-            }
-            
-            if (isShow) {
-                NSLog(@"fontIndex = %d",fontIndex);
-                [backgroundView setContentSize:CGSizeMake(MainScreenWidth, 40 + descriptionHeight + [heightArr[fontIndex] floatValue] + 221)];
-                [_webView setFrame:CGRectMake(0, 40 + descriptionHeight, MainScreenWidth, [heightArr[fontIndex] floatValue])];
-                [self showRelatedInformation:40 + descriptionHeight + [heightArr[fontIndex] floatValue]];
-            }
-        }];
-        
-        NSLog(@"%@",NSStringFromCGRect(_webView.frame));
-        NSLog(@"%@",NSStringFromCGSize(_webView.scrollView.contentSize));
-//        if (0 == [heightArr[fontIndex] floatValue]) {
-//            [heightArr replaceObjectAtIndex:fontIndex withObject:[NSString stringWithFormat:@"%f",graphicLiveHeight]];
-//        }
-//
-//        if (isShow) {
-//            NSLog(@"fontIndex = %d",fontIndex);
-//            [backgroundView setContentSize:CGSizeMake(MainScreenWidth, 40 + descriptionHeight + [heightArr[fontIndex] floatValue] + 221)];
-//            [_webView setFrame:CGRectMake(0, 40 + descriptionHeight, MainScreenWidth, [heightArr[fontIndex] floatValue])];
-//            [self showRelatedInformation:40 + descriptionHeight + [heightArr[fontIndex] floatValue]];
-//        }
     }
 }