iOS Team / ScioLive · Commits

Commit 04cc58d89891a5e693e92ae37bda27c53bf847a8

Authored by iOS-Xiaowen
1 parent 9e452e07

no message

Inline Side-by-side
Showing 2 changed files with 9 additions and 8 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
  View file @04cc58d
@@ -3598,8 +3598,8 @@ @@ -3598,8 +3598,8 @@
3598 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 3598 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
3599 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; 3599 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
3600 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements; 3600 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
3601 - CODE_SIGN_IDENTITY = "iPhone Distribution";  
3602 - CODE_SIGN_STYLE = Manual; 3601 + CODE_SIGN_IDENTITY = "Apple Development";
  3602 + CODE_SIGN_STYLE = Automatic;
3603 CURRENT_PROJECT_VERSION = 373; 3603 CURRENT_PROJECT_VERSION = 373;
3604 DEVELOPMENT_TEAM = 94X49GG3ZW; 3604 DEVELOPMENT_TEAM = 94X49GG3ZW;
3605 ENABLE_BITCODE = NO; 3605 ENABLE_BITCODE = NO;
@@ -3638,7 +3638,7 @@ @@ -3638,7 +3638,7 @@
3638 MARKETING_VERSION = 3.5.9; 3638 MARKETING_VERSION = 3.5.9;
3639 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1; 3639 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
3640 PRODUCT_NAME = "$(TARGET_NAME)"; 3640 PRODUCT_NAME = "$(TARGET_NAME)";
3641 - PROVISIONING_PROFILE_SPECIFIER = SCIOLiveDis_AppStore; 3641 + PROVISIONING_PROFILE_SPECIFIER = "";
3642 TARGETED_DEVICE_FAMILY = 1; 3642 TARGETED_DEVICE_FAMILY = 1;
3643 VALID_ARCHS = "arm64 arm64e armv7s"; 3643 VALID_ARCHS = "arm64 arm64e armv7s";
3644 }; 3644 };
@@ -3651,8 +3651,8 @@ @@ -3651,8 +3651,8 @@
3651 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 3651 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
3652 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; 3652 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
3653 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements; 3653 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
3654 - CODE_SIGN_IDENTITY = "iPhone Distribution";  
3655 - CODE_SIGN_STYLE = Manual; 3654 + CODE_SIGN_IDENTITY = "Apple Development";
  3655 + CODE_SIGN_STYLE = Automatic;
3656 CURRENT_PROJECT_VERSION = 373; 3656 CURRENT_PROJECT_VERSION = 373;
3657 DEVELOPMENT_TEAM = 94X49GG3ZW; 3657 DEVELOPMENT_TEAM = 94X49GG3ZW;
3658 ENABLE_BITCODE = NO; 3658 ENABLE_BITCODE = NO;
@@ -3691,7 +3691,7 @@ @@ -3691,7 +3691,7 @@
3691 MARKETING_VERSION = 3.5.9; 3691 MARKETING_VERSION = 3.5.9;
3692 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1; 3692 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
3693 PRODUCT_NAME = "$(TARGET_NAME)"; 3693 PRODUCT_NAME = "$(TARGET_NAME)";
3694 - PROVISIONING_PROFILE_SPECIFIER = SCIOLiveDis_AppStore; 3694 + PROVISIONING_PROFILE_SPECIFIER = "";
3695 TARGETED_DEVICE_FAMILY = 1; 3695 TARGETED_DEVICE_FAMILY = 1;
3696 VALID_ARCHS = "arm64 arm64e armv7s"; 3696 VALID_ARCHS = "arm64 arm64e armv7s";
3697 }; 3697 };
CNLiveScioLive/Pages/Live/Controller/GraphicLiveViewController.m
  View file @04cc58d
@@ -7,7 +7,8 @@ @@ -7,7 +7,8 @@
7 // 7 //
8 #import "JSONKit.h" 8 #import "JSONKit.h"
9 #import "GraphicLiveViewController.h" 9 #import "GraphicLiveViewController.h"
10 -#import "OldVideoDetailViewController.h" 10 +//#import "OldVideoDetailViewController.h"
  11 +#import "VideoPlayBackViewController.h"
11 12
12 @interface GraphicLiveViewController ()<CNLivePlayerControllerDelegate> 13 @interface GraphicLiveViewController ()<CNLivePlayerControllerDelegate>
13 @end 14 @end
@@ -547,7 +548,7 @@ @@ -547,7 +548,7 @@
547 UIButton *btn = (UIButton *)sender; 548 UIButton *btn = (UIButton *)sender;
548 NSDictionary *dic = self.relatedArray[btn.tag - 1000]; 549 NSDictionary *dic = self.relatedArray[btn.tag - 1000];
549 NSLog(@"%@",dic); 550 NSLog(@"%@",dic);
550 - OldVideoDetailViewController *vc = [[OldVideoDetailViewController alloc] initWithDictionary:dic]; 551 + VideoPlayBackViewController *vc = [[VideoPlayBackViewController alloc] initWithDictionary:dic];
551 vc.title = _dic[@"cmsColumnName"]; 552 vc.title = _dic[@"cmsColumnName"];
552 vc.hidesBottomBarWhenPushed = YES; 553 vc.hidesBottomBarWhenPushed = YES;
553 [self.navigationController pushViewController:vc animated:YES]; 554 [self.navigationController pushViewController:vc animated:YES];