update gvoice

tencentyun · Mar 1, 2024 · f47d3ac · f47d3ac
1 parent f3e20d9
commit f47d3ac
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 11 deletions.
diff --git 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.4)
+  - TIoTLinkKit_GVoiceSE (1.0.6)
   - TIoTLinkKit_IJKPlayer (2.0.13)
   - TIoTLinkKit_SoundTouch (1.0.0)
   - TIoTLinkKit_TPNS (1.0.1)
   - TIoTLinkKit_WechatOpenSDK (1.0.1)
-  - TIoTLinkKit_XP2P (2.4.46-beta.202402260751)
+  - TIoTLinkKit_XP2P (2.4.46)
   - TIoTLinkVideo (1.0.0):
     - CocoaAsyncSocket (= 7.6.5)
     - TIoTLinkKit_FLV (= 2.2.3)
-    - TIoTLinkKit_GVoiceSE (= 1.0.4)
+    - TIoTLinkKit_GVoiceSE (>= 1.0.6)
     - TIoTLinkKit_SoundTouch (= 1.0.0)
-    - TIoTLinkKit_XP2P (= 2.4.46-beta.202402260751)
+    - TIoTLinkKit_XP2P (= 2.4.46)
     - 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: e554fa5b10d84e66ebd2af38614b2822a848c312
+  TIoTLinkKit_GVoiceSE: 955439b4907e5f9e24bb653c66d2402e991e7ace
   TIoTLinkKit_IJKPlayer: 52f22f3059d232f7d8b623969b05e84baa1040c7
   TIoTLinkKit_SoundTouch: cf79ae182b6c2349ff65bac7a338974bc538fa77
   TIoTLinkKit_TPNS: 7cea4fc1d20ef6c4c11c4f0b66bbb10ecf4ed968
   TIoTLinkKit_WechatOpenSDK: 7822d68cc5c46edf3f6020422202e7b65ea87614
-  TIoTLinkKit_XP2P: a80b13ebad4a195c831db563718eb3b88b11ad83
-  TIoTLinkVideo: 739c461db7f41ddfed8fd9255348a5c650be04ca
+  TIoTLinkKit_XP2P: dbc4e04e1fdbb4db257b754ccf2649a8216622c2
+  TIoTLinkVideo: 1f33b5cc78a82b4150d9064b98f0afb1ff5787c3
   TPCircularBuffer: c13243556527551c4d320709c7b14a6d20cdc30a
   TrueTime: b49551ffafb28a9dee04e51b226f42a416010842
   TXLiteAVSDK_TRTC: e3383a81565e8bb2aaaaab4bd099ad5239cd5b2d

diff --git a/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm b/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm
@@ -21,6 +21,7 @@ @interface TIoTCoreXP2PBridge ()<TIoTAVCaptionFLVDelegate>
 @property (nonatomic, assign) BOOL isSending;
 @property (nonatomic, strong) AVCaptureSessionPreset resolution;
 @property (nonatomic, strong) NSTimer *getBufTimer;
+@property (nonatomic, strong) NSTimer *reportTimer;
 - (void)cancelTimer;
 @end
 
@@ -227,13 +228,28 @@ - (XP2PErrCode)startAppWith:(NSString *)sec_id sec_key:(NSString *)sec_key pro_i
     return (XP2PErrCode)ret;
 }
 
+- (const char *)dicConvertString:(NSDictionary *)dic {
+    NSError *error;
+    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:dic options:kNilOptions error:&error];
+    NSString *jsonString = @"";
+    if (!error) {
+        jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+    }
+    return jsonString.UTF8String;
+}
 
 - (XP2PErrCode)startAppWith:(NSString *)pro_id dev_name:(NSString *)dev_name {
     return [self startAppWith:pro_id dev_name:dev_name type:XP2P_PROTOCOL_AUTO];
 }
 - (XP2PErrCode)startAppWith:(NSString *)pro_id dev_name:(NSString *)dev_name type:(XP2PProtocolType)type{
-//    setStunServerToXp2p("11.11.11.11", 111);
-//    setLogEnable(false, false);
+    //    setStunServerToXp2p("11.11.11.11", 111);
+    //    setLogEnable(false, false);
+
+//    const char* str_user_id = getUserID();
+//    setContentDetail([self dicConvertString:@{@"good":@"morning", @"str_user_id":[NSString stringWithCString:str_user_id]}],
+//                     [self dicConvertString:@{@"better": @"afternnn"}]);
+//    const char* tmpcontent = getContentData();
+//    printf("wwwwww===%s\n",tmpcontent);
 
     NSString *fileName = @"stun.txt";
     NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);

diff --git 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.46-beta.202402260751'
+  s.dependency 'TIoTLinkKit_XP2P', '2.4.46'
   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.4'
+  s.dependency 'TIoTLinkKit_GVoiceSE', '>= 1.0.6'
   s.dependency 'TPCircularBuffer', '1.6.1'
 
   s.pod_target_xcconfig = {