Skip to content

Commit 0467192

Browse files
committed
修复 videopodspec 配置验证不过
Change-Id: Ide4b06e8199181bee4109b91c6fa020fbd276a56
1 parent d52bbb2 commit 0467192

File tree

4 files changed

+27
-28
lines changed

4 files changed

+27
-28
lines changed

Podfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ target 'LinkApp' do
3030
pod 'Tencent-MapSDK', '4.3.9'
3131
pod 'lottie-ios', '3.1.8'
3232
pod 'CocoaAsyncSocket', '7.6.5'
33-
pod 'TIoTLinkThirdPartyKit/TPNS-iOS', '2.3.0-beta.202108181025'
34-
pod 'TIoTLinkThirdPartyKit/WechatOpenSDK_NoPay', '2.3.0-beta.202108181025'
33+
pod 'TIoTLinkThirdPartyKit/TPNS-iOS', '2.3.0-beta.202109070341'
34+
pod 'TIoTLinkThirdPartyKit/WechatOpenSDK_NoPay', '2.3.0-beta.202109070341'
3535
end
3636

3737

@@ -42,5 +42,5 @@ target 'LinkSDKDemo' do
4242
pod 'TIoTLinkKit/LinkRTC', :path => './'
4343

4444
pod 'TIoTLinkVideo', :path => './'
45-
pod 'TIoTLinkThirdPartyKit/IJKPlayer-iOS', '2.3.0-beta.202108181025'
45+
pod 'TIoTLinkThirdPartyKit/IJKPlayer-iOS', '2.3.0-beta.202109070341'
4646
end

Podfile.lock

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,15 @@ PODS:
132132
- TIoTLinkKit/LinkCore
133133
- TXLiteAVSDK_TRTC (= 8.0.9644)
134134
- YYModel (= 1.0.4)
135-
- TIoTLinkThirdPartyKit/Faac-iOS (2.2.1)
136-
- TIoTLinkThirdPartyKit/IJKPlayer-iOS (2.2.1)
137-
- TIoTLinkThirdPartyKit/TPNS-iOS (2.2.1)
138-
- TIoTLinkThirdPartyKit/WechatOpenSDK_NoPay (2.2.1)
139-
- TIoTLinkThirdPartyKit/XP2P-iOS (2.2.1)
135+
- TIoTLinkThirdPartyKit/Faac-iOS (2.3.0-beta.202109070341)
136+
- TIoTLinkThirdPartyKit/IJKPlayer-iOS (2.3.0-beta.202109070341)
137+
- TIoTLinkThirdPartyKit/TPNS-iOS (2.3.0-beta.202109070341)
138+
- TIoTLinkThirdPartyKit/WechatOpenSDK_NoPay (2.3.0-beta.202109070341)
139+
- TIoTLinkThirdPartyKit/XP2P-iOS (2.3.0-beta.202109070341)
140140
- TIoTLinkVideo (1.0.0):
141-
- TIoTLinkKit/LinkCore
142-
- TIoTLinkThirdPartyKit/Faac-iOS (= 2.2.1)
143-
- TIoTLinkThirdPartyKit/XP2P-iOS (= 2.2.1)
141+
- CocoaLumberjack (= 3.7.2)
142+
- TIoTLinkThirdPartyKit/Faac-iOS (= 2.3.0-beta.202109070341)
143+
- TIoTLinkThirdPartyKit/XP2P-iOS (= 2.3.0-beta.202109070341)
144144
- TrueTime (5.0.3)
145145
- TXLiteAVSDK_TRTC (8.0.9644)
146146
- TZImagePickerController (3.2.1)
@@ -166,9 +166,9 @@ DEPENDENCIES:
166166
- Tencent-MapSDK (= 4.3.9)
167167
- TIoTLinkKit (from `./`)
168168
- TIoTLinkKit/LinkRTC (from `./`)
169-
- TIoTLinkThirdPartyKit/IJKPlayer-iOS (= 2.2.1)
170-
- TIoTLinkThirdPartyKit/TPNS-iOS (= 2.2.1)
171-
- TIoTLinkThirdPartyKit/WechatOpenSDK_NoPay (= 2.2.1)
169+
- TIoTLinkThirdPartyKit/IJKPlayer-iOS (= 2.3.0-beta.202109070341)
170+
- TIoTLinkThirdPartyKit/TPNS-iOS (= 2.3.0-beta.202109070341)
171+
- TIoTLinkThirdPartyKit/WechatOpenSDK_NoPay (= 2.3.0-beta.202109070341)
172172
- TIoTLinkVideo (from `./`)
173173
- TrueTime (= 5.0.3)
174174
- TZImagePickerController (= 3.2.1)
@@ -254,13 +254,13 @@ SPEC CHECKSUMS:
254254
SocketRocket: d57c7159b83c3c6655745cd15302aa24b6bae531
255255
Tencent-MapSDK: 6dfbee53b46131deb4c4bb02b3edc5ce7fb630dc
256256
TIoTLinkKit: 0386fb583c61765a02ad5cca810c7661d5a0bc53
257-
TIoTLinkThirdPartyKit: 097ce7631d6bb13bcb90a0319d4ac5ca360ee012
258-
TIoTLinkVideo: d365616048dc08dfd328b1843fd94e908d5d7eb4
257+
TIoTLinkThirdPartyKit: 02caa215396aa70d445f2b15e5b093c467d0597c
258+
TIoTLinkVideo: aa33a0a2f3e35916620a7a5efdbfaf6ae0985987
259259
TrueTime: b49551ffafb28a9dee04e51b226f42a416010842
260260
TXLiteAVSDK_TRTC: e3383a81565e8bb2aaaaab4bd099ad5239cd5b2d
261261
TZImagePickerController: bf4c57b98d8707fce41ea6be872414a71c7a8c9d
262262
YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30
263263

