Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/ScioLive

张旭
2 parents bd39f4f3 fec9ac1d
Showing 10 changed files with 248 additions and 76 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
CNLiveScioLive/Pages/Header/SystemMacro.h
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldVideoDetailViewController.m
CNLiveScioLive/Pages/Home/新闻详情/OldController/Present/VideoDetailPresent.h
CNLiveScioLive/Pages/Home/新闻详情/OldController/Present/VideoDetailPresent.m
CNLiveScioLive/Pages/Newsound/OldController/VoiceViewController.m
CNLiveScioLive/Pages/Tools/DBAction/DBAction.m
CNLiveScioLive/Pages/Tools/DBAction/NoticeData.h
CNLiveScioLive/Pages/Tools/DBAction/NoticeData.m
CNLiveScioLive/Pages/Tools/ZXVideoPlayer/Classes/ZXVideoPlayerController.m
@@ -50,6 +50,7 @@
 		0838487D215CF6FC00186618 /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0838487C215CF6FB00186618 /* BaseViewController.m */; };
 		0838487E215CF6FC00186618 /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0838487C215CF6FB00186618 /* BaseViewController.m */; };
 		0838487F215CF6FC00186618 /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0838487C215CF6FB00186618 /* BaseViewController.m */; };
+		08471A9F25E7864E0043FC2D /* VideoDetailPresent.m in Sources */ = {isa = PBXBuildFile; fileRef = 08471A9E25E7864E0043FC2D /* VideoDetailPresent.m */; };
 		084ACDFD21547AE80089E035 /* CNLiveContactUsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 084ACDFC21547AE80089E035 /* CNLiveContactUsViewController.m */; };
 		084ACDFE21547AE80089E035 /* CNLiveContactUsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 084ACDFC21547AE80089E035 /* CNLiveContactUsViewController.m */; };
 		084ACDFF21547AE80089E035 /* CNLiveContactUsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 084ACDFC21547AE80089E035 /* CNLiveContactUsViewController.m */; };
