iOS Team / ScioLive · Commits

Commit 8481fc3b056f969ef3eec7876b23b766c02dc38e

Authored by zhangxiaowen
2 parents 78cc6174 7ab93f1d

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

Inline Side-by-side
Showing 2 changed files with 6 additions and 2 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
  View file @8481fc3
@@ -3637,6 +3637,7 @@ @@ -3637,6 +3637,7 @@
3637 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements; 3637 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
3638 CODE_SIGN_IDENTITY = "Apple Development"; 3638 CODE_SIGN_IDENTITY = "Apple Development";
3639 CODE_SIGN_STYLE = Automatic; 3639 CODE_SIGN_STYLE = Automatic;
  3640 + CURRENT_PROJECT_VERSION = 365;
3640 DEVELOPMENT_TEAM = 94X49GG3ZW; 3641 DEVELOPMENT_TEAM = 94X49GG3ZW;
3641 ENABLE_BITCODE = NO; 3642 ENABLE_BITCODE = NO;
3642 FRAMEWORK_SEARCH_PATHS = ( 3643 FRAMEWORK_SEARCH_PATHS = (
@@ -3671,6 +3672,7 @@ @@ -3671,6 +3672,7 @@
3671 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/SinaWeiboSDK", 3672 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/SinaWeiboSDK",
3672 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK", 3673 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
3673 ); 3674 );
  3675 + MARKETING_VERSION = 3.5.5;
3674 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1; 3676 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
3675 PRODUCT_NAME = "$(TARGET_NAME)"; 3677 PRODUCT_NAME = "$(TARGET_NAME)";
3676 PROVISIONING_PROFILE_SPECIFIER = ""; 3678 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3687,6 +3689,7 @@ @@ -3687,6 +3689,7 @@
3687 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements; 3689 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
3688 CODE_SIGN_IDENTITY = "Apple Development"; 3690 CODE_SIGN_IDENTITY = "Apple Development";
3689 CODE_SIGN_STYLE = Automatic; 3691 CODE_SIGN_STYLE = Automatic;
  3692 + CURRENT_PROJECT_VERSION = 365;
3690 DEVELOPMENT_TEAM = 94X49GG3ZW; 3693 DEVELOPMENT_TEAM = 94X49GG3ZW;
3691 ENABLE_BITCODE = NO; 3694 ENABLE_BITCODE = NO;
3692 FRAMEWORK_SEARCH_PATHS = ( 3695 FRAMEWORK_SEARCH_PATHS = (
@@ -3721,6 +3724,7 @@ @@ -3721,6 +3724,7 @@
3721 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/SinaWeiboSDK", 3724 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/SinaWeiboSDK",
3722 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK", 3725 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
3723 ); 3726 );
  3727 + MARKETING_VERSION = 3.5.5;
3724 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1; 3728 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
3725 PRODUCT_NAME = "$(TARGET_NAME)"; 3729 PRODUCT_NAME = "$(TARGET_NAME)";
3726 PROVISIONING_PROFILE_SPECIFIER = ""; 3730 PROVISIONING_PROFILE_SPECIFIER = "";
CNLiveScioLive/Info.plist
  View file @8481fc3
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 <key>CFBundlePackageType</key> 17 <key>CFBundlePackageType</key>
18 <string>APPL</string> 18 <string>APPL</string>
19 <key>CFBundleShortVersionString</key> 19 <key>CFBundleShortVersionString</key>
20 - <string>3.5.4</string> 20 + <string>$(MARKETING_VERSION)</string>
21 <key>CFBundleURLTypes</key> 21 <key>CFBundleURLTypes</key>
22 <array> 22 <array>
23 <dict> 23 <dict>
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
54 </dict> 54 </dict>
55 </array> 55 </array>
56 <key>CFBundleVersion</key> 56 <key>CFBundleVersion</key>
57 - <string>360</string> 57 + <string>$(CURRENT_PROJECT_VERSION)</string>
58 <key>LSApplicationQueriesSchemes</key> 58 <key>LSApplicationQueriesSchemes</key>
59 <array> 59 <array>
60 <string>alipay</string> 60 <string>alipay</string>