Merge branch 'yinhe-live-1212' of...

Merge branch 'yinhe-live-1212' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into yinhe-live-1212

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -7216,7 +7216,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 17;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -7360,7 +7360,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 17;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -7567,7 +7567,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 17;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -7614,7 +7614,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 17;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (

galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/C/YHLivePlayerViewController.swift

@@ -471,6 +471,7 @@ class YHLivePlayerViewController: YHBasePlayerViewController {
             let vc = YHH5WebViewVC()
             vc.url = tUrl
             vc.isHideNavigationBar = false
+            vc.isFullScreenFlag = false
             goodsListView?.dismiss()
             navigationController?.pushViewController(vc)
         }

galaxy/galaxy/Classes/Tools/Helper/YhConstant.swift

@@ -294,7 +294,18 @@ extension YhConstant {
     }
     
     struct AgoraRtcKit {
-        static let appId: String = "f1da9c5b9fb946148761278273f43a14"
+        
+#if DEBUG
+        static let appId: String = "84bcfa8857944dc58eca80d966a055ae" //测试环境
+#elseif TESTENV
+        static let appId: String = "84bcfa8857944dc58eca80d966a055ae" //测试环境
+#elseif UATENV
+        static let appId: String = "84bcfa8857944dc58eca80d966a055ae" //正式环境
+#else
+        static let appId: String = "f1da9c5b9fb946148761278273f43a14" //正式环境
+#endif
+        
+        
     }
     
     // MARK: -  通知相关 名称