Skip to content

Commit 69d80d5

Browse files
author
eagleychen
committed
集成双中转正式版
1 parent b9e08d9 commit 69d80d5

File tree

16 files changed

+65
-95
lines changed

16 files changed

+65
-95
lines changed

‎Podfile.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ PODS:
3535
- TIoTLinkKit_SoundTouch (1.0.0)
3636
- TIoTLinkKit_TPNS (1.0.1)
3737
- TIoTLinkKit_WechatOpenSDK (1.0.1)
38-
- TIoTLinkKit_XP2P (2.4.53-beta.202501160957)
38+
- TIoTLinkKit_XP2P (2.4.53)
3939
- TIoTLinkVideo (1.0.0):
4040
- CocoaAsyncSocket (= 7.6.5)
4141
- TIoTLinkKit_FLV (= 2.2.3)
4242
- TIoTLinkKit_GVoiceSE (>= 1.0.9)
4343
- TIoTLinkKit_SoundTouch (= 1.0.0)
44-
- TIoTLinkKit_XP2P (= 2.4.53-beta.202501160957)
44+
- TIoTLinkKit_XP2P (= 2.4.53)
4545
- TPCircularBuffer (= 1.6.1)
4646
- TPCircularBuffer (1.6.1)
4747
- TrueTime (5.0.3)
@@ -133,8 +133,8 @@ SPEC CHECKSUMS:
133133
TIoTLinkKit_SoundTouch: cf79ae182b6c2349ff65bac7a338974bc538fa77
134134
TIoTLinkKit_TPNS: 7cea4fc1d20ef6c4c11c4f0b66bbb10ecf4ed968
135135
TIoTLinkKit_WechatOpenSDK: 7822d68cc5c46edf3f6020422202e7b65ea87614
136-
TIoTLinkKit_XP2P: a837af943efdecba6b31cffb89c8b1eb81c8e1d6
137-
TIoTLinkVideo: 49b40d4ea42bed540d7f6ebeb083bd31da729e5a
136+
TIoTLinkKit_XP2P: 731eba7755f80c6a9a98ec872e78947ae5df1272
137+
TIoTLinkVideo: c5b7a6a397f4d724650ead8d4eed5922380feb6b
138138
TPCircularBuffer: c13243556527551c4d320709c7b14a6d20cdc30a
139139
TrueTime: b49551ffafb28a9dee04e51b226f42a416010842
140140
TXLiteAVSDK_TRTC: e3383a81565e8bb2aaaaab4bd099ad5239cd5b2d

‎Source/LinkApp/Classes/Module/EquipmentPanel/Controller/TIoTPanelVC.m‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -949,12 +949,13 @@ - (void)starP2PServer {
949949
config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
950950
config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID];
951951

952+
config.xp2pinfo = xp2pValue;
953+
952954
config.autoConfigFromDevice = NO;
953955
config.type = XP2P_PROTOCOL_AUTO;
954956
config.crossStunTurn = NO;
955957

