Merge branch 'release-3.0.6' of https://jygit.jydev.jianyu360.cn/qmx/jyiosapp into release-3.0.6

# Conflicts:
#	ios/JianYuIOS/JianYuIOS/BaseClass1/PrefixHeader.pch
#	ios/JianYuIOS/JianYuIOS/Info.plist

ios/JianYuIOS/JianYuIOS.xcodeproj/project.pbxproj

@@ -1192,7 +1192,7 @@
 					"$(PROJECT_DIR)/JianYuIOS/Libs(第三方)/UMSPosPayOnly",
 					"$(PROJECT_DIR)/JianYuIOS/Libs(第三方)/UPPaymentControl",
 				);
-				MARKETING_VERSION = 3.0.6;
+				MARKETING_VERSION = 3.0.8;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = (
@@ -1282,7 +1282,7 @@
 					"$(PROJECT_DIR)/JianYuIOS/Libs(第三方)/UMSPosPayOnly",
 					"$(PROJECT_DIR)/JianYuIOS/Libs(第三方)/UPPaymentControl",
 				);
-				MARKETING_VERSION = 3.0.6;
+				MARKETING_VERSION = 3.0.8;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = (

ios/JianYuIOS/JianYuIOS/BaseClass1/PrefixHeader.pch

@@ -176,9 +176,9 @@ _Pragma("clang diagnostic pop")\
 //测试1
 //#define kHost @"https://app-jytest.jydev.jianyu360.com/"
 //测试2
-//#define kHost @"https://app2-jytest.jydev.jianyu360.com/"
+#define kHost @"https://app2-jytest.jydev.jianyu360.com/"
 //测试5
- #define kHost @"https://app5-jytest.jydev.jianyu360.com/"
+//#define kHost @"https://app5-jytest.jydev.jianyu360.com/"
 //测试
 //#define kHost @"https://webdev-webtest.jydev.jianyu360.com/"
 

ios/JianYuIOS/JianYuIOS/Info.plist

@@ -152,11 +152,18 @@
 		<string>armv7</string>
 	</array>
 	<key>UIRequiresFullScreen</key>
-	<true/>
+	<false/>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
 </dict>