@@ -781,6 +782,8 @@
 		08384877215CC9E400186618 /* GraphicLiveViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GraphicLiveViewController.h; sourceTree = "<group>"; };
 		0838487B215CF6FB00186618 /* BaseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseViewController.h; sourceTree = "<group>"; };
 		0838487C215CF6FB00186618 /* BaseViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BaseViewController.m; sourceTree = "<group>"; };
+		08471A9D25E7864E0043FC2D /* VideoDetailPresent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VideoDetailPresent.h; sourceTree = "<group>"; };
+		08471A9E25E7864E0043FC2D /* VideoDetailPresent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VideoDetailPresent.m; sourceTree = "<group>"; };
 		084ACDFB21547AE80089E035 /* CNLiveContactUsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CNLiveContactUsViewController.h; sourceTree = "<group>"; };
 		084ACDFC21547AE80089E035 /* CNLiveContactUsViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CNLiveContactUsViewController.m; sourceTree = "<group>"; };
 		084ACE0021547B4D0089E035 /* CNLiveMyCollectionViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CNLiveMyCollectionViewController.h; sourceTree = "<group>"; };
@@ -1288,6 +1291,7 @@
 		0838484A215CA71C00186618 /* OldController */ = {
 			isa = PBXGroup;
 			children = (
+				08471A8F25E785B50043FC2D /* Present */,
 				0838487B215CF6FB00186618 /* BaseViewController.h */,
 				0838487C215CF6FB00186618 /* BaseViewController.m */,
 				0838484B215CA73A00186618 /* OldArticleDetailViewController.h */,
@@ -1316,6 +1320,15 @@
 			path = Html5Utils;
 			sourceTree = "<group>";
 		};
+		08471A8F25E785B50043FC2D /* Present */ = {
+			isa = PBXGroup;
+			children = (
+				08471A9D25E7864E0043FC2D /* VideoDetailPresent.h */,
+				08471A9E25E7864E0043FC2D /* VideoDetailPresent.m */,
+			);
+			path = Present;
+			sourceTree = "<group>";
+		};
 		084ACE0A21547F9F0089E035 /* DBAction */ = {
 			isa = PBXGroup;
 			children = (
@@ -2659,6 +2672,7 @@
 				TargetAttributes = {
 					08C08F6D214F997E00E23D16 = {
 						CreatedOnToolsVersion = 9.4.1;
+						LastSwiftMigration = 1240;
 						SystemCapabilities = {
 							com.apple.BackgroundModes = {
 								enabled = 1;
@@ -3015,6 +3029,7 @@
 				08B5C5962153490B00F5476E /* CNMyAnnouncementsModel.m in Sources */,
 				08FB8777215DD3C600DA5423 /* NewsVoiceTableViewCell.m in Sources */,
 				08FB8774215DD3C600DA5423 /* SelectedTableViewCell.m in Sources */,
+				08471A9F25E7864E0043FC2D /* VideoDetailPresent.m in Sources */,
 				C3E502DA2152432700DA4320 /* CNHomeRightTableViewCell.m in Sources */,
 				08C090AB215103C400E23D16 /* CNLiveHeaderView.m in Sources */,
 				08585D56215B4C7200FC2CA2 /* PGDatePicker+Time.m in Sources */,
@@ -3597,6 +3612,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
@@ -3639,6 +3655,9 @@
 				PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_OBJC_BRIDGING_HEADER = "CNLiveScioLive/Pages/Home/新闻详情/OldController/Present/CNLiveScioLive-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 				VALID_ARCHS = "arm64 arm64e armv7s";
 			};
@@ -3650,6 +3669,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
@@ -3692,6 +3712,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_OBJC_BRIDGING_HEADER = "CNLiveScioLive/Pages/Home/新闻详情/OldController/Present/CNLiveScioLive-Bridging-Header.h";
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 				VALID_ARCHS = "arm64 arm64e armv7s";
 			};
@@ -9,6 +9,13 @@
 #ifndef SystemMacro_h
 #define SystemMacro_h
+#ifndef AppKeyWindow
+#define AppKeyWindow ((AppDelegate *)[UIApplication sharedApplication].delegate).window
+#endif
+
+//协议调取方法
+#define CNMessageSend(instance,protocol,message) [(id<protocol>)(instance) message]
+
 // 系统语言
 #define SYSTEM_LANGUAGE [[[NSUserDefaults standardUserDefaults] objectForKey:@"AppleLanguages"] objectAtIndex:0]
 #define IS_CHINESE ([SYSTEM_LANGUAGE isEqualToString:@"zh-Hans-CN"]||[SYSTEM_LANGUAGE isEqualToString:@"zh-Hant-CN"]||[SYSTEM_LANGUAGE isEqualToString:@"zh-Hans"] ||[SYSTEM_LANGUAGE isEqualToString:@"zh-hans"])
@@ -12,9 +12,12 @@
 #import "VideoTableViewCell.h"
 #import "ArticleTableViewCell.h"
 #import "SearchResultViewController.h"
-@interface OldVideoDetailViewController ()<CNLivePlayerControllerDelegate>{
+#import "VideoDetailPresent.h"
+@interface OldVideoDetailViewController ()<CNLivePlayerControllerDelegate,ProgramDelegate>{
     UIButton *_shareBtn;
 }
+@property (nonatomic,strong)VideoDetailPresent *present;
+@property (nonatomic,strong)NSString *content;
 @end
 @implementation OldVideoDetailViewController
@@ -43,8 +46,8 @@
         movieUrl = [NSURL URLWithString:url];
         videoHeight = MainScreenWidth * (9.0 / 16.0);
         dispatch_async(dispatch_get_global_queue(0, 0), ^{
-            if(!(0 == [self->_dictionary[@"img"] length])){
-                NSData *data = [NSData dataWithContentsOfURL:[NSURL URLWithString:self->_dictionary[@"img"]]];
+            if(!(0 == [self->_dictionary[@"imgSmall"] length])){
+                NSData *data = [NSData dataWithContentsOfURL:[NSURL URLWithString:self->_dictionary[@"imgSmall"]]];
                     self->bgImg = [UIImage imageWithData:data];
                 dispatch_async(dispatch_get_main_queue(), ^{
                     if (self.videoController && self->bgImg) {
@@ -63,10 +66,14 @@
     NSString* htmldate = @"";
     NSString* htmlForm = @"";
+    NSString* content = @"";
     if ([_dictionary objectForKey:@"publishDate"] && [_dictionary objectForKey:@"author"]) {
         htmldate = [[NSString alloc] initWithFormat:@"<html><p>%@</p><body>",[NSString stringWithFormat:@"%@",[_dictionary objectForKey:@"publishDate"]]];
         htmlForm = [[NSString alloc] initWithFormat:@"<html><p>%@：%@</p><body>", CustomStr(@"Source"), _dictionary[@"author"]];
         self.authorName = _dictionary[@"author"];
+        if (self.content&&![self.content isEqualToString:@""]) {
+            content = [[NSString alloc] initWithFormat:@"<div class=\"logo\" style=\"text-indent:2em\"><font style=\"font-size:%@px;\">%@</font></div>",fontArray[fontIndex],self.content];
+        }
     } else {
         htmldate = [[NSString alloc] initWithFormat:@"<html><p>%@</p><body>",[NSString stringWithFormat:@"%@",[_dictionary objectForKey:@"publishDate"]]];
         NSDictionary *author = [NSDictionary dictionaryWithContentsOfFile:FavouriteAuthors_PATH];
@@ -76,7 +83,7 @@
     NSString* htmlBody = [[NSString alloc] initWithFormat:@"<div class=\"logo\" style=\"text-indent:2em\"><font style=\"font-size:%@px;\">%@</font></div>",fontArray[fontIndex],[_dictionary objectForKey:@"desc"]];
     NSString* htmlFooter = @"</body></html>";
-    NSString* strHtml = [[NSString alloc] initWithFormat:@"%@%@%@%@%@",htmlHeader,htmldate,htmlForm,htmlBody,htmlFooter];
+    NSString* strHtml = [[NSString alloc] initWithFormat:@"%@%@%@%@%@%@",htmlHeader,htmldate,htmlForm,content,htmlBody,htmlFooter];
     return strHtml;
 }
@@ -238,8 +245,11 @@
     _webView.UIDelegate = self;
     _webView.opaque = NO;
     [backgroundView addSubview:_webView];
+    if ([_dictionary objectForKey:@"publishDate"] && [_dictionary objectForKey:@"author"]) {
+    [self.present requestProgram:_dictionary[@"cmsContentId"]];
+    }else{
     [_webView loadHTMLString:[self setHTMLString] baseURL:nil];
-    
+    }
     self.tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];
     self.tableView.backgroundColor = [UIColor whiteColor];
     self.tableView.backgroundView = nil;
@@ -252,6 +262,7 @@
     if ([self.tableView respondsToSelector:@selector(setSeparatorInset:)]) {
         [self.tableView setSeparatorInset:UIEdgeInsetsZero];
     }
+    [self.present loadRelatedInformation:_dictionary[@"cmsContentId"]];
     self.errorLabe = [[UILabel alloc] initWithFrame:CGRectZero];
     self.errorLabe.backgroundColor = [UIColor clearColor];
     self.errorLabe.textColor = HEXCOLOR(0x333333);
@@ -270,17 +281,18 @@
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
     if ([keyPath isEqualToString:@"contentSize"] && !_webView.loading && _webView.height != _webView.scrollView.contentSize.height) {
-        CGRect frame = self->_webView.frame;
+        CGRect frame = _webView.frame;
         frame.size.width = MainScreenWidth;
         frame.size.height = 1;
         CGFloat graphicLiveHeight = self->_webView.scrollView.contentSize.height;
-        frame.size.height = self->_webView.scrollView.contentSize.height;
-        NSLog(@"YYYYYYYYYYY%f",self->_webView.scrollView.contentSize.height);
-        self->_webView.frame = frame;
-        if (0 == [self->heightArr[self->fontIndex] floatValue]) {
-            [self->heightArr replaceObjectAtIndex:self->fontIndex withObject:[NSString stringWithFormat:@"%f",graphicLiveHeight]];
+        frame.size.height = _webView.scrollView.contentSize.height;
+        NSLog(@"YYYYYYYYYYY%f",_webView.scrollView.contentSize.height);
+        _webView.frame = frame;
+            [heightArr replaceObjectAtIndex:fontIndex withObject:[NSString stringWithFormat:@"%f",graphicLiveHeight]];
+        if (_newsArray.count != 0) {
+            [self.tableView setFrame:CGRectMake(0, [heightArr[fontIndex] floatValue], MainScreenWidth, 36 + 86*_newsArray.count)];
         }
-        [self loadRelatedInformation];
+        [backgroundView setContentSize:CGSizeMake(MainScreenWidth, [heightArr[fontIndex] floatValue] + self.tableView.frame.size.height)];
     }
 }
 // CNLivePlayer
@@ -444,48 +456,30 @@
         NSLog(@"value: %@ error: %@", response, error);
     }];
+    
 }
-- (void)loadRelatedInformation {
-    if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
-        [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
-        return;
+
+#pragma mark - ProgramDelegate
+-(void)programDetail:(NSString *)content
+{
+    self.content = content;
+    [_webView loadHTMLString:[self setHTMLString] baseURL:nil];
+}
+
+- (void)reloadWithData:(NSArray *)dataArray
+{
+    if (0 != [dataArray count]) {
+        _newsArray = [NSArray arrayWithArray:dataArray];
+        [self.tableView setFrame:CGRectMake(0, [heightArr[fontIndex] floatValue], MainScreenWidth, 36 + 86*_newsArray.count)];
+    } else {
+        //                      [self.errorLabe setFrame:CGRectMake(12, [heightArr[fontIndex] floatValue], MainScreenWidth - 24, 20)];
+        //                      self.errorLabe.hidden = NO;
     }
-    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/programRelative";
-    NSLog(@"%@",strUrl);
-    NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"cmsContentId\":\"%@\"}",_dictionary[@"cmsContentId"]];
-    NSLog(@"%@",categoryId);
-    NSDictionary *parameters = @{@"params":categoryId};
-    AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
-    [manager POST:strUrl
-       parameters:parameters headers:nil 
-         progress:^(NSProgress * _Nonnull uploadProgress) {}
-          success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
-              // 请求成功，解析数据
-              NSLog(@"%@", responseObject);
-              NSDictionary *_dic = [NSDictionary dictionaryWithDictionary:responseObject];
-              if ([_dic[@"errorCode"] isEqualToString:@"0"]) {
-                  NSArray *array = _dic[@"programs"];
-                  if (0 != [array 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));
-                  [self->backgroundView setContentSize:CGSizeMake(MainScreenWidth, [self->heightArr[self->fontIndex] floatValue] + self.tableView.frame.size.height)];
-                  [self.tableView reloadData];
-              } else {
-                  [AlertViewTool showHUDViewText:_dic[@"errorMessage"]];
-              }
-          }
-          failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
-              // 请求失败
-              NSLog(@"%@", [error localizedDescription]);
-              [SVProgressHUD dismiss];
-              [AlertViewTool showHUDAddedToView:self.view text:CustomStr(@"ServerBusy")];
-          }];
+    NSLog(@"%@",NSStringFromCGRect(self.tableView.frame));
+    [backgroundView setContentSize:CGSizeMake(MainScreenWidth, [heightArr[fontIndex] floatValue] + self.tableView.frame.size.height)];
+    [self.tableView reloadData];
 }
+#pragma mark - UITableViewDelegate And UITableViewDataSource
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
     return [_newsArray count];
 }
@@ -605,4 +599,15 @@
 }
+#pragma mark - Lazy
+- (VideoDetailPresent *)present
+{
+    if (!_present) {
+        _present = [[VideoDetailPresent alloc] init];
+        _present.currentView = self;
+        _present.delegate = self;
+    }
+    return _present;
+}
+
 @end
+//
+//  VideoDetailPresent.h
+//  CNLiveScioLive
+//
+//  Created by CNLive on 2021/2/25.
+//  Copyright © 2021 CNLive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+@protocol ProgramDelegate<NSObject>
+@required
+-(void)programDetail:(NSString *)content;
+-(void)reloadWithData:(NSArray *)dataArray;
+@end
+
+@interface VideoDetailPresent : NSObject
+@property(nonatomic,weak) id currentView;
+@property(nonatomic,weak)id<ProgramDelegate> delegate;
+
+-(void)requestProgram:(NSString *)reportId;
+-(void)loadRelatedInformation:(NSString *)reportId;
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  VideoDetailPresent.m
+//  CNLiveScioLive
+//
+//  Created by CNLive on 2021/2/25.
+//  Copyright © 2021 CNLive. All rights reserved.
+//
+
+#import "VideoDetailPresent.h"
+
+@implementation VideoDetailPresent
+
+-(void)requestProgram:(NSString *)reportId
+{
+    if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
+        [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
+        return;
+    }
+    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/programDetail";
+    NSLog(@"%@",strUrl);
+    NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"type\":\"program\",\"id\":\"%@\"}",reportId];
+    NSLog(@"%@",categoryId);
+    NSDictionary *parameters = @{@"params":categoryId};
+    AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
+    [manager POST:strUrl
+       parameters:parameters headers:nil
+         progress:^(NSProgress * _Nonnull uploadProgress) {}
+          success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
+              // 请求成功，解析数据
+              NSLog(@"%@", responseObject);
+              NSDictionary *_dic = [NSDictionary dictionaryWithDictionary:responseObject];
+              if ([_dic[@"errorCode"] isEqualToString:@"0"]) {
+                  NSString *content = _dic[@"content"];
+                      CNMessageSend(self.currentView, ProgramDelegate, programDetail:content);
+                  
+              } else {
+                  [AlertViewTool showHUDViewText:_dic[@"errorMessage"]];
+              }
+          }
+          failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
+              // 请求失败
+              NSLog(@"%@", [error localizedDescription]);
+              [SVProgressHUD dismiss];
+              [AlertViewTool showHUDAddedToView:AppKeyWindow text:CustomStr(@"ServerBusy")];
+          }];
+}
+- (void)loadRelatedInformation:(NSString *)reportId {
+    if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
+        [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
+        return;
+    }
+    NSString *strUrl = @"http://app.phonemovie.cnlive.com/gxb/api/programRelative";
+    NSLog(@"%@",strUrl);
+    NSString *categoryId = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"cmsContentId\":\"%@\"}",reportId];
+    NSLog(@"%@",categoryId);
+    NSDictionary *parameters = @{@"params":categoryId};
+    AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
+    [manager POST:strUrl
+       parameters:parameters headers:nil
+         progress:^(NSProgress * _Nonnull uploadProgress) {}
+          success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
+              // 请求成功，解析数据
+              NSLog(@"%@", responseObject);
+              NSDictionary *_dic = [NSDictionary dictionaryWithDictionary:responseObject];
+              if ([_dic[@"errorCode"] isEqualToString:@"0"]) {
+                  NSArray *array = _dic[@"programs"];
+                  CNMessageSend(self.currentView, ProgramDelegate, reloadWithData:array);
+              } else {
+                  [AlertViewTool showHUDViewText:_dic[@"errorMessage"]];
+              }
+          }
+          failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
+              // 请求失败
+              NSLog(@"%@", [error localizedDescription]);
+              [SVProgressHUD dismiss];
+              [AlertViewTool showHUDAddedToView:AppKeyWindow text:CustomStr(@"ServerBusy")];
+          }];
+}
+@end
@@ -29,6 +29,8 @@
     UIButton *shareBtn;//分享
     UIButton *favoriteBtn;//收藏
