Skip to content

Commit 25bb692

Browse files
committed
添加局域网ready事件回调
tapd: http://tapd.oa.com/20393192/prong/stories/view/1020393192869350657 Change-Id: Ia56eb9fb6e52e9d0cb5b371b7d0f4592503dfa14
1 parent f81ce93 commit 25bb692

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,11 @@ PODS:
136136
- TIoTLinkKit_IJKPlayer (1.0.2)
137137
- TIoTLinkKit_TPNS (1.0.1)
138138
- TIoTLinkKit_WechatOpenSDK (1.0.1)
139-
- TIoTLinkKit_XP2P (2.4.2-beta.202112210201)
139+
- TIoTLinkKit_XP2P (2.4.2-beta.202112231310)
140140
- TIoTLinkVideo (1.0.0):
141141
- CocoaAsyncSocket (= 7.6.5)
142142
- TIoTLinkKit_FLV (= 2.2.3)
143-
- TIoTLinkKit_XP2P (= 2.4.2-beta.202112210201)
143+
- TIoTLinkKit_XP2P (= 2.4.2-beta.202112231310)
144144
- TrueTime (5.0.3)
145145
- TXLiteAVSDK_TRTC (8.0.9644)
146146
- TZImagePickerController (3.2.1)
@@ -262,8 +262,8 @@ SPEC CHECKSUMS:
262262
TIoTLinkKit_IJKPlayer: e47c3fed6b204e7544f84a24310cab7a372854d1
263263
TIoTLinkKit_TPNS: 7cea4fc1d20ef6c4c11c4f0b66bbb10ecf4ed968
264264
TIoTLinkKit_WechatOpenSDK: 7822d68cc5c46edf3f6020422202e7b65ea87614
265-
TIoTLinkKit_XP2P: 09ada805c9910591a1aa2cf9eec92258f2174af7
266-
TIoTLinkVideo: 7e05fc110edb151538d05d632e182d7e6dfc3e93
265+
TIoTLinkKit_XP2P: b62f5c1e25c973d309ab45b3f65e5f1ed2d88e0a
266+
TIoTLinkVideo: c6f592694d6b817ce5e0cd84913f3e90e6a2ac27
267267
TrueTime: b49551ffafb28a9dee04e51b226f42a416010842
268268
TXLiteAVSDK_TRTC: e3383a81565e8bb2aaaaab4bd099ad5239cd5b2d
269269
TZImagePickerController: bf4c57b98d8707fce41ea6be872414a71c7a8c9d

Source/LinkSDKDemo/Video/LocalAreaNetwork/Controller/TIoTAreaNetworkPreviewVC.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ - (void)viewDidLoad {
9292

9393
int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startLanAppWith:self.productID?:@"" dev_name:self.deviceName?:@"" remote_host:self.model.params.address?:@"" remote_port:self.model.params.port?:@""];
9494

95-
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
96-
[self setVieoPlayerStartPlayWith:self.qualityString];
97-
});
95+
// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
96+
// [self setVieoPlayerStartPlayWith:self.qualityString];
97+
// });
9898

9999
if (errorcode == XP2P_ERR_VERSION) {
100100
UIAlertController *alertC = [UIAlertController alertControllerWithTitle:@"APP SDK 版本与设备端 SDK 版本号不匹配,版本号需前两位保持一致" message:nil preferredStyle:(UIAlertControllerStyleAlert)];

Source/LinkSDKDemo/Video/Login/Controller/TIoTAreaNetworkConfigVC.m

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,9 @@ - (void)judgeAutoFillInputInfo {
145145

146146
self.productID.text = [TIoTCoreUserManage shared].demoAreaNetProductID?:@"";
147147
self.clientToken.text = [TIoTCoreUserManage shared].demoAreaNetClientToken?:@"";
148+
149+
self.productIDString = self.productID.text;
150+
self.clientTokenString = self.clientToken.text;
148151
}
149152

150153
- (void)saveInputInfo {

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.2-beta.202112210201'
21+
s.dependency 'TIoTLinkKit_XP2P', '2.4.2-beta.202112231310'
2222
s.dependency 'TIoTLinkKit_FLV', '2.2.3'
2323
s.dependency 'CocoaAsyncSocket', '7.6.5'
2424

0 commit comments

Comments
 (0)