Merge branch 'Private-X_1.4.2_webrtc' into Private-X_1.4.3_nas

# Conflicts:
#	创维盒子/双子星云手机.xcodeproj/project.pbxproj

创维盒子/双子星云手机/AppDelegate/PrefixHeader.pch

@@ -108,16 +108,16 @@ isBangsScreen; \
 //#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: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://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"
 

创维盒子/双子星云手机/webRtc/webRtcPlayerViewController.m

@@ -184,11 +184,11 @@
                             ice:ice
                              sn:roomName
                          direct:0
-                            fmt:1//1(h264) 5(h265)
+                            fmt:5//1(h264) 5(h265)
                      videoWidth:(NSInteger)phoneSize.width
                     videoHeight:(NSInteger)phoneSize.height
                             fps:30
-                        bitrate:1800//3200//3000
+                        bitrate:8*1024//3200//3000
                       cardWidth:(NSInteger)phoneSize.width//0//1080//0
                      cardHeight:(NSInteger)phoneSize.height//0//1920//0
                     cardDensity:0