From a8c9c23a8232503ec7ead6773fa107ddf97300e7 Mon Sep 17 00:00:00 2001 From: tonychan Date: Fri, 15 Dec 2023 14:52:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dauto=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8239c07e7fc77f955e2d9c98a00316effbc467cd --- Podfile.lock | 10 +++++----- .../Video/P2P/Controller/TIoTDemoPreviewDeviceVC.m | 4 ++-- Source/SDK/LinkVideo/TIoTCoreXP2PBridge.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index f79313e5..799aef52 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -34,12 +34,12 @@ PODS: - TIoTLinkKit_SoundTouch (1.0.0) - TIoTLinkKit_TPNS (1.0.1) - TIoTLinkKit_WechatOpenSDK (1.0.1) - - TIoTLinkKit_XP2P (2.4.41-beta.202311171404) + - TIoTLinkKit_XP2P (2.4.41-beta.202312130924) - TIoTLinkVideo (1.0.0): - CocoaAsyncSocket (= 7.6.5) - TIoTLinkKit_FLV (= 2.2.3) - TIoTLinkKit_SoundTouch (= 1.0.0) - - TIoTLinkKit_XP2P (= 2.4.41-beta.202311171404) + - TIoTLinkKit_XP2P (= 2.4.41-beta.202312130924) - TPCircularBuffer (= 1.6.1) - TPCircularBuffer (1.6.1) - TrueTime (5.0.3) @@ -129,8 +129,8 @@ SPEC CHECKSUMS: TIoTLinkKit_SoundTouch: cf79ae182b6c2349ff65bac7a338974bc538fa77 TIoTLinkKit_TPNS: 7cea4fc1d20ef6c4c11c4f0b66bbb10ecf4ed968 TIoTLinkKit_WechatOpenSDK: 7822d68cc5c46edf3f6020422202e7b65ea87614 - TIoTLinkKit_XP2P: 3a532df30aa3bcc8b37c7a7530571dd946bb6ebe - TIoTLinkVideo: 796a8f10a4e758e7883a34b824874dbac994205e + TIoTLinkKit_XP2P: 6e00d6545667cccafa048782ac845adadbc7938d + TIoTLinkVideo: f4da22229441d26383f34e706c38c54d1dabf4d7 TPCircularBuffer: c13243556527551c4d320709c7b14a6d20cdc30a TrueTime: b49551ffafb28a9dee04e51b226f42a416010842 TXLiteAVSDK_TRTC: e3383a81565e8bb2aaaaab4bd099ad5239cd5b2d @@ -139,4 +139,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 95ffca92ec8b202bbdbc55483f99d1e36de5f78a -COCOAPODS: 1.9.3 +COCOAPODS: 1.14.3 diff --git a/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoPreviewDeviceVC.m b/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoPreviewDeviceVC.m index 014875ad..cae4d139 100644 --- a/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoPreviewDeviceVC.m +++ b/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoPreviewDeviceVC.m @@ -127,8 +127,8 @@ - (void)viewDidLoad { [self setupPreViewViews]; TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment]; - //sensor_timeout:6 表示6s后没ready就切tcp模式 - int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:self.deviceName?:@"" sensor_timeout:6]; + + int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:self.deviceName?:@""]; if (errorcode == XP2P_ERR_VERSION) { UIAlertController *alertC = [UIAlertController alertControllerWithTitle:@"APP SDK 版本与设备端 SDK 版本号不匹配,版本号需前两位保持一致" message:nil preferredStyle:(UIAlertControllerStyleAlert)]; UIAlertAction *alertA = [UIAlertAction actionWithTitle:@"确定" style:(UIAlertActionStyleDefault) handler:^(UIAlertAction * _Nonnull action) { diff --git a/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.h b/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.h index d7bf9305..133510d5 100644 --- a/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.h +++ b/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.h @@ -74,7 +74,7 @@ extern NSNotificationName const TIoTCoreXP2PBridgeNotificationStreamEnd; /* * 启动 sdk 服务,productid和devicename可以从video控制台创建得倒 - * sensor_timeout: 探测失败切换tcp的超时时间,最小3s,默认5s + * type: 默认auto模式,udp探测不通自动切换至tcp */ - (XP2PErrCode)startAppWith:(NSString *)pro_id dev_name:(NSString *)dev_name; - (XP2PErrCode)startAppWith:(NSString *)pro_id dev_name:(NSString *)dev_name type:(XP2PProtocolType)type;