添加跟随配置

Author: eagleychen

Podfile.lock

@@ -35,13 +35,13 @@ PODS:
   - TIoTLinkKit_SoundTouch (1.0.0)
   - TIoTLinkKit_TPNS (1.0.1)
   - TIoTLinkKit_WechatOpenSDK (1.0.1)
-  - TIoTLinkKit_XP2P (2.4.53-beta.202501090851)
+  - TIoTLinkKit_XP2P (2.4.53-beta.202501160208)
   - TIoTLinkVideo (1.0.0):
     - CocoaAsyncSocket (= 7.6.5)
     - TIoTLinkKit_FLV (= 2.2.3)
     - TIoTLinkKit_GVoiceSE (>= 1.0.9)
     - TIoTLinkKit_SoundTouch (= 1.0.0)
-    - TIoTLinkKit_XP2P (= 2.4.53-beta.202501090851)
+    - TIoTLinkKit_XP2P (= 2.4.53-beta.202501160208)
     - TPCircularBuffer (= 1.6.1)
   - TPCircularBuffer (1.6.1)
   - TrueTime (5.0.3)
@@ -133,8 +133,8 @@ SPEC CHECKSUMS:
   TIoTLinkKit_SoundTouch: cf79ae182b6c2349ff65bac7a338974bc538fa77
   TIoTLinkKit_TPNS: 7cea4fc1d20ef6c4c11c4f0b66bbb10ecf4ed968
   TIoTLinkKit_WechatOpenSDK: 7822d68cc5c46edf3f6020422202e7b65ea87614
-  TIoTLinkKit_XP2P: 8deb9634d40c5d0f8017dfe194772df7ffdef91d
-  TIoTLinkVideo: d54f51752e79671adb62a4392b603c57f86de5e0
+  TIoTLinkKit_XP2P: 437662cf3a6020ac396a3048202b85254afaa930
+  TIoTLinkVideo: a230c64dea6108cb1a7af207279fd6bb7543d381
   TPCircularBuffer: c13243556527551c4d320709c7b14a6d20cdc30a
   TrueTime: b49551ffafb28a9dee04e51b226f42a416010842
   TXLiteAVSDK_TRTC: e3383a81565e8bb2aaaaab4bd099ad5239cd5b2d

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