264-
PODFILE CHECKSUM: 8904238fa33d41146afc884a8765b86bcb28f16f
264+
PODFILE CHECKSUM: d1a660977e2068eac313ad6489e9fcda725cbf8d
265265

266266
COCOAPODS: 1.9.3

Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,13 @@
88
#include <string.h>
99
#include "AppWrapper.h"
1010
#import "AWSystemAVCapture.h"
11-
//#import "TIoTCoreAppEnvironment.h"
12-
#import "TIoTCoreWMacros.h"
11+
#import <CocoaLumberjack/CocoaLumberjack.h>
12+
13+
#ifdef DEBUG
14+
static const DDLogLevel ddLogLevel = DDLogLevelVerbose;
15+
#else
16+
static const DDLogLevel ddLogLevel = DDLogLevelOff;
17+
#endif
1318

1419
const char* XP2PMsgHandle(const char *idd, XP2PType type, const char* msg) {
1520
if (idd == nullptr) {
@@ -38,12 +43,6 @@
3843
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
3944
NSString *DeviceName = [NSString stringWithUTF8String:idd];
4045
[[NSNotificationCenter defaultCenter] postNotificationName:@"xp2disconnect" object:nil userInfo:@{@"id": DeviceName}];
41-
// [[TIoTCoreXP2PBridge sharedInstance] stopService: DeviceName];
42-
//
43-
// [[TIoTCoreXP2PBridge sharedInstance] startAppWith:[TIoTCoreAppEnvironment shareEnvironment].cloudSecretId
44-
// sec_key:[TIoTCoreAppEnvironment shareEnvironment].cloudSecretKey
45-
// pro_id:[TIoTCoreAppEnvironment shareEnvironment].cloudProductId
46-
// dev_name:DeviceName];
4746

4847
});
4948
}else if (type == XP2PTypeDetectReady) {

TIoTLinkVideo.podspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ Pod::Spec.new do |s|
1717
s.static_framework = true
1818

1919
s.source_files = 'Source/SDK/LinkVideo/**/*.{h,m,c,mm}'
20-
s.dependency 'TIoTLinkThirdPartyKit/XP2P-iOS', '2.3.0-beta.202108181025'
21-
s.dependency 'TIoTLinkThirdPartyKit/Faac-iOS', '2.3.0-beta.202108181025'
22-
s.dependency 'TIoTLinkKit/LinkCore'
20+
s.dependency 'TIoTLinkThirdPartyKit/XP2P-iOS', '2.3.0-beta.202109070341'
21+
s.dependency 'TIoTLinkThirdPartyKit/Faac-iOS', '2.3.0-beta.202109070341'
22+
s.dependency 'CocoaLumberjack', '3.7.2'
2323
s.pod_target_xcconfig = {
2424
'VALID_ARCHS' => 'arm64'
2525
}

0 commit comments

Comments
 (0)