From 3af17d226aafee8dc33382db72bb16df827e84ea Mon Sep 17 00:00:00 2001 From: eagleychen Date: Thu, 11 Apr 2024 17:22:55 +0800 Subject: [PATCH] update p2pcore --- Podfile.lock | 8 ++++---- Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm | 14 +++++++------- TIoTLinkVideo.podspec | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 504c9812..80cc0db0 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -35,13 +35,13 @@ PODS: - TIoTLinkKit_SoundTouch (1.0.0) - TIoTLinkKit_TPNS (1.0.1) - TIoTLinkKit_WechatOpenSDK (1.0.1) - - TIoTLinkKit_XP2P (2.4.49-beta.202404030347) + - TIoTLinkKit_XP2P (2.4.48) - TIoTLinkVideo (1.0.0): - CocoaAsyncSocket (= 7.6.5) - TIoTLinkKit_FLV (= 2.2.3) - TIoTLinkKit_GVoiceSE (>= 1.0.7) - TIoTLinkKit_SoundTouch (= 1.0.0) - - TIoTLinkKit_XP2P (= 2.4.49-beta.202404030347) + - TIoTLinkKit_XP2P (= 2.4.48) - TPCircularBuffer (= 1.6.1) - TPCircularBuffer (1.6.1) - TrueTime (5.0.3) @@ -133,8 +133,8 @@ SPEC CHECKSUMS: TIoTLinkKit_SoundTouch: cf79ae182b6c2349ff65bac7a338974bc538fa77 TIoTLinkKit_TPNS: 7cea4fc1d20ef6c4c11c4f0b66bbb10ecf4ed968 TIoTLinkKit_WechatOpenSDK: 7822d68cc5c46edf3f6020422202e7b65ea87614 - TIoTLinkKit_XP2P: 16fd829843f131d04cb5818876a9781a0ce8c0eb - TIoTLinkVideo: 5ff6119d41629f738ed55dafa3cd6409d6ba07d4 + TIoTLinkKit_XP2P: a0ca1277281c89eb2168aac08886d6e8a10b5fca + TIoTLinkVideo: 85a49e8716f9ba7108a9d6d44c3e0d4d885ffa03 TPCircularBuffer: c13243556527551c4d320709c7b14a6d20cdc30a TrueTime: b49551ffafb28a9dee04e51b226f42a416010842 TXLiteAVSDK_TRTC: e3383a81565e8bb2aaaaab4bd099ad5239cd5b2d diff --git a/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm b/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm index 3a33cf58..9e6dcc64 100644 --- a/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm +++ b/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm @@ -236,11 +236,11 @@ - (XP2PErrCode)startAppWith:(NSString *)pro_id dev_name:(NSString *)dev_name typ // setStunServerToXp2p("11.11.11.11", 111); // setLogEnable(false, false); - NSString *nsstr_user_id = [self getAppUUID]; - setContentDetail([self dicConvertString:@{@"good":@"morning", @"str_user_id":nsstr_user_id }], - [self dicConvertString:@{@"better": @"afternnn"}]); - [self stopReport]; - _reportTimer = [NSTimer scheduledTimerWithTimeInterval:60 target:self selector:@selector(doTick) userInfo:nil repeats:YES]; +// NSString *nsstr_user_id = [self getAppUUID]; +// setContentDetail([self dicConvertString:@{@"good":@"morning", @"str_user_id":nsstr_user_id }], +// [self dicConvertString:@{@"better": @"afternnn"}]); +// [self stopReport]; +// _reportTimer = [NSTimer scheduledTimerWithTimeInterval:60 target:self selector:@selector(doTick) userInfo:nil repeats:YES]; NSString *fileName = @"stun.txt"; NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); @@ -600,7 +600,7 @@ - (NSString *)readKeychainValue:(NSString *)sKey return ret; } -- (void)doTick { +- (void)doTick {/* data_report_t tmpcontent = getContentData(); printf("wwwwww===%s\n",tmpcontent.report_buf); NSData *body = [NSData dataWithBytes:tmpcontent.report_buf length:tmpcontent.report_size]; @@ -618,7 +618,7 @@ - (void)doTick { NSLog(@"log event: %@",response); } }]; - [task resume]; + [task resume];*/ } + (NSString *)getSDKVersion { diff --git a/TIoTLinkVideo.podspec b/TIoTLinkVideo.podspec index 48034a14..4e9692bd 100644 --- a/TIoTLinkVideo.podspec +++ b/TIoTLinkVideo.podspec @@ -19,7 +19,7 @@ Pod::Spec.new do |s| s.source_files = 'Source/SDK/LinkVideo/**/*.{h,m,c,mm}' s.resource = 'Source/SDK/LinkVideo/FLV/asset/GvoiceSE_v1_239-119-oneref-e.nn' - s.dependency 'TIoTLinkKit_XP2P', '2.4.49-beta.202404030347' + s.dependency 'TIoTLinkKit_XP2P', '2.4.48' s.dependency 'TIoTLinkKit_FLV', '2.2.3' s.dependency 'CocoaAsyncSocket', '7.6.5' s.dependency 'TIoTLinkKit_SoundTouch', '1.0.0'