@@ -128,7 +128,16 @@ - (void)viewDidLoad {
 
     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 = YES;
+    config.type = XP2P_PROTOCOL_AUTO;
+    config.crossStunTurn = NO;
+    
+    int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:env.cloudProductId dev_name:self.deviceName?:@"" appconfig:config];
     if (errorcode == XP2P_ERR_VERSION) {
         UIAlertController *alertC = [UIAlertController alertControllerWithTitle:@"APP SDK 版本与设备端 SDK 版本号不匹配，版本号需前两位保持一致" message:nil preferredStyle:(UIAlertControllerStyleAlert)];
         UIAlertAction *alertA = [UIAlertAction actionWithTitle:@"确定" style:(UIAlertActionStyleDefault) handler:^(UIAlertAction * _Nonnull action) {

Source/SDK/LinkVideo/TIoTCoreXP2PBridge.h

@@ -23,6 +23,7 @@ extern NSNotificationName const TIoTCoreXP2PBridgeNotificationStreamEnd;
 @property (nonatomic, strong)NSString *appsecret; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai)
 @property (nonatomic, strong)NSString *userid; //用户纬度（每个手机区分开）使用用户自有的账号系统userid；若无请配置为[TIoTCoreXP2PBridge sharedInstance].getAppUUID; 查找日志是需提供此userid字段
 
+@property (nonatomic, assign)BOOL autoConfigFromDevice; //是否跟随对应设备配置,YES 后下面的配置（cross、type等）不生效
 @property (nonatomic, assign)BOOL crossStunTurn; //是否打开双中转开关，默认false
 @property (nonatomic, assign)XP2PProtocolType type; //通信协议，默认auto
 @end

Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm

@@ -231,17 +231,6 @@ - (instancetype)init {
     return self;
 }
 
-/*
-- (XP2PErrCode)startAppWith:(NSString *)sec_id sec_key:(NSString *)sec_key pro_id:(NSString *)pro_id dev_name:(NSString *)dev_name {
-    return [self startAppWith:sec_id sec_key:sec_key pro_id:pro_id dev_name:dev_name xp2pinfo:@""];
-}
-- (XP2PErrCode)startAppWith:(NSString *)sec_id sec_key:(NSString *)sec_key pro_id:(NSString *)pro_id dev_name:(NSString *)dev_name xp2pinfo:(NSString *)xp2pinfo {
-    setQcloudApiCred([sec_id UTF8String], [sec_key UTF8String]); //正式版app发布时候需要去掉，避免泄露secretid和secretkey，此处仅为演示
-    int ret = [self startAppWith:pro_id dev_name:dev_name type:XP2P_PROTOCOL_AUTO];
-    setDeviceXp2pInfo(dev_name.UTF8String, xp2pinfo.UTF8String);
-    return (XP2PErrCode)ret;
-}
-*/
 - (const char *)dicConvertString:(NSDictionary *)dic {
     NSError *error;
     NSData *jsonData = [NSJSONSerialization dataWithJSONObject:dic options:kNilOptions error:&error];
@@ -258,6 +247,7 @@ - (XP2PErrCode)startAppWith:(NSString *)pro_id dev_name:(NSString *)dev_name {
     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];
@@ -293,14 +283,30 @@ - (XP2PErrCode)startAppWith:(NSString *)pro_id dev_name:(NSString *)dev_name app
 
     // 配置是否启用双中转
     setCrossStunTurn(false);
-    if (appconfig.crossStunTurn) {
-        setCrossStunTurn(true);
-    }
 
     //1.配置IOT_P2P SDK
     self.pro_id = pro_id;
     self.dev_name = dev_name;
-    int ret = startService(dev_name.UTF8String, pro_id.UTF8String, dev_name.UTF8String, appconfig.type);
+    
+    int ret = XP2P_ERR_NONE;
+    
+    if (appconfig.autoConfigFromDevice) {
+        [self appGeDeviceConfig:appconfig]; //get config
+        
+    }else {
+        app_config_t config_ = {
+            .server = "",
+            .ip = "",
+            .port = 20002,
+            .type = appconfig.type
+        };
+        
+        if (appconfig.crossStunTurn) {
+            setCrossStunTurn(true);
+        }
+        ret = startService(dev_name.UTF8String, pro_id.UTF8String, dev_name.UTF8String, config_);
+    }
+    
     return (XP2PErrCode)ret;
 }
 
@@ -398,6 +404,75 @@ - (void)appGetUserConfig:(TIoTP2PAPPConfig *)appconfig {
     [tasklog resume];
 }
 
+- (void)appGeDeviceConfig:(TIoTP2PAPPConfig *)appconfig {
+    NSMutableDictionary *accessParam = [NSMutableDictionary dictionary];
+    [accessParam setValue:@"AppDescribeConfigureDeviceP2P" forKey:@"Action"];
+    [accessParam setValue:@([[TIoTCoreXP2PBridge getNowTimeTimestampSec] integerValue]) forKey:@"Timestamp"];
+    [accessParam setValue:@(arc4random()) forKey:@"Nonce"];
+    [accessParam setValue:appconfig.appkey forKey:@"AppKey"];
+    [accessParam setValue:self.pro_id forKey:@"ProductId"];
+    [accessParam setValue:self.dev_name forKey:@"DeviceName"];
+    [accessParam setValue:[[NSUUID UUID] UUIDString] forKey:@"RequestId"];
+    
+    NSString *content = createSortedQueryString(accessParam);
+    NSString *signature = [self signMessage:content withSecret:appconfig.appsecret];
+    [accessParam setValue:signature forKey:@"Signature"];
+    
+    
+    NSURL *url = [NSURL URLWithString:@"https://iot.cloud.tencent.com/api/exploreropen/appapi"];
+    NSMutableURLRequest *reqlog = [NSMutableURLRequest requestWithURL:url cachePolicy:NSURLRequestUseProtocolCachePolicy timeoutInterval:5];
+    [reqlog setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
+    reqlog.HTTPMethod = @"POST";
+    reqlog.HTTPBody = [NSJSONSerialization dataWithJSONObject:accessParam options:NSJSONWritingFragmentsAllowed error:nil];;
+    NSURLSessionDataTask *tasklog = [[NSURLSession sharedSession] dataTaskWithRequest:reqlog completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
+        
+        app_config_t config_ = {
+            .server = "",
+            .ip = "",
+            .port = 20002,
+            .type = appconfig.type,
+            .cross = false
+        };
+        
+        NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)response;
+        if (httpResponse.statusCode == 200) {
+            NSError *jsonerror = nil;
+            NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingAllowFragments error:&jsonerror];
+//            NSLog(@"log serverapi:content===>%@, param==>%@, data===>%@",content,accessParam,dic);
+            NSDictionary *deviceconfig = [[dic objectForKey:@"data"] objectForKey:@"Config"];
+            
+            bool enableCrossStunTurn = [[deviceconfig objectForKey:@"EnableCrossStunTurn"] boolValue];
+            int stunPort = [[deviceconfig objectForKey:@"StunPort"] intValue];
+            NSString *stunHost = [deviceconfig objectForKey:@"StunHost"];
+            NSString *stunIP = [deviceconfig objectForKey:@"StunIP"];
+            NSString *protocol = [deviceconfig objectForKey:@"Protocol"];
+            
+            config_.cross = enableCrossStunTurn;
+            if (stunPort) {
+                config_.port = stunPort;
+            }
+            if (stunHost.length > 0) {
+                config_.server = stunHost.UTF8String;
+            }
+            if (stunIP.length > 0) {
+                config_.ip = stunIP.UTF8String;
+            }
+            if ([protocol isEqualToString:@"TCP"]) {
+                config_.type = XP2P_PROTOCOL_TCP;
+            }else {
+                config_.type = XP2P_PROTOCOL_AUTO;
+            }
+        }
+        
+        
+        if (config_.cross) {
+            setCrossStunTurn(true);
+        }
+        startService(self.dev_name.UTF8String, self.pro_id.UTF8String, self.dev_name.UTF8String, config_);
+    }];
+    [tasklog resume];
+}
+
 - (NSString *)getUrlForHttpFlv:(NSString *)dev_name {
     const char *httpflv =  delegateHttpFlv(dev_name.UTF8String);
     NSLog(@"httpflv---%s",httpflv);
@@ -845,9 +920,6 @@ - (void)setAppConfig:(NSDictionary *)appconfig {
 
     [self saveKeychainValue:tmp_p2p_log_enabled key:@"p2p_log_enabled"];
     [self saveKeychainValue:tmp_ops_report_enabled key:@"ops_report_enabled"];
-    
-    p2p_log_enabled = tmp_p2p_log_enabled.boolValue;
-    ops_report_enabled = tmp_ops_report_enabled.boolValue;
 }
 
 + (NSString *)getSDKVersion {

TIoTLinkVideo.podspec

@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
   s.source_files  = 'Source/SDK/LinkVideo/**/*.{h,m,c,mm}'
   s.resource = 'Source/SDK/LinkVideo/FLV/asset/GvoiceSE_v1_239-119-oneref-e.nn'
 
-  s.dependency 'TIoTLinkKit_XP2P', '2.4.53-beta.202501090851'
+  s.dependency 'TIoTLinkKit_XP2P', '2.4.53-beta.202501160208'
   s.dependency 'TIoTLinkKit_FLV', '2.2.3'
   s.dependency 'CocoaAsyncSocket', '7.6.5'
   s.dependency 'TIoTLinkKit_SoundTouch', '1.0.0'