添加2.4.49版本判断是否跟随

eagleychen · eagleychen · commit 8259ab46dc68 · 2025-03-13T16:16:21.000+08:00
diff --git a/Source/LinkApp/Classes/Module/EquipmentPanel/Controller/TIoTPanelVC.m b/Source/LinkApp/Classes/Module/EquipmentPanel/Controller/TIoTPanelVC.m
@@ -947,7 +947,6 @@ - (void)starP2PServer {
     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.xp2pinfo = xp2pValue;
     
diff --git a/Source/LinkSDKDemo/Video/Login/Controller/TIoTDeviceInfoVC.m b/Source/LinkSDKDemo/Video/Login/Controller/TIoTDeviceInfoVC.m
@@ -195,8 +195,6 @@ - (void)judgeAutoFillInputInfo {
     
     self.productID.text = [TIoTCoreUserManage shared].demoAreaNetProductID;
     self.devicenname.text =  [TIoTCoreUserManage shared].demoAreaNetClientToken;
-    self.xp2pinfo.text =  [TIoTCoreUserManage shared].demoAreaNetClientToken;
-
 }
 
 - (void)saveInputInfo {
diff --git a/Source/LinkSDKDemo/Video/NVRList/Controller/TIoTDemoNVRSubDeviceVC.m b/Source/LinkSDKDemo/Video/NVRList/Controller/TIoTDemoNVRSubDeviceVC.m
@@ -189,7 +189,6 @@ - (void)resconnectXp2pWithDevicename:(NSString *)deviceName xp2pInfo:(NSString *
     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.xp2pinfo = xp2pInfoString;
     
diff --git a/Source/LinkSDKDemo/Video/P2P/Controller/PreviousPath/TIoTPlayListVC.m b/Source/LinkSDKDemo/Video/P2P/Controller/PreviousPath/TIoTPlayListVC.m
@@ -107,7 +107,6 @@ - (void)requestXp2pInfoWithDeviceName:(NSString *)deviceName xp2pInfo:(NSString
     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.xp2pinfo = xp2pInfo;
     
diff --git a/Source/LinkSDKDemo/Video/P2P/Controller/PreviousPath/TIoTPlayMovieVC.m b/Source/LinkSDKDemo/Video/P2P/Controller/PreviousPath/TIoTPlayMovieVC.m
@@ -213,7 +213,6 @@ - (void)resconnectXp2pWithDevicename:(NSString *)deviceName xp2pInfo:(NSString *
     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.xp2pinfo = xp2pInfoString;
     
diff --git a/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoPreviewDeviceVC.m b/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoPreviewDeviceVC.m
@@ -147,7 +147,6 @@ - (void)requestDiffDeviceDataWithXp2pInfo:(NSString *)xp2pInfo {
         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.xp2pinfo = xp2pInfo;
         
diff --git a/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoSameScreenVC.m b/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoSameScreenVC.m
@@ -673,7 +673,6 @@ - (void)resconnectXp2pWithDevicename:(NSString *)deviceName xp2pInfo:(NSString *
     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.xp2pinfo = xp2pInfoString;
     
diff --git a/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoVideoCallVC.m b/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoVideoCallVC.m
@@ -114,7 +114,6 @@ - (void)requestDiffDeviceDataWithXp2pInfo:(NSString *)xp2pInfo {
     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.xp2pinfo = xp2pInfo;
     
diff --git a/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoVideoPushVC.m b/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoVideoPushVC.m
@@ -173,7 +173,6 @@ - (void)requestDiffDeviceDataWithXp2pInfo:(NSString *)xp2pInfo {
     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.xp2pinfo = xp2pInfo;
     
diff --git a/Source/LinkSDKDemo/Video/P2P/Mjpeg/TIoTDemoPreviewMJPEGVC.m b/Source/LinkSDKDemo/Video/P2P/Mjpeg/TIoTDemoPreviewMJPEGVC.m
@@ -147,7 +147,6 @@ - (void)requestDiffDeviceDataWithXp2pInfo:(NSString *)xp2pInfo {
         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.xp2pinfo = xp2pInfo;
         
diff --git a/Source/LinkSDKDemo/Video/PlayBack/LocalPlayBack/Controller/TIoTDemoLocalRecordVC.m b/Source/LinkSDKDemo/Video/PlayBack/LocalPlayBack/Controller/TIoTDemoLocalRecordVC.m
@@ -1625,7 +1625,6 @@ - (void)resconnectXp2pWithDevicename:(NSString *)deviceName xp2pInfo:(NSString *
     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.xp2pinfo = xp2pInfoString;
     
diff --git a/Source/LinkSDKDemo/Video/PlayBack/TIoTDemoPlaybackVC.m b/Source/LinkSDKDemo/Video/PlayBack/TIoTDemoPlaybackVC.m
@@ -96,7 +96,6 @@ - (void)requestDiffDeviceDataWithXp2pInfo:(NSString *)xp2pInfo {
             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.xp2pinfo = xp2pInfo;
             
@@ -299,7 +298,6 @@ - (void)resconnectXp2pWithDevicename:(NSString *)deviceName xp2pInfo:(NSString *
     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.xp2pinfo = xp2pInfoString;
     
diff --git a/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.h b/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.h
@@ -21,7 +21,6 @@ extern NSNotificationName const TIoTCoreXP2PBridgeNotificationStreamEnd;
 @interface TIoTP2PAPPConfig : NSObject
 @property (nonatomic, strong)NSString *appkey; //为explorer平台注册的应用信息(https://console.cloud.tencent.com/iotexplorer/v2/instance/app/detai) explorer控制台- 应用开发 - 选对应的应用下的 appkey/appsecret
 @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, strong)NSString *xp2pinfo; //被连接设备的p2p_info
 
diff --git a/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm b/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm
@@ -20,9 +20,13 @@
 //NSFileHandle *fileHandle;
 static BOOL p2p_log_enabled = NO;
 static BOOL ops_report_enabled = YES;
+@interface TIoTP2PAPPConfig ()
+@property (nonatomic, strong)NSString *userid;
+@end
 @implementation TIoTP2PAPPConfig
 @end
 
+
 @interface TIoTCoreXP2PBridge ()<TIoTAVCaptionFLVDelegate>
 @property (nonatomic, strong) NSString *dev_name;
 @property (nonatomic, strong) NSString *pro_id;
@@ -241,7 +245,46 @@ - (const char *)dicConvertString:(NSDictionary *)dic {
     return jsonString.UTF8String;
 }
 
+// 判断版本号是否小于 2.4.49
+BOOL isVersionLessThanTarget(NSString *version, NSString *targetVersion) {
+    // 将版本号拆分为数组
+    NSArray *versionComponents = [version componentsSeparatedByString:@"."];
+    NSArray *targetComponents = [targetVersion componentsSeparatedByString:@"."];
+    
+    // 逐个比较版本号
+    for (NSInteger i = 0; i < MIN(versionComponents.count, targetComponents.count); i++) {
+        NSInteger versionPart = [versionComponents[i] integerValue];
+        NSInteger targetPart = [targetComponents[i] integerValue];
+        
+        if (versionPart < targetPart) {
+            return YES; // 当前部分小于目标部分
+        } else if (versionPart > targetPart) {
+            return NO; // 当前部分大于目标部分
+        }
+    }
+    
+    // 如果前面的部分都相等，就返回不小于（NO表示大于等于）
+    return NO;
+}
+
+// 提取 % 后面的子字符串并判断版本
+BOOL checkVersionAfterPercent(NSString *input) {
+    // 查找 % 的位置
+    NSRange percentRange = [input rangeOfString:@"%"];
+    if (percentRange.location == NSNotFound) {
+        NSLog(@"未找到 % 符号");
+        return NO;
+    }
+    
+    // 提取 % 后面的子字符串
+    NSString *versionString = [input substringFromIndex:percentRange.location + 1];
+    
+    // 判断版本是否小于 2.4.49
+    return isVersionLessThanTarget(versionString, @"2.4.49");
+}
+
 - (XP2PErrCode)startAppWith:(NSString *)pro_id dev_name:(NSString *)dev_name appconfig:(TIoTP2PAPPConfig *)appconfig {
+    appconfig.userid = [self getAppUUID];
     if (!appconfig || appconfig.appkey.length < 1 || appconfig.appsecret.length < 1 || appconfig.userid.length < 1) {
         NSLog(@"请输入正确的appconfig");
         return XP2P_ERR_INIT_PRM;
@@ -250,6 +293,12 @@ - (XP2PErrCode)startAppWith:(NSString *)pro_id dev_name:(NSString *)dev_name app
         NSLog(@"请输入正确的xp2pInfo");
         return XP2P_ERR_INIT_PRM;
     }
+    BOOL result = checkVersionAfterPercent(appconfig.xp2pinfo);
+    if (result) {
+        appconfig.autoConfigFromDevice = NO;
+    }
+    
+    
     [self appGetUserConfig:appconfig]; //get config
     
     NSString *bundleid = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleIdentifier"]?:@"";
@@ -320,7 +369,9 @@ - (NSString *)signMessage:(NSString *)message withSecret:(NSString *)secret {
         // Base64 解码
         const char *cKey  = [secret cStringUsingEncoding:NSASCIIStringEncoding];
         const char *cData = [message cStringUsingEncoding:NSASCIIStringEncoding];
-
+        if (cKey == NULL || cData == NULL) {
+            return nil;
+        }
         //sha1
         unsigned char cHMAC[CC_SHA1_DIGEST_LENGTH];
         CCHmac(kCCHmacAlgSHA1, cKey, strlen(cKey), cData, strlen(cData), cHMAC);

Original file line number	Diff line number	Diff line change
`@@ -195,8 +195,6 @@ - (void)judgeAutoFillInputInfo {`
`195`	`195`
`196`	`196`	`self.productID.text = [TIoTCoreUserManage shared].demoAreaNetProductID;`
`197`	`197`	`self.devicenname.text = [TIoTCoreUserManage shared].demoAreaNetClientToken;`
`198`		`- self.xp2pinfo.text = [TIoTCoreUserManage shared].demoAreaNetClientToken;`
`199`		`-`
`200`	`198`	`}`
`201`	`199`
`202`	`200`	`- (void)saveInputInfo {`