Selaa lähdekoodia

1.添加生产和预生产的webrtc域名
2.修复bug

huangxiaodong 8 kuukautta sitten
vanhempi
commit
4a10df19c5

+ 18 - 0
创维盒子/jiSuanQi_Info.plist

@@ -104,6 +104,24 @@
 		<true/>
 		<key>NSExceptionDomains</key>
 		<dict>
+			<key>boxwebrtcservice.phone.armclouding.com</key>
+			<dict>
+				<key>NSExceptionRequiresForwardSecrecy</key>
+				<false/>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+				<key>NSIncludesSubdomains</key>
+				<true/>
+			</dict>
+			<key>dev-boxwebrtcservice.phone.armclouding.com</key>
+			<dict>
+				<key>NSExceptionRequiresForwardSecrecy</key>
+				<false/>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+				<key>NSIncludesSubdomains</key>
+				<true/>
+			</dict>
 			<key>privatex.cloud.androidscloud.com</key>
 			<dict>
 				<key>NSExceptionRequiresForwardSecrecy</key>

+ 6 - 5
创维盒子/双子星云手机/AppDelegate/PrefixHeader.pch

@@ -103,20 +103,21 @@ isBangsScreen; \
 
 //#define CloudService           @"http://14.18.190.141:11180"
 //#define CloudService           @"http://14.18.190.141:1280"
-//创维盒子 测试地址
+//创维盒子 测试地址 弃用
 //#define CloudService   @"http://14.18.190.141:1801"
 //#define shareService   @"http://testprivacy.phone.armclouding.com:1801/h5/#/pages/fileSharing/index?productType=Private-X&token="
 
+//创维盒子 测试地址 正在使用
 //#define CloudService   @"http://testprivacy.phone.androidscloud.com:1801"
 //#define shareService   @"http://testprivacy.phone.androidscloud.com:1801/h5/#/pages/fileSharing/index?productType=Private-X&token="
 
 //预生产环境
-//#define CloudService   @"http://testprivacy.phone.androidscloud.com:10900"
-//#define shareService   @"http://testprivacy.phone.androidscloud.com:10900/h5/#/pages/fileSharing/index?productType=Private-X&token="
+#define CloudService   @"http://testprivacy.phone.androidscloud.com:10900"
+#define shareService   @"http://testprivacy.phone.androidscloud.com:10900/h5/#/pages/fileSharing/index?productType=Private-X&token="
 
 //生产环境
-#define CloudService   @"http://hiboxde.armclouding.com:7780"
-#define shareService   @"http://hiboxde.armclouding.com:7780/h5/#/pages/fileSharing/index?productType=Private-X&token="
+//#define CloudService   @"http://hiboxde.armclouding.com:7780"
+//#define shareService   @"http://hiboxde.armclouding.com:7780/h5/#/pages/fileSharing/index?productType=Private-X&token="
 
 #define AESCODEKEEYY @"fvO8gAfNSr1tbdQe"
 

+ 18 - 0
创维盒子/双子星云手机/Info.plist

@@ -104,6 +104,24 @@
 		<true/>
 		<key>NSExceptionDomains</key>
 		<dict>
+			<key>boxwebrtcservice.phone.armclouding.com</key>
+			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+				<key>NSExceptionRequiresForwardSecrecy</key>
+				<false/>
+				<key>NSIncludesSubdomains</key>
+				<true/>
+			</dict>
+			<key>dev-boxwebrtcservice.phone.armclouding.com</key>
+			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+				<key>NSExceptionRequiresForwardSecrecy</key>
+				<false/>
+				<key>NSIncludesSubdomains</key>
+				<true/>
+			</dict>
 			<key>privatex.cloud.androidscloud.com</key>
 			<dict>
 				<key>NSExceptionAllowsInsecureHTTPLoads</key>

+ 9 - 5
创维盒子/双子星云手机/webRtc/webRtcManager/webRtcManager.m

@@ -64,11 +64,15 @@
 #pragma mark 关闭链接
 - (void)closeLinkWebRtcFun
 {
-    KWeakSelf
-    mainBlock(^{
-        [weakSelf.mediaStream disconnect];
-    });
-    
+    if((_ConnectionState == RTCIceConnectionStateConnected
+      && _ConnectionState == RTCIceConnectionStateCompleted)
+      || _channelState == RTCDataChannelStateOpen)
+    {
+        KWeakSelf
+        mainBlock(^{
+            [weakSelf.mediaStream disconnect];
+        });
+    }
 }
 
 #pragma mark 开始链接

+ 6 - 0
创维盒子/双子星云手机/webRtc/webRtcPlayerViewController.m

@@ -77,6 +77,12 @@
     [self HandleSomethingByExitVC];
 }
 
+- (BOOL)shouldAutorotate {
+    // 根据你的需求来决定是否允许自动旋转
+    // 这里我们默认不允许,除非有特定的逻辑允许
+    return NO; // 或者根据某个条件返回YES
+}
+
 #pragma mark 退出事件处理
 -(void)HandleSomethingByExitVC
 {