iOS Team / ScioLive · Commits

Commit 32314807ebc8d69743390ba42884fbbd08bdb3f5

Authored by iOS-Xiaowen
1 parent e42d0947

no message

Inline Side-by-side
Showing 3 changed files with 10 additions and 4 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
  View file @3231480
... ... @@ -3635,7 +3635,7 @@
3635 3635 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/SinaWeiboSDK",
3636 3636 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
3637 3637 );
3638   - MARKETING_VERSION = 3.6.2;
  3638 + MARKETING_VERSION = 3.6.3;
3639 3639 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
3640 3640 PRODUCT_NAME = "$(TARGET_NAME)";
3641 3641 PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -3688,7 +3688,7 @@
3688 3688 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/SinaWeiboSDK",
3689 3689 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
3690 3690 );
3691   - MARKETING_VERSION = 3.6.2;
  3691 + MARKETING_VERSION = 3.6.3;
3692 3692 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
3693 3693 PRODUCT_NAME = "$(TARGET_NAME)";
3694 3694 PROVISIONING_PROFILE_SPECIFIER = "";
... ...
CNLiveScioLive/Pages/Live/Controller/VideoPlayBackViewController.m
  View file @3231480
... ... @@ -25,7 +25,7 @@
25 25 [self.videoController stop];
26 26 [self.navigationController popToRootViewControllerAnimated:YES];
27 27 }
28   -- (id)initWithDictionary:(NSDictionary*)dictionary{
  28 +- (id)initWithDictionary:(NSDictionary *)dictionary{
29 29 if (self = [super init]) {
30 30 _dictionary = [NSDictionary dictionaryWithDictionary:dictionary];
31 31 if ([_dictionary[@"videoFlag"] isEqualToString:@"1"]) {
... ... @@ -243,7 +243,7 @@
243 243 relatedWebView.tag = 1000;
244 244 [backgroundView addSubview:relatedWebView];
245 245  
246   - 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"]];
  246 + 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"]:@"国新客户端"];
247 247 NSString* htmlFooter = [[NSString alloc] initWithFormat:@"<div class=\"logo\" style=\"text-indent:2em\">%@</div></body></html>",[_dictionary objectForKey:@"desc"]];
248 248  
249 249 NSString* strHtml = [[NSString alloc] initWithFormat:@"%@%@",htmlHeader,htmlFooter];
... ...
CNLiveScioLive/Pages/My/我的收藏/Controller/CNLiveMyCollectionViewController.m
  View file @3231480
... ... @@ -11,6 +11,7 @@
11 11  
12 12 #import "CNMyAnnouncementsModel.h"//cell赋值
13 13 #import "CNHomeModel.h"//跳转
  14 +#import "VideoPlayBackViewController.h"
14 15  
15 16 @interface CNLiveMyCollectionViewController ()<UITableViewDelegate,UITableViewDataSource>
16 17 @property (nonatomic, strong) UITableView *tableView;
... ... @@ -125,6 +126,11 @@ static NSString *myAnnouncementsTableViewCell = @&quot;CNMyAnnouncementsTableViewCell
125 126 vc.hidesBottomBarWhenPushed = YES;
126 127 [self.navigationController pushViewController:vc animated:YES];
127 128  
  129 + } else {
  130 + VideoPlayBackViewController *vc = [[VideoPlayBackViewController alloc] initWithDictionary:_dic];
  131 + vc.title = model.cmsColumnName;
  132 + vc.hidesBottomBarWhenPushed = YES;
  133 + [self.navigationController pushViewController:vc animated:YES];
128 134 }
129 135  
130 136 // if ([homeModel.type isEqualToString:@"program"]) {
... ...