956958
int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:self.productId dev_name:self.deviceName?:@"" appconfig:config];
957-
[[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:self.deviceName xp2pinfo:xp2pValue];
958959

959960
if (errorcode == XP2P_ERR_VERSION) {
960961
UIAlertController *alertC = [UIAlertController alertControllerWithTitle:@"APP SDK 版本与设备端 SDK 版本号不匹配，版本号需前两位保持一致" message:nil preferredStyle:(UIAlertControllerStyleAlert)];
@@ -4101,7 +4102,7 @@ - (void)refushXP2Pinfo {
41014102
}
41024103
NSLog(@"refushXP2Pinfo_sys_xp2p_info : %@",xp2pValue);
41034104

4104-
int errorcode = [[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:self.deviceName?:@"" xp2pinfo:xp2pValue];
4105+
// int errorcode = [[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:self.deviceName?:@"" xp2pinfo:xp2pValue];
41054106

41064107
//重新拉流/推流
41074108
// [self refreshP2PPlayerAndStartCapture];

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,7 @@ - (void)responseP2PdisConnect:(NSNotification *)notify {
893893
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
894894
TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment];
895895
//TODO 重新拉取 p2pinfo 后，setxp2pinfo
896-
[[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:DeviceName?:@"" xp2pinfo:@"请重新拉取xp2pinfo，填入此处"];
896+
// [[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:DeviceName?:@"" xp2pinfo:@"请重新拉取xp2pinfo，填入此处"];
897897
[self setVieoPlayerStartPlayWith:self.qualityString];
898898
});
899899

‎Source/LinkSDKDemo/Video/NVRList/Controller/TIoTDemoNVRSubDeviceVC.m‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,12 +191,13 @@ - (void)resconnectXp2pWithDevicename:(NSString *)deviceName xp2pInfo:(NSString *
191191
config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
192192
config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID];
193193

194+
config.xp2pinfo = xp2pInfoString;
195+
194196
config.autoConfigFromDevice = NO;
195197
config.type = XP2P_PROTOCOL_AUTO;
196198
config.crossStunTurn = NO;
197199

198200
int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:deviceName?:@"" appconfig:config];
199-
[[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:deviceName?:@"" xp2pinfo:xp2pInfoString?:@""];
200201
}
201202

202203
- (void)setupUIViews {

‎Source/LinkSDKDemo/Video/P2P/Controller/PreviousPath/TIoTPlayListVC.m‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,13 @@ - (void)requestXp2pInfoWithDeviceName:(NSString *)deviceName xp2pInfo:(NSString
109109
config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
110110
config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID];
111111

112+
config.xp2pinfo = xp2pInfo;
113+
112114
config.autoConfigFromDevice = NO;
113115
config.type = XP2P_PROTOCOL_AUTO;
114116
config.crossStunTurn = NO;
115117

116118
int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:deviceName?:@"" appconfig:config];
117-
[[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:deviceName?:@"" xp2pinfo:xp2pInfo?:@""];
118119
}
119120
/// video 设备列表
120121
- (void)requestVideoList {

‎Source/LinkSDKDemo/Video/P2P/Controller/PreviousPath/TIoTPlayMovieVC.m‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,12 +215,13 @@ - (void)resconnectXp2pWithDevicename:(NSString *)deviceName xp2pInfo:(NSString *
215215
config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
216216
config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID];
217217

218+
config.xp2pinfo = xp2pInfoString;
219+
218220
config.autoConfigFromDevice = NO;
219221
config.type = XP2P_PROTOCOL_AUTO;
220222
config.crossStunTurn = NO;
221223

222224
int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:deviceName?:@"" appconfig:config];
223-
[[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:deviceName?:@"" xp2pinfo:xp2pInfoString?:@""];
224225
}
225226

226227
- (void)viewDidDisappear:(BOOL)animated {

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

Lines changed: 24 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -126,25 +126,9 @@ - (void)viewDidLoad {
126126

127127
[self setupPreViewViews];
128128

129+
[self requestXp2pInfo];
129130
TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment];
130131

131-
TIoTP2PAPPConfig *config = [TIoTP2PAPPConfig new];
132-
config.appkey = env.appKey; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
133-
config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
134-
config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID];
135-
136-
config.autoConfigFromDevice = YES;
137-
config.type = XP2P_PROTOCOL_AUTO;
138-
config.crossStunTurn = NO;
139-
140-
int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:self.deviceName?:@"" appconfig:config];
141-
if (errorcode == XP2P_ERR_VERSION) {
142-
UIAlertController *alertC = [UIAlertController alertControllerWithTitle:@"APP SDK 版本与设备端 SDK 版本号不匹配，版本号需前两位保持一致" message:nil preferredStyle:(UIAlertControllerStyleAlert)];
143-
UIAlertAction *alertA = [UIAlertAction actionWithTitle:@"确定" style:(UIAlertActionStyleDefault) handler:^(UIAlertAction * _Nonnull action) {
144-
}];
145-
[alertC addAction:alertA];
146-
[self presentViewController:alertC animated:YES completion:nil];
147-
}
148132
UIBarButtonItem *right = [[UIBarButtonItem alloc] initWithTitle:@"播放调试面板" style:UIBarButtonItemStylePlain target:self action:@selector(showHudView)];
149133
self.navigationItem.rightBarButtonItem = right;
150134
}
@@ -155,8 +139,27 @@ - (void)requestDiffDeviceDataWithXp2pInfo:(NSString *)xp2pInfo {
155139
[self requestCloudStoreVideoList];
156140

157141
TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment];
158-
[[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:self.deviceName?:@"" xp2pinfo:xp2pInfo?:@""];
159-
[self setVieoPlayerStartPlayWith:self.qualityString];
142+
143+
TIoTP2PAPPConfig *config = [TIoTP2PAPPConfig new];
144+
config.appkey = env.appKey; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
145+
config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
146+
config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID];
147+
148+
149+
config.xp2pinfo = xp2pInfo;
150+
151+
config.autoConfigFromDevice = NO;
152+
config.type = XP2P_PROTOCOL_AUTO;
153+
config.crossStunTurn = NO;
154+
155+
int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:self.deviceName?:@"" appconfig:config];
156+
if (errorcode == XP2P_ERR_VERSION) {
157+
UIAlertController *alertC = [UIAlertController alertControllerWithTitle:@"APP SDK 版本与设备端 SDK 版本号不匹配，版本号需前两位保持一致" message:nil preferredStyle:(UIAlertControllerStyleAlert)];
158+
UIAlertAction *alertA = [UIAlertAction actionWithTitle:@"确定" style:(UIAlertActionStyleDefault) handler:^(UIAlertAction * _Nonnull action) {
159+
}];
160+
[alertC addAction:alertA];
161+
[self presentViewController:alertC animated:YES completion:nil];
162+
}
160163