+    UIImageView *reviewImage;//预览图片
+    
     UIButton *playBackBtn;//15s
     UIButton *playBtn;//播放
     UIButton *playNextBtn;//下一首
@@ -645,6 +647,17 @@ static const NSInteger margin = 34;
     playProgress.backgroundColor = HEXCOLOR(0x1959C9);
     [self.view addSubview:playProgress];
+    reviewImage  = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 0, 0)];
+    reviewImage.backgroundColor = [UIColor whiteColor];
+    reviewImage.contentMode = UIViewContentModeScaleAspectFit;
+    [self.view addSubview:reviewImage];
+    [reviewImage mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(self->titleLabel.mas_left);
+        make.right.equalTo(self->titleLabel.mas_right);
+        make.top.equalTo(self->favoriteBtn.mas_bottom).with.offset(5);
+        make.bottom.equalTo(self->playBtn.mas_top).with.offset(-5);
+    }];
+    
 }
 //2个列表UI
 - (void)createUI{
@@ -847,6 +860,7 @@ static const NSInteger margin = 34;
     } else {
         sourceLabel.text = [NSString stringWithFormat:@"Source: %@",dic[@"author"]];
     }
+    [reviewImage sd_setImageWithURL:dic[@"imgSmall"]];
     // 判断收藏按钮状态
     TableData *notice = [[TableData alloc] initWithJSONDictionary:_dictionary];
     BOOL isIn = [[DBAction sharedDBAction] isInTable:[User_Defaults objectForKey:Language_Local] notice:notice];
