diff --git a/Source/LinkApp/Classes/Module/EquipmentPanel/Controller/TIoTPanelVC.m b/Source/LinkApp/Classes/Module/EquipmentPanel/Controller/TIoTPanelVC.m index 1341175d..d229de58 100644 --- a/Source/LinkApp/Classes/Module/EquipmentPanel/Controller/TIoTPanelVC.m +++ b/Source/LinkApp/Classes/Module/EquipmentPanel/Controller/TIoTPanelVC.m @@ -942,7 +942,18 @@ - (void)starP2PServer { } } NSLog(@"_sys_xp2p_info xp2pValue : %@",xp2pValue); - int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:self.productId?:@"" dev_name:self.deviceName?:@""]; + + TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment]; + TIoTP2PAPPConfig *config = [TIoTP2PAPPConfig new]; + config.appkey = env.appKey; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret + config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret + config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID]; + + config.autoConfigFromDevice = NO; + config.type = XP2P_PROTOCOL_AUTO; + config.crossStunTurn = NO; + + int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:self.productId dev_name:self.deviceName?:@"" appconfig:config]; [[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:self.deviceName xp2pinfo:xp2pValue]; if (errorcode == XP2P_ERR_VERSION) { diff --git a/Source/LinkSDKDemo/Video/NVRList/Controller/TIoTDemoNVRSubDeviceVC.m b/Source/LinkSDKDemo/Video/NVRList/Controller/TIoTDemoNVRSubDeviceVC.m index 93dab19d..2b3184d2 100644 --- a/Source/LinkSDKDemo/Video/NVRList/Controller/TIoTDemoNVRSubDeviceVC.m +++ b/Source/LinkSDKDemo/Video/NVRList/Controller/TIoTDemoNVRSubDeviceVC.m @@ -185,7 +185,17 @@ - (void)requestXp2pInfoWithDeviceName:(NSString *)deviceName isReconnection:(BOO - (void)resconnectXp2pWithDevicename:(NSString *)deviceName xp2pInfo:(NSString *)xp2pInfoString { TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment]; - [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:deviceName?:@""]; + + TIoTP2PAPPConfig *config = [TIoTP2PAPPConfig new]; + config.appkey = env.appKey; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret + config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret + config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID]; + + config.autoConfigFromDevice = NO; + config.type = XP2P_PROTOCOL_AUTO; + config.crossStunTurn = NO; + + int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:deviceName?:@"" appconfig:config]; [[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:deviceName?:@"" xp2pinfo:xp2pInfoString?:@""]; } diff --git a/Source/LinkSDKDemo/Video/P2P/Controller/PreviousPath/TIoTPlayListVC.m b/Source/LinkSDKDemo/Video/P2P/Controller/PreviousPath/TIoTPlayListVC.m index 1af17e7e..fe6d5270 100644 --- a/Source/LinkSDKDemo/Video/P2P/Controller/PreviousPath/TIoTPlayListVC.m +++ b/Source/LinkSDKDemo/Video/P2P/Controller/PreviousPath/TIoTPlayListVC.m @@ -103,7 +103,17 @@ - (void)requestXp2pInfo:(NSString *)deviceName { - (void)requestXp2pInfoWithDeviceName:(NSString *)deviceName xp2pInfo:(NSString *)xp2pInfo{ TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment]; - [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:deviceName?:@""]; + + TIoTP2PAPPConfig *config = [TIoTP2PAPPConfig new]; + config.appkey = env.appKey; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret + config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret + config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID]; + + config.autoConfigFromDevice = NO; + config.type = XP2P_PROTOCOL_AUTO; + config.crossStunTurn = NO; + + int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:deviceName?:@"" appconfig:config]; [[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:deviceName?:@"" xp2pinfo:xp2pInfo?:@""]; } /// video 设备列表 diff --git a/Source/LinkSDKDemo/Video/P2P/Controller/PreviousPath/TIoTPlayMovieVC.m b/Source/LinkSDKDemo/Video/P2P/Controller/PreviousPath/TIoTPlayMovieVC.m index 4ca09241..746bcb2f 100644 --- a/Source/LinkSDKDemo/Video/P2P/Controller/PreviousPath/TIoTPlayMovieVC.m +++ b/Source/LinkSDKDemo/Video/P2P/Controller/PreviousPath/TIoTPlayMovieVC.m @@ -209,7 +209,17 @@ - (void)responseP2PdisConnect:(NSNotification *)notify { - (void)resconnectXp2pWithDevicename:(NSString *)deviceName xp2pInfo:(NSString *)xp2pInfoString { TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment]; - [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:deviceName?:@""]; + + TIoTP2PAPPConfig *config = [TIoTP2PAPPConfig new]; + config.appkey = env.appKey; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret + config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret + config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID]; + + config.autoConfigFromDevice = NO; + config.type = XP2P_PROTOCOL_AUTO; + config.crossStunTurn = NO; + + int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:deviceName?:@"" appconfig:config]; [[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:deviceName?:@"" xp2pinfo:xp2pInfoString?:@""]; } diff --git a/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoSameScreenVC.m b/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoSameScreenVC.m index df90ac6b..63e9d617 100644 --- a/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoSameScreenVC.m +++ b/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoSameScreenVC.m @@ -669,7 +669,17 @@ - (void)requestXp2pInfoWithDeviceName:(NSString *)deviceName isReconnection:(BOO - (void)resconnectXp2pWithDevicename:(NSString *)deviceName xp2pInfo:(NSString *)xp2pInfoString { TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment]; - [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:deviceName?:@""]; + + TIoTP2PAPPConfig *config = [TIoTP2PAPPConfig new]; + config.appkey = env.appKey; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret + config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret + config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID]; + + config.autoConfigFromDevice = NO; + config.type = XP2P_PROTOCOL_AUTO; + config.crossStunTurn = NO; + + int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:deviceName?:@"" appconfig:config]; [[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:deviceName?:@"" xp2pinfo:xp2pInfoString?:@""]; } diff --git a/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoVideoCallVC.m b/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoVideoCallVC.m index 9f065b97..a180835d 100644 --- a/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoVideoCallVC.m +++ b/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoVideoCallVC.m @@ -110,7 +110,17 @@ - (void)viewDidLoad { - (void)requestDiffDeviceDataWithXp2pInfo:(NSString *)xp2pInfo { TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment]; - int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:self.deviceName?:@""]; + + TIoTP2PAPPConfig *config = [TIoTP2PAPPConfig new]; + config.appkey = env.appKey; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret + config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret + config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID]; + + config.autoConfigFromDevice = NO; + config.type = XP2P_PROTOCOL_AUTO; + config.crossStunTurn = NO; + + int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:self.deviceName?:@"" appconfig:config]; [[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:self.deviceName?:@"" xp2pinfo:xp2pInfo?:@""]; if (errorcode == XP2P_ERR_VERSION) { diff --git a/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoVideoPushVC.m b/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoVideoPushVC.m index 3b221e7a..cdc9a664 100644 --- a/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoVideoPushVC.m +++ b/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoVideoPushVC.m @@ -169,7 +169,17 @@ - (void)getEncoderAACData:(NSData *)data { - (void)requestDiffDeviceDataWithXp2pInfo:(NSString *)xp2pInfo { TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment]; - int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:self.deviceName?:@""]; + + TIoTP2PAPPConfig *config = [TIoTP2PAPPConfig new]; + config.appkey = env.appKey; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret + config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret + config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID]; + + config.autoConfigFromDevice = NO; + config.type = XP2P_PROTOCOL_AUTO; + config.crossStunTurn = NO; + + int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:self.deviceName?:@"" appconfig:config]; [[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:self.deviceName?:@"" xp2pinfo:xp2pInfo?:@""]; if (errorcode == XP2P_ERR_VERSION) { diff --git a/Source/LinkSDKDemo/Video/P2P/Mjpeg/TIoTDemoPreviewMJPEGVC.m b/Source/LinkSDKDemo/Video/P2P/Mjpeg/TIoTDemoPreviewMJPEGVC.m index df4086df..98a345ce 100644 --- a/Source/LinkSDKDemo/Video/P2P/Mjpeg/TIoTDemoPreviewMJPEGVC.m +++ b/Source/LinkSDKDemo/Video/P2P/Mjpeg/TIoTDemoPreviewMJPEGVC.m @@ -143,7 +143,17 @@ - (void)requestDiffDeviceDataWithXp2pInfo:(NSString *)xp2pInfo { [self requestCloudStoreVideoList]; TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment]; - int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:self.deviceName?:@""]; + + TIoTP2PAPPConfig *config = [TIoTP2PAPPConfig new]; + config.appkey = env.appKey; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret + config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret + config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID]; + + config.autoConfigFromDevice = NO; + config.type = XP2P_PROTOCOL_AUTO; + config.crossStunTurn = NO; + + int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:self.deviceName?:@"" appconfig:config]; [[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:self.deviceName?:@"" xp2pinfo:xp2pInfo?:@""]; if (errorcode == XP2P_ERR_VERSION) { diff --git a/Source/LinkSDKDemo/Video/PlayBack/LocalPlayBack/Controller/TIoTDemoLocalRecordVC.m b/Source/LinkSDKDemo/Video/PlayBack/LocalPlayBack/Controller/TIoTDemoLocalRecordVC.m index 3f2dbae7..667d3d67 100644 --- a/Source/LinkSDKDemo/Video/PlayBack/LocalPlayBack/Controller/TIoTDemoLocalRecordVC.m +++ b/Source/LinkSDKDemo/Video/PlayBack/LocalPlayBack/Controller/TIoTDemoLocalRecordVC.m @@ -1621,7 +1621,17 @@ - (void)responseLocalP2PdisConnect:(NSNotification *)notify { - (void)resconnectXp2pWithDevicename:(NSString *)deviceName xp2pInfo:(NSString *)xp2pInfoString { TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment]; - [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:deviceName?:@""]; + + TIoTP2PAPPConfig *config = [TIoTP2PAPPConfig new]; + config.appkey = env.appKey; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret + config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret + config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID]; + + config.autoConfigFromDevice = NO; + config.type = XP2P_PROTOCOL_AUTO; + config.crossStunTurn = NO; + + int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:deviceName?:@"" appconfig:config]; [[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:deviceName?:@"" xp2pinfo:xp2pInfoString?:@""]; } diff --git a/Source/LinkSDKDemo/Video/PlayBack/TIoTDemoPlaybackVC.m b/Source/LinkSDKDemo/Video/PlayBack/TIoTDemoPlaybackVC.m index 93607c85..fb43c9f2 100644 --- a/Source/LinkSDKDemo/Video/PlayBack/TIoTDemoPlaybackVC.m +++ b/Source/LinkSDKDemo/Video/PlayBack/TIoTDemoPlaybackVC.m @@ -92,7 +92,17 @@ - (void)requestDiffDeviceDataWithXp2pInfo:(NSString *)xp2pInfo { if (self.isNVR == NO) { TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment]; - int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:self.deviceName?:@""]; + + TIoTP2PAPPConfig *config = [TIoTP2PAPPConfig new]; + config.appkey = env.appKey; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret + config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret + config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID]; + + config.autoConfigFromDevice = NO; + config.type = XP2P_PROTOCOL_AUTO; + config.crossStunTurn = NO; + + int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:self.deviceName?:@"" appconfig:config]; [[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:self.deviceName?:@"" xp2pinfo:xp2pInfo?:@""]; if (errorcode == XP2P_ERR_VERSION) { @@ -284,7 +294,17 @@ - (void)responseP2PdisConnect:(NSNotification *)notify { - (void)resconnectXp2pWithDevicename:(NSString *)deviceName xp2pInfo:(NSString *)xp2pInfoString { TIoTCoreAppEnvironment *env = [TIoTCoreAppEnvironment shareEnvironment]; - [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:deviceName?:@""]; + + TIoTP2PAPPConfig *config = [TIoTP2PAPPConfig new]; + config.appkey = env.appKey; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret + config.appsecret = env.appSecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret + config.userid = [[TIoTCoreXP2PBridge sharedInstance] getAppUUID]; + + config.autoConfigFromDevice = NO; + config.type = XP2P_PROTOCOL_AUTO; + config.crossStunTurn = NO; + + int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:deviceName?:@"" appconfig:config]; [[TIoTCoreXP2PBridge sharedInstance] setXp2pInfo:deviceName?:@"" xp2pinfo:xp2pInfoString?:@""]; } diff --git a/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.h b/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.h index e69fec13..7124843a 100644 --- a/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.h +++ b/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.h @@ -82,7 +82,6 @@ extern NSNotificationName const TIoTCoreXP2PBridgeNotificationStreamEnd; * 启动 sdk 服务,productid和devicename可以从video控制台创建得倒 * type: 默认auto模式,udp探测不通自动切换至tcp */ -- (XP2PErrCode)startAppWith:(NSString *)pro_id dev_name:(NSString *)dev_name; __attribute__((deprecated("Use -startAppWith: dev_name: appconfig:"))); - (XP2PErrCode)startAppWith:(NSString *)pro_id dev_name:(NSString *)dev_name appconfig:(TIoTP2PAPPConfig *)appconfig; /* diff --git a/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm b/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm index d2342fce..26c66909 100644 --- a/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm +++ b/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm @@ -241,17 +241,6 @@ - (const char *)dicConvertString:(NSDictionary *)dic { return jsonString.UTF8String; } -- (XP2PErrCode)startAppWith:(NSString *)pro_id dev_name:(NSString *)dev_name { - TIoTP2PAPPConfig *config = [TIoTP2PAPPConfig new]; - config.appkey = @"appkey"; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret - config.appsecret = @"appsecret"; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret - config.userid = [self getAppUUID]; - - config.autoConfigFromDevice = NO; - config.type = XP2P_PROTOCOL_AUTO; - config.crossStunTurn = NO; - return [self startAppWith:pro_id dev_name:dev_name appconfig:config]; -} - (XP2PErrCode)startAppWith:(NSString *)pro_id dev_name:(NSString *)dev_name appconfig:(TIoTP2PAPPConfig *)appconfig { if (!appconfig || appconfig.appkey.length < 1 || appconfig.appsecret.length < 1 || appconfig.userid.length < 1) { NSLog(@"请输入正确的appconfig");