161164
//计算IPC打洞开始时间
162165
self.startIpcP2P = CACurrentMediaTime();
@@ -1186,28 +1189,10 @@ - (void)refushVideo:(NSNotification *)notify {
11861189

11871190
[MBProgressHUD show:[NSString stringWithFormat:@"%@ 本地服务已ready，可发起拉流或推流",selectedName] icon:@"" view:self.view];
11881191

1192+
[self setVieoPlayerStartPlayWith:self.qualityString];
11891193
//计算IPC打洞时间
11901194
self.endIpcP2P = CACurrentMediaTime();
11911195

1192-
//NSString *appVersion = [TIoTCoreXP2PBridge getSDKVersion];
1193-
// appVersion.floatValue < 2.1 旧设备直接播放，不用发送信令验证设备状态和添加参数
1194-
/*
1195-
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
1196-
NSString *urlString = [[TIoTCoreXP2PBridge sharedInstance] getUrlForHttpFlv:self.deviceName]?:@"";
1197-
1198-
self.videoUrl = [NSString stringWithFormat:@"%@ipc.flv?action=live",urlString];
1199-
1200-
[self configVideo];
1201-
[self.player prepareToPlay];
1202-
[self.player play];
1203-
1204-
self.startPlayer = CACurrentMediaTime();
1205-
});
1206-
*/
1207-
[self requestXp2pInfo];
1208-
// [self setVieoPlayerStartPlayWith:self.qualityString];
1209-
1210-
// [self getDeviceStatusWithType:action_live qualityType:self.qualityString];
12111196
}
12121197
}
12131198

