浏览代码

1.更新音视频可以修复多指触控断流问题
2.推拉流页面 去掉边框滑动延时效果(即现在手指在边缘一滑动就进入后台 ) 这个跟新的音视频指令有冲突 (修复横屏后台回到前台触控无效问题)

huangxiaodong 3 月之前
父节点
当前提交
bf8d956c36

+ 3 - 0
创维盒子/code/webRtc/WebRTC.framework/Headers/AMediaStream.h

@@ -113,6 +113,9 @@ cardDensity:(NSInteger)cardDensity
         videoHeight:(NSInteger)videoHeight
           frameRate:(NSInteger)frameRate;
 
+- (void)enterBackground;
+- (void)enterForeground;
+
 @property (nonatomic, weak) id <MediaStreamClientEventsDelegate> eventDelegate;
 @property(nonatomic,readonly) NSString *name;
 @property(nonatomic, assign) BOOL shouldGetStats;

二进制
创维盒子/code/webRtc/WebRTC.framework/WebRTC


+ 2 - 2
创维盒子/code/webRtc/WebRTC.framework/_CodeSignature/CodeResources

@@ -6,7 +6,7 @@
 	<dict>
 		<key>Headers/AMediaStream.h</key>
 		<data>
-		iccGd8P+Ogdc55tvecZMrwfuEMg=
+		otaFvzfy8p6LbYx2yhs1dQzO/+c=
 		</data>
 		<key>Headers/ANatsSignalChannel.h</key>
 		<data>
@@ -387,7 +387,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			mhlzbDwvBC+rAWrrAI717Rx5YqBLYiTQ9PUNMlZbW/E=
+			eMAh5vOyUVug0G5qjGOEXD0WWvo50X3yXa41KhJl3T4=
 			</data>
 		</dict>
 		<key>Headers/ANatsSignalChannel.h</key>

+ 1 - 0
创维盒子/code/webRtc/webRtcPlayerViewController+AppDelegate.m

@@ -16,6 +16,7 @@
 }
 
 - (void)applicationDidEnterBackground:(NSNotification *)notification {
+    [self.mediaStream enterBackground];
     //  app进入后台时
     [self pauseStream];
     [self checkLanAndPrivacyModeTypeFun];

+ 7 - 4
创维盒子/code/webRtc/webRtcPlayerViewController.m

@@ -317,7 +317,10 @@
 
 #pragma mark 重连
 - (void)relinkWebRtcFunByBecomeActive{
-    [self.mediaStream disconnect];// 断开会自动重连 防止多路流的清理
+    //[self.mediaStream disconnect];// 断开会自动重连 防止多路流的清理
+    
+    [self.mediaStream enterForeground];
+    [self resumeStream];
 }
 
 #pragma mark 初始化其他UI
@@ -1469,9 +1472,9 @@
 }
 
 //延迟系统触摸事件
-- (UIRectEdge)preferredScreenEdgesDeferringSystemGestures{
-    return UIRectEdgeAll;
-}
+//- (UIRectEdge)preferredScreenEdgesDeferringSystemGestures{
+//    return UIRectEdgeAll;
+//}
 
 
 #pragma mark 检测盒子的心跳情况

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

@@ -5770,7 +5770,7 @@
 				CODE_SIGN_ENTITLEMENTS = "计算器.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 25;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -5832,7 +5832,7 @@
 					"$(PROJECT_DIR)/code/Vendor/UDP/RayProxy",
 					"$(PROJECT_DIR)/RayProxy",
 				);
-				MARKETING_VERSION = 1.4.3.1;
+				MARKETING_VERSION = 1.4.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.x.box;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -5854,7 +5854,7 @@
 				CODE_SIGN_ENTITLEMENTS = "计算器.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 25;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -5916,7 +5916,7 @@
 					"$(PROJECT_DIR)/code/Vendor/UDP/RayProxy",
 					"$(PROJECT_DIR)/RayProxy",
 				);
-				MARKETING_VERSION = 1.4.3.1;
+				MARKETING_VERSION = 1.4.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.x.box;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -6052,7 +6052,7 @@
 				CODE_SIGN_ENTITLEMENTS = "隐私保护.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 24;
+				CURRENT_PROJECT_VERSION = 25;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -6131,7 +6131,7 @@
 				CODE_SIGN_ENTITLEMENTS = "隐私保护.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 24;
+				CURRENT_PROJECT_VERSION = 25;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",