Skip to content

Commit 806b0b4

Browse files
author
eagleychen
committed
删除废弃接口，使用配置才可启动
1 parent 29a759c commit 806b0b4

File tree

12 files changed

+122
-23
lines changed

12 files changed

+122
-23
lines changed

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -942,7 +942,18 @@ - (void)starP2PServer {
942942
}
943943
}
944944
NSLog(@"_sys_xp2p_info xp2pValue : %@",xp2pValue);
945-
int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:self.productId?:@"" dev_name:self.deviceName?:@""];
945+
946+
TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment];
947+
TIoTP2PAPPConfig *config = [TIoTP2PAPPConfig new];
948+
config.appkey = env.appKey; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
949+
config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
950+
config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID];
951+
952+
config.autoConfigFromDevice = NO;
953+
config.type = XP2P_PROTOCOL_AUTO;
954+
config.crossStunTurn = NO;
955+
956+
int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:self.productId dev_name:self.deviceName?:@"" appconfig:config];
946957
[[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:self.deviceName xp2pinfo:xp2pValue];
947958

948959
if (errorcode == XP2P_ERR_VERSION) {

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,17 @@ - (void)requestXp2pInfoWithDeviceName:(NSString *)deviceName isReconnection:(BOO
185185

186186
- (void)resconnectXp2pWithDevicename:(NSString *)deviceName xp2pInfo:(NSString *)xp2pInfoString {
187187
TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment];
188-
[[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:deviceName?:@""];
188+
189+
TIoTP2PAPPConfig *config = [TIoTP2PAPPConfig new];
190+
config.appkey = env.appKey; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
191+
config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
192+
config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID];
193+
194+
config.autoConfigFromDevice = NO;
195+
config.type = XP2P_PROTOCOL_AUTO;
196+
config.crossStunTurn = NO;
197+
198+
int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:deviceName?:@"" appconfig:config];
189199
[[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:deviceName?:@"" xp2pinfo:xp2pInfoString?:@""];
190200
}
191201

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,17 @@ - (void)requestXp2pInfo:(NSString *)deviceName {
103103

104104
- (void)requestXp2pInfoWithDeviceName:(NSString *)deviceName xp2pInfo:(NSString *)xp2pInfo{
105105
TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment];
106-
[[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:deviceName?:@""];
106+
107+
TIoTP2PAPPConfig *config = [TIoTP2PAPPConfig new];
108+
config.appkey = env.appKey; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
109+
config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
110+
config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID];
111+
112+
config.autoConfigFromDevice = NO;
113+
config.type = XP2P_PROTOCOL_AUTO;
114+
config.crossStunTurn = NO;
115+
116+
int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:deviceName?:@"" appconfig:config];
107117
[[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:deviceName?:@"" xp2pinfo:xp2pInfo?:@""];
108118
}
109119
/// video 设备列表

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,17 @@ - (void)responseP2PdisConnect:(NSNotification *)notify {
209209

210210
- (void)resconnectXp2pWithDevicename:(NSString *)deviceName xp2pInfo:(NSString *)xp2pInfoString {
211211
TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment];
212-
[[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:deviceName?:@""];
212+
213+
TIoTP2PAPPConfig *config = [TIoTP2PAPPConfig new];
214+
config.appkey = env.appKey; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
215+
config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
216+
config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID];
217+
218+
config.autoConfigFromDevice = NO;
219+
config.type = XP2P_PROTOCOL_AUTO;
220+
config.crossStunTurn = NO;
221+
222+
int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:deviceName?:@"" appconfig:config];
213223
[[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:deviceName?:@"" xp2pinfo:xp2pInfoString?:@""];
214224
}
215225

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,17 @@ - (void)requestXp2pInfoWithDeviceName:(NSString *)deviceName isReconnection:(BOO
669669

670670
- (void)resconnectXp2pWithDevicename:(NSString *)deviceName xp2pInfo:(NSString *)xp2pInfoString {
671671
TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment];
672-
[[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:deviceName?:@""];
672+
673+
TIoTP2PAPPConfig *config = [TIoTP2PAPPConfig new];
674+
config.appkey = env.appKey; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
675+
config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
676+
config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID];
677+
678+
config.autoConfigFromDevice = NO;
679+
config.type = XP2P_PROTOCOL_AUTO;
680+
config.crossStunTurn = NO;
681+
682+
int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:deviceName?:@"" appconfig:config];
673683
[[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:deviceName?:@"" xp2pinfo:xp2pInfoString?:@""];
674684
}
675685

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,17 @@ - (void)viewDidLoad {
110110
- (void)requestDiffDeviceDataWithXp2pInfo:(NSString *)xp2pInfo {
111111

112112
TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment];
113-
int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:self.deviceName?:@""];
113+
114+
TIoTP2PAPPConfig *config = [TIoTP2PAPPConfig new];
115+
config.appkey = env.appKey; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
116+
config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
117+
config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID];
118+
119+
config.autoConfigFromDevice = NO;
120+
config.type = XP2P_PROTOCOL_AUTO;
121+
config.crossStunTurn = NO;
122+
123+
int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:self.deviceName?:@"" appconfig:config];
114124
[[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:self.deviceName?:@"" xp2pinfo:xp2pInfo?:@""];
115125

116126
if (errorcode == XP2P_ERR_VERSION) {

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,17 @@ - (void)getEncoderAACData:(NSData *)data {
169169
- (void)requestDiffDeviceDataWithXp2pInfo:(NSString *)xp2pInfo {
170170

171171
TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment];
172-
int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:self.deviceName?:@""];
172+
173+
TIoTP2PAPPConfig *config = [TIoTP2PAPPConfig new];
174+
config.appkey = env.appKey; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
175+
config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
176+
config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID];
177+
178+
config.autoConfigFromDevice = NO;
179+
config.type = XP2P_PROTOCOL_AUTO;
180+
config.crossStunTurn = NO;
181+
182+
int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:self.deviceName?:@"" appconfig:config];
173183
[[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:self.deviceName?:@"" xp2pinfo:xp2pInfo?:@""];
174184

175185
if (errorcode == XP2P_ERR_VERSION) {

‎Source/LinkSDKDemo/Video/P2P/Mjpeg/TIoTDemoPreviewMJPEGVC.m

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,17 @@ - (void)requestDiffDeviceDataWithXp2pInfo:(NSString *)xp2pInfo {
143143
[self requestCloudStoreVideoList];
144144

145145
TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment];
146-
int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:self.deviceName?:@""];
146+
147+
TIoTP2PAPPConfig *config = [TIoTP2PAPPConfig new];
148+
config.appkey = env.appKey; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
149+
config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
150+
config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID];
151+
152+
config.autoConfigFromDevice = NO;
153+
config.type = XP2P_PROTOCOL_AUTO;
154+
config.crossStunTurn = NO;
155+
156+
int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:self.deviceName?:@"" appconfig:config];
147157
[[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:self.deviceName?:@"" xp2pinfo:xp2pInfo?:@""];
148158

149159
if (errorcode == XP2P_ERR_VERSION) {

‎Source/LinkSDKDemo/Video/PlayBack/LocalPlayBack/Controller/TIoTDemoLocalRecordVC.m

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1621,7 +1621,17 @@ - (void)responseLocalP2PdisConnect:(NSNotification *)notify {
16211621

16221622
- (void)resconnectXp2pWithDevicename:(NSString *)deviceName xp2pInfo:(NSString *)xp2pInfoString {
16231623
TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment];
1624-
[[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:deviceName?:@""];
1624+
1625+
TIoTP2PAPPConfig *config = [TIoTP2PAPPConfig new];
1626+
config.appkey = env.appKey; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
1627+
config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
1628+
config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID];
1629+
1630+
config.autoConfigFromDevice = NO;
1631+
config.type = XP2P_PROTOCOL_AUTO;
1632+
config.crossStunTurn = NO;
1633+
1634+
int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:deviceName?:@"" appconfig:config];
16251635
[[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:deviceName?:@"" xp2pinfo:xp2pInfoString?:@""];
16261636
}
16271637

‎Source/LinkSDKDemo/Video/PlayBack/TIoTDemoPlaybackVC.m

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,17 @@ - (void)requestDiffDeviceDataWithXp2pInfo:(NSString *)xp2pInfo {
9292
if (self.isNVR == NO) {
9393

9494
TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment];
95-
int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:self.deviceName?:@""];
95+
96+
TIoTP2PAPPConfig *config = [TIoTP2PAPPConfig new];
97+
config.appkey = env.appKey; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
98+
config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
99+
config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID];
100+
101+
config.autoConfigFromDevice = NO;
102+
config.type = XP2P_PROTOCOL_AUTO;
103+
config.crossStunTurn = NO;
104+
105+
int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:self.deviceName?:@"" appconfig:config];
96106
[[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:self.deviceName?:@"" xp2pinfo:xp2pInfo?:@""];
97107

98108
if (errorcode == XP2P_ERR_VERSION) {
@@ -284,7 +294,17 @@ - (void)responseP2PdisConnect:(NSNotification *)notify {
284294

285295
- (void)resconnectXp2pWithDevicename:(NSString *)deviceName xp2pInfo:(NSString *)xp2pInfoString {
286296
TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment];
287-
[[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:deviceName?:@""];
297+
298+
TIoTP2PAPPConfig *config = [TIoTP2PAPPConfig new];
299+
config.appkey = env.appKey; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
300+
config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
301+
config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID];
302+
303+
config.autoConfigFromDevice = NO;
304+
config.type = XP2P_PROTOCOL_AUTO;
305+
config.crossStunTurn = NO;
306+
307+
int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:deviceName?:@"" appconfig:config];
288308
[[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:deviceName?:@"" xp2pinfo:xp2pInfoString?:@""];
289309
}
290310

0 commit comments

Comments
 (0)