@@ -1255,7 +1240,7 @@ - (void)resconnectXp2pRequestInfo:(NSString *)DeviceName {
12551240

12561241
- (void)resconnectXp2pWithDevicename:(NSString *)deviceName xp2pInfo:(NSString *)xp2pInfo {
12571242
TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment];
1258-
[[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:deviceName?:@"" xp2pinfo:xp2pInfo?:@""];
1243+
// [[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:deviceName?:@"" xp2pinfo:xp2pInfo?:@""];
12591244

12601245
[self getDeviceStatusWithType:action_live qualityType:self.qualityString completion:^(BOOL finished) {
12611246
if (finished) {

‎Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoSameScreenVC.m‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -675,12 +675,13 @@ - (void)resconnectXp2pWithDevicename:(NSString *)deviceName xp2pInfo:(NSString *
675675
config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
676676
config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID];
677677

678+
config.xp2pinfo = xp2pInfoString;
679+
678680
config.autoConfigFromDevice = NO;
679681
config.type = XP2P_PROTOCOL_AUTO;
680682
config.crossStunTurn = NO;
681683

682684
int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:deviceName?:@"" appconfig:config];
683-
[[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:deviceName?:@"" xp2pinfo:xp2pInfoString?:@""];
684685
}
685686

686687
#pragma mark -IJKPlayer

‎Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoVideoCallVC.m‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,13 @@ - (void)requestDiffDeviceDataWithXp2pInfo:(NSString *)xp2pInfo {
116116
config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
117117
config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID];
118118

119+
config.xp2pinfo = xp2pInfo;
120+
119121
config.autoConfigFromDevice = NO;
120122
config.type = XP2P_PROTOCOL_AUTO;
121123
config.crossStunTurn = NO;
122124

123125
int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:self.deviceName?:@"" appconfig:config];
124-
[[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:self.deviceName?:@"" xp2pinfo:xp2pInfo?:@""];
125126

126127
if (errorcode == XP2P_ERR_VERSION) {
127128
UIAlertController *alertC = [UIAlertController alertControllerWithTitle:@"APP SDK 版本与设备端 SDK 版本号不匹配，版本号需前两位保持一致" message:nil preferredStyle:(UIAlertControllerStyleAlert)];
@@ -558,7 +559,7 @@ - (void)resconnectXp2pRequestInfo:(NSString *)DeviceName {
558559

559560
- (void)resconnectXp2pWithDevicename:(NSString *)deviceName xp2pInfo:(NSString *)xp2pInfo {
560561
TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment];
561-
[[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:deviceName?:@"" xp2pinfo:xp2pInfo?:@""];
562+
// [[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:deviceName?:@"" xp2pinfo:xp2pInfo?:@""];
562563

563564
[self getDeviceStatusWithType:action_live qualityType:self.qualityString completion:^(BOOL finished) {
564565
if (finished) {

‎Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoVideoPushVC.m‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,12 +175,13 @@ - (void)requestDiffDeviceDataWithXp2pInfo:(NSString *)xp2pInfo {
175175
config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
176176
config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID];
177177

178+
config.xp2pinfo = xp2pInfo;
179+
178180
config.autoConfigFromDevice = NO;
179181
config.type = XP2P_PROTOCOL_AUTO;
180182
config.crossStunTurn = NO;
181183

182184
int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:self.deviceName?:@"" appconfig:config];
183-
[[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:self.deviceName?:@"" xp2pinfo:xp2pInfo?:@""];
184185

185186
if (errorcode == XP2P_ERR_VERSION) {
186187
UIAlertController *alertC = [UIAlertController alertControllerWithTitle:@"APP SDK 版本与设备端 SDK 版本号不匹配，版本号需前两位保持一致" message:nil preferredStyle:(UIAlertControllerStyleAlert)];
@@ -525,7 +526,7 @@ - (void)resconnectXp2pRequestInfo:(NSString *)DeviceName {
525526

526527
- (void)resconnectXp2pWithDevicename:(NSString *)deviceName xp2pInfo:(NSString *)xp2pInfo {
527528
TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment];
528-
[[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:deviceName?:@"" xp2pinfo:xp2pInfo?:@""];
529+
// [[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:deviceName?:@"" xp2pinfo:xp2pInfo?:@""];
529530

530531
[self getDeviceStatusWithType:action_live qualityType:self.qualityString completion:^(BOOL finished) {
531532
if (finished) {

0 commit comments

Comments
 (0)