Skip to content

Commit 11dde89

Browse files
committed
支持tcp传输
Change-Id: Ia1eede3c61fdf6da3f24d906223734eea59856ee
1 parent ea00aeb commit 11dde89

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

Podfile.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ PODS:
112112
- nanopb/decode (1.30906.0)
113113
- nanopb/encode (1.30906.0)
114114
- PromisesObjC (1.2.12)
115-
- Protobuf (3.19.1)
115+
- Protobuf (3.19.4)
116116
- QCloudCore (5.5.2)
117117
- QCloudCOSXML/Transfer (5.5.2):
118118
- QCloudCore (= 5.5.2)
@@ -135,11 +135,11 @@ PODS:
135135
- TIoTLinkKit_IJKPlayer (1.0.4)
136136
- TIoTLinkKit_TPNS (1.0.1)
137137
- TIoTLinkKit_WechatOpenSDK (1.0.1)
138-
- TIoTLinkKit_XP2P (2.4.20)
138+
- TIoTLinkKit_XP2P (2.4.21)
139139
- TIoTLinkVideo (1.0.0):
140140
- CocoaAsyncSocket (= 7.6.5)
141141
- TIoTLinkKit_FLV (= 2.2.3)
142-
- TIoTLinkKit_XP2P (= 2.4.20)
142+
- TIoTLinkKit_XP2P (= 2.4.21)
143143
- TrueTime (5.0.3)
144144
- TXLiteAVSDK_TRTC (8.0.9644)
145145
- TZImagePickerController (3.2.1)
@@ -247,7 +247,7 @@ SPEC CHECKSUMS:
247247
MJRefresh: ed450d6eb9d3346a2cb033ab7eb6de090aeef437
248248
nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc
249249
PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
250-
Protobuf: 3724efa50cb2846d7ccebc8691c574e85fd74471
250+
Protobuf: 235750e4696ff59fb07d949a9dbbc92b3c0700fe
251251
QCloudCore: b91a762d280f0a80cc6f537fd186ac43a4a3025e
252252
QCloudCOSXML: a30ab17f45b0cbbcbb218a3677298498e8748a22
253253
SDWebImage: 624d6e296c69b244bcede364c72ae0430ac14681
@@ -258,8 +258,8 @@ SPEC CHECKSUMS:
258258
TIoTLinkKit_IJKPlayer: b2a4fbf223b1cfe73a28e650b82c2e3f928716b0
259259
TIoTLinkKit_TPNS: 7cea4fc1d20ef6c4c11c4f0b66bbb10ecf4ed968
260260
TIoTLinkKit_WechatOpenSDK: 7822d68cc5c46edf3f6020422202e7b65ea87614
261-
TIoTLinkKit_XP2P: 8ab9aabd50a5445514fd31521dceb23dbccfd59c
262-
TIoTLinkVideo: 92fcebcaf3009ee615a769ff22616a9f2ecf00fc
261+
TIoTLinkKit_XP2P: b19821c3262168d35ff1dee2cce7e4b523bcc77e
262+
TIoTLinkVideo: dc6ddb5b429617c6f689f55a6593ccad6ef3a9f4
263263
TrueTime: b49551ffafb28a9dee04e51b226f42a416010842
264264
TXLiteAVSDK_TRTC: e3383a81565e8bb2aaaaab4bd099ad5239cd5b2d
265265
TZImagePickerController: bf4c57b98d8707fce41ea6be872414a71c7a8c9d

Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoPreviewDeviceVC.m

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1104,10 +1104,13 @@ - (void)responseP2PdisConnect:(NSNotification *)notify {
11041104
NSLog(@"通道断开,正在重连");
11051105
[MBProgressHUD showError:@"通道断开,正在重连"];
11061106

1107-
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
1107+
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
11081108
TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment];
11091109
[[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:DeviceName?:@"" sec_id:env.cloudSecretId sec_key:env.cloudSecretKey xp2pinfo:@""];
1110-
[self setVieoPlayerStartPlayWith:self.qualityString];
1110+
1111+
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
1112+
[self setVieoPlayerStartPlayWith:self.qualityString];
1113+
});
11111114
});
11121115

11131116
}

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.20' #~> 2.4.3-beta.1
21+
s.dependency 'TIoTLinkKit_XP2P', '2.4.21' #~> 2.4.21-beta.202202101145
2222
s.dependency 'TIoTLinkKit_FLV', '2.2.3'
2323
s.dependency 'CocoaAsyncSocket', '7.6.5'
2424

0 commit comments

Comments
 (0)