From e158819388551257e9adba6b6d75dedbb3010325 Mon Sep 17 00:00:00 2001 From: eagleychen Date: Thu, 18 Jul 2024 15:51:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96report?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Podfile.lock | 14 +++++++------- Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm | 5 +++-- TIoTLinkVideo.podspec | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index ee1c4909..ff414fff 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -30,18 +30,18 @@ PODS: - TXLiteAVSDK_TRTC (= 8.0.9644) - YYModel (= 1.0.4) - TIoTLinkKit_FLV (2.2.3) - - TIoTLinkKit_GVoiceSE (1.0.7) + - TIoTLinkKit_GVoiceSE (1.0.9-beta.202407161117) - TIoTLinkKit_IJKPlayer (2.0.14) - TIoTLinkKit_SoundTouch (1.0.0) - TIoTLinkKit_TPNS (1.0.1) - TIoTLinkKit_WechatOpenSDK (1.0.1) - - TIoTLinkKit_XP2P (2.4.49) + - TIoTLinkKit_XP2P (2.4.50-beta.202407120934) - TIoTLinkVideo (1.0.0): - CocoaAsyncSocket (= 7.6.5) - TIoTLinkKit_FLV (= 2.2.3) - - TIoTLinkKit_GVoiceSE (>= 1.0.7) + - TIoTLinkKit_GVoiceSE (= 1.0.9-beta.202407161117) - TIoTLinkKit_SoundTouch (= 1.0.0) - - TIoTLinkKit_XP2P (= 2.4.49) + - TIoTLinkKit_XP2P (= 2.4.50-beta.202407120934) - TPCircularBuffer (= 1.6.1) - TPCircularBuffer (1.6.1) - TrueTime (5.0.3) @@ -128,13 +128,13 @@ SPEC CHECKSUMS: Tencent-MapSDK: 6dfbee53b46131deb4c4bb02b3edc5ce7fb630dc TIoTLinkKit: 0386fb583c61765a02ad5cca810c7661d5a0bc53 TIoTLinkKit_FLV: aec2b2ec9664990ec6c5b9f760fc1a9043d5a9a5 - TIoTLinkKit_GVoiceSE: eede6564d3dde3560e441bf2b42d87265f4e685d + TIoTLinkKit_GVoiceSE: a3299c28391a936da40c7c42f68ff793c6e5ee85 TIoTLinkKit_IJKPlayer: 1e265522952144af73724a31d6c80ebc15571f59 TIoTLinkKit_SoundTouch: cf79ae182b6c2349ff65bac7a338974bc538fa77 TIoTLinkKit_TPNS: 7cea4fc1d20ef6c4c11c4f0b66bbb10ecf4ed968 TIoTLinkKit_WechatOpenSDK: 7822d68cc5c46edf3f6020422202e7b65ea87614 - TIoTLinkKit_XP2P: 0250d1a8f0561f015bb9ab09aed59c0a617e49aa - TIoTLinkVideo: 938a736bd9da2ce61edd16d8637ae929aa4b593b + TIoTLinkKit_XP2P: 71d5d01dddab53591247646e92985bdb093cff5f + TIoTLinkVideo: 786dc763eb197e08d8e382beded37946da75a0fe TPCircularBuffer: c13243556527551c4d320709c7b14a6d20cdc30a TrueTime: b49551ffafb28a9dee04e51b226f42a416010842 TXLiteAVSDK_TRTC: e3383a81565e8bb2aaaaab4bd099ad5239cd5b2d diff --git a/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm b/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm index 30fa798f..b9d4ce94 100644 --- a/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm +++ b/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm @@ -617,7 +617,7 @@ - (NSString *)readKeychainValue:(NSString *)sKey - (void)doTick:(data_report_t)data_buf { [self reportUserList:data_buf]; - + return; if (data_buf.report_size < 2) { return; } @@ -640,7 +640,7 @@ - (void)doTick:(data_report_t)data_buf { - (void)reportUserList:(data_report_t)report { - NSString *reqid = [NSString stringWithCString:(const char *)report.uniqueId encoding:NSASCIIStringEncoding];//@"8f3d545eabe165ed52247f1c89ad5acd";//[[NSUUID UUID] UUIDString]; + NSString *reqid = [NSString stringWithCString:(const char *)report.uniqueId encoding:NSASCIIStringEncoding]; NSString *status = [NSString stringWithCString:(const char *)report.status encoding:NSASCIIStringEncoding]; NSString *dataaction = [NSString stringWithCString:(const char *)report.data_action encoding:NSASCIIStringEncoding]; @@ -655,6 +655,7 @@ - (void)reportUserList:(data_report_t)report { NSMutableDictionary *accessParam = [NSMutableDictionary dictionary]; [accessParam setValue:@"P2PReport" forKey:@"Action"]; + [accessParam setValue:[[NSUUID UUID] UUIDString] forKey:@"RequestId"]; [accessParam setValue:status forKey:@"Status"]; [accessParam setValue:dataaction forKey:@"DataAction"]; [accessParam setValue:reqid forKey:@"UniqueId"]; diff --git a/TIoTLinkVideo.podspec b/TIoTLinkVideo.podspec index 16fcfbe5..d8aba8b8 100644 --- a/TIoTLinkVideo.podspec +++ b/TIoTLinkVideo.podspec @@ -19,11 +19,11 @@ 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' + s.dependency 'TIoTLinkKit_XP2P', '2.4.50-beta.202407120934' s.dependency 'TIoTLinkKit_FLV', '2.2.3' s.dependency 'CocoaAsyncSocket', '7.6.5' s.dependency 'TIoTLinkKit_SoundTouch', '1.0.0' - s.dependency 'TIoTLinkKit_GVoiceSE', '>= 1.0.7' + s.dependency 'TIoTLinkKit_GVoiceSE', '1.0.9-beta.202407161117' s.dependency 'TPCircularBuffer', '1.6.1' s.pod_target_xcconfig = {