no message

iOS-Xiaowen
1 parent e42d0947
Showing 3 changed files with 10 additions and 4 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
CNLiveScioLive/Pages/Live/Controller/VideoPlayBackViewController.m
CNLiveScioLive/Pages/My/我的收藏/Controller/CNLiveMyCollectionViewController.m
@@ -3635,7 +3635,7 @@
 					"$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/SinaWeiboSDK",
 					"$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
 				);
-				MARKETING_VERSION = 3.6.2;
+				MARKETING_VERSION = 3.6.3;
 				PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3688,7 +3688,7 @@
 					"$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/SinaWeiboSDK",
 					"$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
 				);
-				MARKETING_VERSION = 3.6.2;
+				MARKETING_VERSION = 3.6.3;
 				PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -25,7 +25,7 @@
     [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[@"videoFlag"] isEqualToString:@"1"]) {
@@ -243,7 +243,7 @@
     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:@"createDate"], CustomStr(@"Source"), [_dictionary objectForKey:@"author"]];
+    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:@"createDate"], CustomStr(@"Source"), [_dictionary objectForKey:@"author"]?[_dictionary objectForKey:@"author"]:@"国新客户端"];
     NSString* htmlFooter = [[NSString alloc] initWithFormat:@"<div class=\"logo\" style=\"text-indent:2em\">%@</div></body></html>",[_dictionary objectForKey:@"desc"]];
     NSString* strHtml = [[NSString alloc] initWithFormat:@"%@%@",htmlHeader,htmlFooter];
@@ -11,6 +11,7 @@
 #import "CNMyAnnouncementsModel.h"//cell赋值
 #import "CNHomeModel.h"//跳转
+#import "VideoPlayBackViewController.h"
 @interface CNLiveMyCollectionViewController ()<UITableViewDelegate,UITableViewDataSource>
 @property (nonatomic, strong) UITableView *tableView;
@@ -125,6 +126,11 @@ static NSString *myAnnouncementsTableViewCell = @&quot;CNMyAnnouncementsTableViewCell
         vc.hidesBottomBarWhenPushed = YES;
         [self.navigationController pushViewController:vc animated:YES];
+    } else {
+        VideoPlayBackViewController *vc = [[VideoPlayBackViewController alloc] initWithDictionary:_dic];
+        vc.title = model.cmsColumnName;
+        vc.hidesBottomBarWhenPushed = YES;
+        [self.navigationController pushViewController:vc animated:YES];
     }
 //    if ([homeModel.type isEqualToString:@"program"]) {