Merge branch 'master' into Private-X_1.4.4_dep

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

@@ -6178,7 +6178,7 @@
 				CODE_SIGN_ENTITLEMENTS = "隐私保护.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -6257,7 +6257,7 @@
 				CODE_SIGN_ENTITLEMENTS = "隐私保护.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

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

@@ -120,8 +120,8 @@ isBangsScreen; \
 //弃用 #define shareService   @"http://hiboxde.armclouding.com:7780/h5/#/pages/fileSharing/index?productType=Private-X&token="
 
 //生产环境 1.4.3 开始使用
-//#define CloudService   @"http://hiboxde.androidscloud.com:7780"
-//#define shareService   @"http://hiboxde.androidscloud.com:7780/h5/#/pages/fileSharing/index?productType=Private-X&token="
+#define CloudService   @"http://hiboxde.androidscloud.com:7780"
+#define shareService   @"http://hiboxde.androidscloud.com:7780/h5/#/pages/fileSharing/index?productType=Private-X&token="
 
 
 #define AESCODEKEEYY @"fvO8gAfNSr1tbdQe"

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

@@ -386,7 +386,7 @@
             
             if(!_didReportWebRtcType){//还没上报过通道链接情况
                 tryRelinkNum ++;
-                if(tryRelinkNum == 6){
+                if(tryRelinkNum == 3){
                     tryRelinkNum = 0;
                     _didReportWebRtcType = YES;
                     [[webRtcManager shareManager] reportWebRtcRePoportTypeIsChannel:YES withStats:nil];