Commit 800dfcec3dedb76d04871a1f41ff43e31b21dce0
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/ScioLive
Showing
2 changed files
with
10 additions
and
11 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
| @@ -3598,9 +3598,9 @@ | @@ -3598,9 +3598,9 @@ | ||
| 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 = "Apple Development"; | ||
| 3602 | - CODE_SIGN_STYLE = Automatic; | ||
| 3603 | - CURRENT_PROJECT_VERSION = 373; | 3601 | + CODE_SIGN_IDENTITY = "iPhone Distribution"; |
| 3602 | + CODE_SIGN_STYLE = Manual; | ||
| 3603 | + CURRENT_PROJECT_VERSION = 374; | ||
| 3604 | DEVELOPMENT_TEAM = 94X49GG3ZW; | 3604 | DEVELOPMENT_TEAM = 94X49GG3ZW; |
| 3605 | ENABLE_BITCODE = NO; | 3605 | ENABLE_BITCODE = NO; |
| 3606 | FRAMEWORK_SEARCH_PATHS = ( | 3606 | FRAMEWORK_SEARCH_PATHS = ( |
| @@ -3635,10 +3635,10 @@ | @@ -3635,10 +3635,10 @@ | ||
| 3635 | "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/SinaWeiboSDK", | 3635 | "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/SinaWeiboSDK", |
| 3636 | "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK", | 3636 | "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK", |
| 3637 | ); | 3637 | ); |
| 3638 | - MARKETING_VERSION = 3.5.9; | 3638 | + MARKETING_VERSION = 3.6.0; |
| 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 = ""; | 3641 | + PROVISIONING_PROFILE_SPECIFIER = SCIOLiveDis_AppStore; |
| 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,9 +3651,9 @@ | @@ -3651,9 +3651,9 @@ | ||
| 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 = "Apple Development"; | ||
| 3655 | - CODE_SIGN_STYLE = Automatic; | ||
| 3656 | - CURRENT_PROJECT_VERSION = 373; | 3654 | + CODE_SIGN_IDENTITY = "iPhone Distribution"; |
| 3655 | + CODE_SIGN_STYLE = Manual; | ||
| 3656 | + CURRENT_PROJECT_VERSION = 374; | ||
| 3657 | DEVELOPMENT_TEAM = 94X49GG3ZW; | 3657 | DEVELOPMENT_TEAM = 94X49GG3ZW; |
| 3658 | ENABLE_BITCODE = NO; | 3658 | ENABLE_BITCODE = NO; |
| 3659 | FRAMEWORK_SEARCH_PATHS = ( | 3659 | FRAMEWORK_SEARCH_PATHS = ( |
| @@ -3688,10 +3688,10 @@ | @@ -3688,10 +3688,10 @@ | ||
| 3688 | "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/SinaWeiboSDK", | 3688 | "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/SinaWeiboSDK", |
| 3689 | "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK", | 3689 | "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK", |
| 3690 | ); | 3690 | ); |
| 3691 | - MARKETING_VERSION = 3.5.9; | 3691 | + MARKETING_VERSION = 3.6.0; |
| 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 = ""; | 3694 | + PROVISIONING_PROFILE_SPECIFIER = SCIOLiveDis_AppStore; |
| 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
| @@ -7,7 +7,6 @@ | @@ -7,7 +7,6 @@ | ||
| 7 | // | 7 | // |
| 8 | #import "JSONKit.h" | 8 | #import "JSONKit.h" |
| 9 | #import "GraphicLiveViewController.h" | 9 | #import "GraphicLiveViewController.h" |
| 10 | -//#import "OldVideoDetailViewController.h" | ||
| 11 | #import "VideoPlayBackViewController.h" | 10 | #import "VideoPlayBackViewController.h" |
| 12 | 11 | ||
| 13 | @interface GraphicLiveViewController ()<CNLivePlayerControllerDelegate> | 12 | @interface GraphicLiveViewController ()<CNLivePlayerControllerDelegate> |