Skip to content

Commit 9f7c76c

Browse files
committed
更新coresdk,修复tcp模式
Change-Id: I9710952552372b81faf02a55bec97f01a9130fde
1 parent dea2538 commit 9f7c76c

File tree

3 files changed

+17
-18
lines changed

3 files changed

+17
-18
lines changed

Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ PODS:
3434
- TIoTLinkKit_SoundTouch (1.0.0)
3535
- TIoTLinkKit_TPNS (1.0.1)
3636
- TIoTLinkKit_WechatOpenSDK (1.0.1)
37-
- TIoTLinkKit_XP2P (2.4.27)
37+
- TIoTLinkKit_XP2P (2.4.36)
3838
- TIoTLinkVideo (1.0.0):
3939
- CocoaAsyncSocket (= 7.6.5)
4040
- TIoTLinkKit_FLV (= 2.2.3)
4141
- TIoTLinkKit_SoundTouch (= 1.0.0)
42-
- TIoTLinkKit_XP2P (= 2.4.27)
42+
- TIoTLinkKit_XP2P (= 2.4.36)
4343
- TrueTime (5.0.3)
4444
- TXLiteAVSDK_TRTC (8.0.9644)
4545
- TZImagePickerController (3.2.1)
@@ -126,8 +126,8 @@ SPEC CHECKSUMS:
126126
TIoTLinkKit_SoundTouch: cf79ae182b6c2349ff65bac7a338974bc538fa77
127127
TIoTLinkKit_TPNS: 7cea4fc1d20ef6c4c11c4f0b66bbb10ecf4ed968
128128
TIoTLinkKit_WechatOpenSDK: 7822d68cc5c46edf3f6020422202e7b65ea87614
129-
TIoTLinkKit_XP2P: 645a54568e9ecd9915c392a2bd07413a5a79c72f
130-
TIoTLinkVideo: f218f7d1450014ff6397437f86b2ea2fdf36dceb
129+
TIoTLinkKit_XP2P: 0332821c5ed34763d04e28fe2c35321e80926619
130+
TIoTLinkVideo: 68312c12e0cb8e7e1181db4e4968501513982430
131131
TrueTime: b49551ffafb28a9dee04e51b226f42a416010842
132132
TXLiteAVSDK_TRTC: e3383a81565e8bb2aaaaab4bd099ad5239cd5b2d
133133
TZImagePickerController: bf4c57b98d8707fce41ea6be872414a71c7a8c9d

Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,25 +37,24 @@ - (void)cancelTimer;
3737
if (logEnable) {
3838
fwrite(msg, 1, strlen(msg)>300?300:strlen(msg), p2pOutLogFile);
3939
}
40+
}else if (type == XP2PTypeSaveFileOn) {
41+
42+
BOOL isWriteFile = [TIoTCoreXP2PBridge sharedInstance].writeFile;
43+
return (isWriteFile?"1":"0");
44+
}else if (type == XP2PTypeSaveFileUrl) {
45+
46+
NSString *fileName = @"video.data";
47+
NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
48+
NSString *documentDirectory = paths.firstObject;
49+
NSString *saveFilePath = [documentDirectory stringByAppendingPathComponent:fileName];
50+
return saveFilePath.UTF8String;
4051
}
4152

4253
@autoreleasepool {
4354

4455
NSString *DeviceName = [NSString stringWithCString:idd encoding:[NSString defaultCStringEncoding]]?:@"";
4556

46-
if (type == XP2PTypeSaveFileOn) {
47-
48-
BOOL isWriteFile = [TIoTCoreXP2PBridge sharedInstance].writeFile;
49-
return (isWriteFile?"1":"0");
50-
}else if (type == XP2PTypeSaveFileUrl) {
51-
52-
NSString *fileName = @"video.data";
53-
NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
54-
NSString *documentDirectory = paths.firstObject;
55-
NSString *saveFilePath = [documentDirectory stringByAppendingPathComponent:fileName];
56-
return saveFilePath.UTF8String;
57-
58-
}else if (type == XP2PTypeDisconnect || type == XP2PTypeDetectError) {
57+
if (type == XP2PTypeDisconnect || type == XP2PTypeDetectError) {
5958
[[TIoTCoreXP2PBridge sharedInstance] cancelTimer];
6059
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
6160
[[NSNotificationCenter defaultCenter] postNotificationName:TIoTCoreXP2PBridgeNotificationDisconnect object:nil userInfo:@{@"id": DeviceName}];

TIoTLinkVideo.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
1818

1919
s.source_files = 'Source/SDK/LinkVideo/**/*.{h,m,c,mm}'
2020

21-
s.dependency 'TIoTLinkKit_XP2P', '2.4.27' #~> 2.4.21-beta.202202101145
21+
s.dependency 'TIoTLinkKit_XP2P', '2.4.36'
2222
s.dependency 'TIoTLinkKit_FLV', '2.2.3'
2323
s.dependency 'CocoaAsyncSocket', '7.6.5'
2424
s.dependency 'TIoTLinkKit_SoundTouch', '1.0.0'

0 commit comments

Comments
 (0)