@@ -127,15 +127,15 @@ static DBAction *instance = nil;
 - (void)createTable:(NSString *)tableName{
     if ([db open]) {
         tableName = [tableName substringToIndex:2];
-        NSString * sql = [NSString stringWithFormat:@"CREATE TABLE %@DATATABLE (cmsColumnName varchar, cmsColumnId varchar, cmsContentId int, createDate varchar, desc varchar, gxbArticleId int, gxbVideoId int, img varchar, pageUrl varchar, picType varchar, playType varchar, publishDate varchar, subTitle varchar, title varchar, type varchar, uploadVideoUrl varchar, videoUrl varchar, vipFlag int, uuid varchar)",tableName.uppercaseString];
+        NSString * sql = [NSString stringWithFormat:@"CREATE TABLE IF NOT EXISTS %@SDATATABLE (cmsColumnName varchar, cmsColumnId varchar, cmsContentId int, createDate varchar, desc varchar, gxbArticleId int, gxbVideoId int, img varchar,imgSmall varchar, pageUrl varchar, picType varchar, playType varchar, publishDate varchar, subTitle varchar, title varchar, type varchar, uploadVideoUrl varchar, videoUrl varchar, vipFlag int, uuid varchar,author varchar)",tableName.uppercaseString];
         BOOL res = [db executeUpdate:sql];
         if (!res) {
             NSLog(@"建表失败");
-            NSString *sql1 = [NSString stringWithFormat:@"ALTER TABLE %@DATATABLE ADD %@ VARCHAR",tableName,@"playType"];
+            NSString *sql1 = [NSString stringWithFormat:@"ALTER TABLE %@SDATATABLE ADD %@ VARCHAR",tableName,@"playType"];
             BOOL result1 = [db executeUpdate:sql1];
-            NSString *sql2 = [NSString stringWithFormat:@"ALTER TABLE %@DATATABLE ADD %@ VARCHAR",tableName,@"uuid"];
+            NSString *sql2 = [NSString stringWithFormat:@"ALTER TABLE %@SDATATABLE ADD %@ VARCHAR",tableName,@"uuid"];
             BOOL result2 = [db executeUpdate:sql2];
         } else {
@@ -150,7 +150,7 @@ static DBAction *instance = nil;
 - (BOOL)isInTable:(NSString *)tableName notice:(TableData*)notice{
     if ([db open]) {
         tableName = [tableName substringToIndex:2];
-        NSString * check = [NSString stringWithFormat:@"SELECT * FROM %@DATATABLE where cmsContentId = %d",tableName.uppercaseString,notice.cmsContentId];
+        NSString * check = [NSString stringWithFormat:@"SELECT * FROM %@SDATATABLE where cmsContentId = %d",tableName.uppercaseString,notice.cmsContentId];
         FMResultSet * re = [db executeQuery:check];
         while ([re next])  {
             return YES;
@@ -163,12 +163,12 @@ static DBAction *instance = nil;
 - (BOOL)insertTable:(NSString *)tableName notice:(TableData*)notice{
     if ([db open]) {
         tableName = [tableName substringToIndex:2];
-        NSString * check = [NSString stringWithFormat:@"SELECT * FROM %@DATATABLE where cmsContentId = %d",tableName.uppercaseString,notice.cmsContentId];
+        NSString * check = [NSString stringWithFormat:@"SELECT * FROM %@SDATATABLE where cmsContentId = %d",tableName.uppercaseString,notice.cmsContentId];
         FMResultSet * re = [db executeQuery:check];
         if (![re next]) {
             NSString *desc = [notice.desc stringByReplacingOccurrencesOfString:@"'" withString:@"''"];
             NSString *title = [notice.title stringByReplacingOccurrencesOfString:@"'" withString:@"‘"];
-            NSString * sql = [NSString stringWithFormat:@"INSERT INTO %@DATATABLE (cmsColumnName, cmsColumnId, cmsContentId, createDate, desc, gxbArticleId, gxbVideoId, img, pageUrl, picType, playType, publishDate, subTitle, title, type, uploadVideoUrl, videoUrl, vipFlag, uuid) values('%@','%@','%d', '%@','%@','%d','%d', '%@','%@','%@','%@','%@','%@','%@','%@','%@','%@','%d', '%@')",tableName.uppercaseString, notice.cmsColumnName, notice.cmsColumnId, notice.cmsContentId, notice.createDate, desc, notice.gxbArticleId,  notice.gxbVideoId, notice.img, notice.pageUrl, notice.picType, notice.playType, notice.publishDate, notice.subTitle, title, notice.type, notice.uploadVideoUrl, notice.videoUrl, notice.vipFlag, notice.uuid?notice.uuid:@""];
+            NSString * sql = [NSString stringWithFormat:@"INSERT INTO %@SDATATABLE (cmsColumnName, cmsColumnId, cmsContentId, createDate, desc, gxbArticleId, gxbVideoId, img, imgSmall, pageUrl, picType, playType, publishDate, subTitle, title, type, uploadVideoUrl, videoUrl, vipFlag, uuid,author) values('%@','%@','%d', '%@','%@','%d','%d', '%@','%@','%@','%@','%@','%@','%@','%@','%@','%@','%@','%d', '%@','%@')",tableName.uppercaseString, notice.cmsColumnName, notice.cmsColumnId, notice.cmsContentId, notice.createDate, desc, notice.gxbArticleId,  notice.gxbVideoId, notice.img, notice.imgSmall, notice.pageUrl, notice.picType, notice.playType, notice.publishDate, notice.subTitle, title, notice.type, notice.uploadVideoUrl, notice.videoUrl, notice.vipFlag, notice.uuid?notice.uuid:@"",notice.author];
             BOOL res = [db executeUpdate:sql];
             if (!res) {
                 return NO;
@@ -184,7 +184,7 @@ static DBAction *instance = nil;
 - (BOOL)deleteTable:(NSString *)tableName notice:(TableData*)notice{
     if ([db open]) {
         tableName = [tableName substringToIndex:2];
-        NSString * sql = [NSString stringWithFormat:@"DELETE FROM %@DATATABLE where cmsContentId = %d",tableName.uppercaseString,notice.cmsContentId];
+        NSString * sql = [NSString stringWithFormat:@"DELETE FROM %@SDATATABLE where cmsContentId = %d",tableName.uppercaseString,notice.cmsContentId];
         BOOL res = [db executeUpdate:sql];
         if (!res) {
             return NO;
@@ -200,7 +200,7 @@ static DBAction *instance = nil;
     NSMutableArray *list = [[NSMutableArray alloc] init];
     if ([db open]) {
         tableName = [tableName substringToIndex:2];
-        NSString *sql = [NSString  stringWithFormat:@"SELECT * FROM %@DATATABLE",tableName.uppercaseString];
+        NSString *sql = [NSString  stringWithFormat:@"SELECT * FROM %@SDATATABLE",tableName.uppercaseString];
         FMResultSet * rs = [db executeQuery:sql];
         while ([rs next]) {
             TableData * notice = [[TableData alloc] init];
@@ -212,6 +212,7 @@ static DBAction *instance = nil;
             notice.gxbArticleId  = [rs    intForColumn:@"gxbArticleId"];
             notice.gxbVideoId    = [rs    intForColumn:@"gxbVideoId"];
             notice.img           = [rs stringForColumn:@"img"];
+            notice.imgSmall      = [rs stringForColumn:@"imgSmall"];
             notice.pageUrl       = [rs stringForColumn:@"pageUrl"];
             notice.picType       = [rs stringForColumn:@"picType"];
             notice.playType      = [rs stringForColumn:@"playType"];
@@ -224,6 +225,7 @@ static DBAction *instance = nil;
             notice.uploadVideoUrl= [rs stringForColumn:@"uploadVideoUrl"];
             notice.videoUrl      = [rs stringForColumn:@"videoUrl"];
             notice.vipFlag       = [rs    intForColumn:@"vipFlag"];
+            notice.author        = [rs stringForColumn:@"author"];
             [list addObject:notice];
         }
         [db close];
@@ -24,6 +24,7 @@
 @property(nonatomic, assign) int gxbArticleId;
 @property(nonatomic, assign) int gxbVideoId;
 @property(nonatomic, copy) NSString *img;
+@property(nonatomic, copy) NSString *imgSmall;
 @property(nonatomic, copy) NSString *pageUrl;
 @property(nonatomic, copy) NSString *picType;
 @property(nonatomic, copy) NSString *playType;
@@ -102,6 +102,11 @@
     }else{
         self.img = [jsonDic objectForKey:@"img"];
     }
+    if ([jsonDic objectForKey:@"imgSmall"] == [NSNull null]) {
+        self.imgSmall = @"";
+    }else{
+        self.imgSmall = [jsonDic objectForKey:@"imgSmall"];
+    }
     if ([jsonDic objectForKey:@"pageUrl"] == [NSNull null]) {
         self.pageUrl = @"";
     }else{
@@ -167,11 +172,11 @@
         self.uuid = [jsonDic objectForKey:@"uuid"];
     }
-//    if ([jsonDic objectForKey:@"author"] == [NSNull null]) {
-//        self.author = @"";
-//    }else{
-//        self.author = [jsonDic objectForKey:@"author"];
-//    }
+    if ([jsonDic objectForKey:@"author"] == [NSNull null]) {
+        self.author = @"";
+    }else{
+        self.author = [jsonDic objectForKey:@"author"];
+    }
     return self;
 }
@@ -186,6 +191,7 @@
     [dic setObject:[NSNumber numberWithInt:self.gxbArticleId] forKey:@"gxbArticleId"];
     [dic setObject:[NSNumber numberWithInt:self.gxbVideoId]  forKey:@"gxbVideoId"];
     [dic setObject:self.img forKey:@"img"];
+    [dic setObject:self.imgSmall forKey:@"imgSmall"];
     [dic setObject:self.pageUrl forKey:@"pageUrl"];
     [dic setObject:self.picType forKey:@"picType"];
     [dic setObject:self.playType?self.playType:@"" forKey:@"playType"];
@@ -199,7 +205,7 @@
     [dic setObject:self.uploadVideoUrl forKey:@"uploadVideoUrl"];
     [dic setObject:self.videoUrl forKey:@"videoUrl"];
     [dic setObject:[NSNumber numberWithInt:self.vipFlag] forKey:@"vipFlag"];
-//    [dic setObject:self.author forKey:@"author"];
+    [dic setObject:self.author forKey:@"author"];
     return [NSDictionary dictionaryWithDictionary:dic];
 }
 @end