From 6f5c9fce5d82fc9e4eff9b23ba7ed07c79483bf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?eagleychen=28=E9=99=88=E9=B9=B0=29?= Date: Fri, 5 Mar 2021 15:28:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0sdk=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I7410a8371a936a15aabeb7b069a7ba7412d81908 --- Podfile | 4 ++-- Podfile.lock | 18 +++++++++--------- Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Podfile b/Podfile index 3b32cb105..ed40710b0 100644 --- a/Podfile +++ b/Podfile @@ -27,8 +27,8 @@ target 'LinkApp' do pod 'KeychainAccess', '4.2.0' pod 'Tencent-MapSDK', '4.3.9' pod 'lottie-ios', '3.1.8' - pod 'TIoTThridSDK/TPNS-iOS', '1.0.5' #'~> 1.0.5-beta.1' - pod 'TIoTThridSDK/WechatOpenSDK_NoPay', '1.0.5' #'~> 1.0.5-beta.1'# + pod 'TIoTThridSDK/TPNS-iOS', '1.0.6' #'~> 1.0.5-beta.1' + pod 'TIoTThridSDK/WechatOpenSDK_NoPay', '1.0.6' #'~> 1.0.5-beta.1'# end target 'LinkSDKDemo' do diff --git a/Podfile.lock b/Podfile.lock index 109ce35ce..5cbe4541b 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -131,11 +131,11 @@ PODS: - TIoTThridSDK/Faac-iOS - TIoTThridSDK/IJKPlayer-iOS - TIoTThridSDK/XP2P-iOS - - TIoTThridSDK/Faac-iOS (1.0.5) - - TIoTThridSDK/IJKPlayer-iOS (1.0.5) - - TIoTThridSDK/TPNS-iOS (1.0.5) - - TIoTThridSDK/WechatOpenSDK_NoPay (1.0.5) - - TIoTThridSDK/XP2P-iOS (1.0.5) + - TIoTThridSDK/Faac-iOS (1.0.6) + - TIoTThridSDK/IJKPlayer-iOS (1.0.6) + - TIoTThridSDK/TPNS-iOS (1.0.6) + - TIoTThridSDK/WechatOpenSDK_NoPay (1.0.6) + - TIoTThridSDK/XP2P-iOS (1.0.6) - TrueTime (5.0.3) - TXLiteAVSDK_TRTC (8.0.9644) - TZImagePickerController (3.2.1) @@ -159,8 +159,8 @@ DEPENDENCIES: - TIoTLinkKit (from `./`) - TIoTLinkKit/LinkRTC (from `./`) - TIoTLinkKit/LinkVideo (from `./`) - - TIoTThridSDK/TPNS-iOS (= 1.0.5) - - TIoTThridSDK/WechatOpenSDK_NoPay (= 1.0.5) + - TIoTThridSDK/TPNS-iOS (= 1.0.6) + - TIoTThridSDK/WechatOpenSDK_NoPay (= 1.0.6) - TrueTime (= 5.0.3) - TZImagePickerController (= 3.2.1) - YYModel (= 1.0.4) @@ -239,12 +239,12 @@ SPEC CHECKSUMS: SocketRocket: d57c7159b83c3c6655745cd15302aa24b6bae531 Tencent-MapSDK: 6dfbee53b46131deb4c4bb02b3edc5ce7fb630dc TIoTLinkKit: 8d8ce502e94c41a5c7f9f2ea43e82c9d1483810e - TIoTThridSDK: 2d10ff67f67fcbe9a848e5afef64a26de2f4fd72 + TIoTThridSDK: 19c91924fd10f0956db4f9edb331bb2c619f69f6 TrueTime: b49551ffafb28a9dee04e51b226f42a416010842 TXLiteAVSDK_TRTC: e3383a81565e8bb2aaaaab4bd099ad5239cd5b2d TZImagePickerController: bf4c57b98d8707fce41ea6be872414a71c7a8c9d YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30 -PODFILE CHECKSUM: c39a31a763e17cac4b9ad2308aa62fe2e89efd20 +PODFILE CHECKSUM: 7e45d7712f50cf3d808198be13e6a5a441d5a509 COCOAPODS: 1.9.3 diff --git a/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm b/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm index 7c6249bfa..a966f9952 100644 --- a/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm +++ b/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm @@ -104,9 +104,9 @@ - (void)startAppWith:(NSString *)sec_id sec_key:(NSString *)sec_key pro_id:(NSSt } - (NSString *)getUrlForHttpFlv { - std::string httpflv = delegateHttpFlv(); - NSLog(@"httpflv---%s",httpflv.c_str()); - return [NSString stringWithCString:httpflv.c_str() encoding:[NSString defaultCStringEncoding]]; + const char *httpflv = delegateHttpFlv(); + NSLog(@"httpflv---%s",httpflv); + return [NSString stringWithCString:httpflv encoding:[NSString defaultCStringEncoding]]; } - (void)getCommandRequestWithAsync:(NSString *)cmd timeout:(uint64_t)timeout completion:(void (^ __nullable)(NSString * jsonList))completion{