配置服务器 url

artimenring-iOS/Artimenring/Classes/SikeyCommonSDK/Manager/ServerManager.m

@@ -30,7 +30,6 @@
     [[NSUserDefaults standardUserDefaults] synchronize];
 }
 
-
 #pragma mark - Http
 + (NSArray*)getHttpDomains {
     NSInteger type = [self getServerType];
@@ -39,12 +38,12 @@
 
 + (NSArray*)getHttpDomainsWithType:(NSInteger)type {
     if (type == 2) // 测试服(不加密)
-        return @[URL_HTTP_DEV, @"", @""];
+        return @[[SKDefine getHttpDev], @"", @""];
     
     else if (type == 1) // 测试服(加密)
-        return @[URL_HTTP_TEST, @"", @""];
+        return @[[SKDefine getHttpTest], @"", @""];
     
-    return @[URL_HTTP, @"", @""]; // 正式环境
+    return @[[SKDefine getHttp], @"", @""]; // 正式环境
 }
 
 
@@ -56,12 +55,12 @@
 
 + (NSArray*)getSocketDomainsWithType:(NSInteger)type {
     if (type == 2) // 测试服(不加密)
-        return @[URL_SOCKET_DEV];
+        return @[[SKDefine getSocketDev]];
     
     else if (type == 1) // 测试服(加密)
-        return @[URL_SOCKET_TEST];
+        return @[[SKDefine getSocketTest]];
     
-    return @[URL_SOCKET]; // 正式环境
+    return @[[SKDefine getSocket]]; // 正式环境
 }
 
 @end

artimenring-iOS/Artimenring/Classes/SikeyCommonSDK/Request/ERequest.m

@@ -5,6 +5,8 @@
 #import "SKDefine.h"
 #import <AFNetworking/AFNetworking.h>
 
+#define KEY_AES @"a3ca2bcd4bcda6c7" //加密
+
 
 @implementation ERequest
 + (NSDictionary*)setHeaders:(NSDictionary*)param isEncrypt:(BOOL)isEncrypt contentType:(NSString*)contentType {
@@ -49,8 +51,8 @@
     headers[@"sys"] = @"ios";
     headers[@"sys-no"] = iphoneSystemVersion;
     headers[@"timestamp"] = timestamp;
-    headers[@"device-no"] = WATCH_MODEL;
-    headers[@"device-model"] = WATCH_MODEL;
+    headers[@"device-no"] = [SKDefine getModel];
+    headers[@"device-model"] = [SKDefine getModel];
     headers[@"device-mac"] = [self getMacAddress];
     headers[@"device-type"] = @"3";
     

artimenring-iOS/Artimenring/Classes/SikeyCommonSDK/SKDefine.h

@@ -1,40 +1,27 @@
-#ifndef SKDefine_h
-#define SKDefine_h
+//
+//  SKDefine.h
+//  SikeyComm
+//
+//  Created by 刘振兴 on 2025/2/24.
+//  Copyright © 2025 BaH Cy. All rights reserved.
+//
 
-//Key
-#define SK_PROJECT             3  //1:H210  2:海外儿童表  3:国内儿童表
-#define WATCH_MODEL_H210       @"H210"
-#define WATCH_MODEL_OVERSEA    @"W303"
-#define WATCH_MODEL            SK_PROJECT == 1 ? WATCH_MODEL_H210 : WATCH_MODEL_OVERSEA
-#define KEY_AES                 @"a3ca2bcd4bcda6c7" //加密
+#import <Foundation/Foundation.h>
 
+NS_ASSUME_NONNULL_BEGIN
 
-//Http
-#if SK_PROJECT == 1 //H210、H210YH
-    #define URL_HTTP            @"http://api.tecanswer.com"
-    #define URL_HTTP_TEST       @"http://api-test.tecanswer.com"
-    #define URL_HTTP_DEV        @"http://192.168.111.227"
-#elif SK_PROJECT == 2 //W303海外
-    #define URL_HTTP            @"http://eu.tecanswer.com"
-    #define URL_HTTP_TEST       @"http://api-test.tecanswer.com"
-    #define URL_HTTP_DEV        @"http://api-test.tecanswer.com"
-#elif SK_PROJECT == 3 //W303国内
-    #define URL_HTTP            @"http://api.sikey.com.cn"
-    #define URL_HTTP_TEST       @"http://api.sikey.com.cn"
-    #define URL_HTTP_DEV        @"http://api.sikey.com.cn"
-#endif
+extern NSInteger SK_PROJECT;
 
+@interface SKDefine : NSObject
++ (NSString*)getHttp;
++ (NSString*)getHttpTest;
++ (NSString*)getHttpDev;
 
-//Socket
-#if SK_PROJECT == 2 //H210、H210YH
-    #define URL_SOCKET              @"ws://euws.tecanswer.com/websocket/endpoint"
-    #define URL_SOCKET_TEST         @"ws://ws-test.tecanswer.com/websocket/endpoint"
-    #define URL_SOCKET_DEV          @"ws://ws-test.tecanswer.com/websocket/endpoint"
-#else
-    #define URL_SOCKET              @"ws://api.sikey.com.cn/api/v2/gatewayctx/connect/websocket"
-    #define URL_SOCKET_TEST         @"ws://api.sikey.com.cn/api/v2/gatewayctx/connect/websocket"
-    #define URL_SOCKET_DEV          @"ws://api.sikey.com.cn/api/v2/gatewayctx/connect/websocket"
-#endif
++ (NSString*)getSocket;
++ (NSString*)getSocketTest;
++ (NSString*)getSocketDev;
 
++ (NSString*)getModel;
+@end
 
-#endif /* SKDefine_h */
+NS_ASSUME_NONNULL_END

artimenring-iOS/Artimenring/Classes/SikeyCommonSDK/SKDefine.m

@@ -0,0 +1,94 @@
+//
+//  SKDefine.m
+//  SikeyComm
+//
+//  Created by 刘振兴 on 2025/2/24.
+//  Copyright © 2025 BaH Cy. All rights reserved.
+//
+
+#import "SKDefine.h"
+
+//1:H210、H210YH  2:W303欧洲海外儿童表  3:W112a1国外儿童表 4:国内儿童表
+NSInteger SK_PROJECT = 3;
+
+@implementation SKDefine
+
++ (NSString*)getHttp {
+    if (SK_PROJECT == 1)
+        return @"http://api.tecanswer.com";
+    else if (SK_PROJECT == 2)
+        return @"http://eu.tecanswer.com";
+    else if (SK_PROJECT == 3)
+        return @"https://sgp.tecanswer.com/w";
+    else if (SK_PROJECT == 4)
+        return @"http://api.sikey.com.cn";
+    return @"";
+}
+
++ (NSString*)getHttpTest {
+    if (SK_PROJECT == 1)
+        return @"http://api-test.tecanswer.com";
+    else if (SK_PROJECT == 2)
+        return @"http://api-test.tecanswer.com";
+    else if (SK_PROJECT == 3)
+        return @"https://sgp.tecanswer.com/w";
+    else if (SK_PROJECT == 4)
+        return @"http://api.sikey.com.cn";
+    return @"";
+}
+
++ (NSString*)getHttpDev {
+    if (SK_PROJECT == 1)
+        return @"http://192.168.111.227";
+    else if (SK_PROJECT == 2)
+        return @"http://api-test.tecanswer.com";
+    else if (SK_PROJECT == 3)
+        return @"https://sgp.tecanswer.com/w";
+    else if (SK_PROJECT == 4)
+        return @"http://api.sikey.com.cn";
+    return @"";
+}
+
++ (NSString*)getSocket {
+    if (SK_PROJECT == 2)
+        return @"ws://euws.tecanswer.com/websocket/endpoint";
+    else if (SK_PROJECT == 3)
+        return @"wss://sgp.tecanswer.com/w/api/v2/gatewayctx/connect/websocket";
+    else if (SK_PROJECT == 4)
+        return @"ws://api.sikey.com.cn/api/v2/gatewayctx/connect/websocket";
+    return @"";
+}
+
++ (NSString*)getSocketTest {
+    if (SK_PROJECT == 2)
+        return @"ws://ws-test.tecanswer.com/websocket/endpoint";
+    else if (SK_PROJECT == 3)
+        return @"wss://sgp.tecanswer.com/w/api/v2/gatewayctx/connect/websocket";
+    else if (SK_PROJECT == 4)
+        return @"ws://api.sikey.com.cn/api/v2/gatewayctx/connect/websocket";
+    return @"";
+}
+
++ (NSString*)getSocketDev {
+    if (SK_PROJECT == 2)
+        return @"ws://ws-test.tecanswer.com/websocket/endpoint";
+    else if (SK_PROJECT == 3)
+        return @"wss://sgp.tecanswer.com/w/api/v2/gatewayctx/connect/websocket";
+    else if (SK_PROJECT == 4)
+        return @"ws://api.sikey.com.cn/api/v2/gatewayctx/connect/websocket";
+    return @"";
+}
+
++ (NSString*)getModel {
+    if (SK_PROJECT == 1)
+        return @"H210";
+    else if (SK_PROJECT == 2)
+        return @"W303";
+    else if (SK_PROJECT == 3)
+        return @"W112A1";
+    else if (SK_PROJECT == 4)
+        return @"W112A1";
+    return @"";
+}
+
+@end

artimenring-iOS/SikeyComm.xcodeproj/project.pbxproj

@@ -179,6 +179,7 @@
 		7BECF0D51B54DE5700FBC7BF /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BECF0D41B54DE5700FBC7BF /* AVFoundation.framework */; };
 		E4010C2D2BEA3C4C00C0A23F /* video_end.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = E4010C2B2BEA3C4C00C0A23F /* video_end.mp3 */; };
 		E4010C2E2BEA3C4C00C0A23F /* video_start.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = E4010C2C2BEA3C4C00C0A23F /* video_start.mp3 */; };
+		E41389212D6C75DC000D8850 /* SKDefine.m in Sources */ = {isa = PBXBuildFile; fileRef = E41389202D6C75DC000D8850 /* SKDefine.m */; };
 		E41849612B8C8CCB000C18DB /* SKAlarmClockTitleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E41849602B8C8CCB000C18DB /* SKAlarmClockTitleViewController.m */; };
 		E418538B2D64745B00F9C739 /* VideoManager+http.m in Sources */ = {isa = PBXBuildFile; fileRef = E418538A2D64745B00F9C739 /* VideoManager+http.m */; };
 		E418538E2D64767100F9C739 /* VideoManager+view.m in Sources */ = {isa = PBXBuildFile; fileRef = E418538D2D64767100F9C739 /* VideoManager+view.m */; };
@@ -708,6 +709,8 @@
 		E143CF1A3006F6257962D165 /* Pods-VeryFit Kids.test.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-VeryFit Kids.test.xcconfig"; path = "Pods/Target Support Files/Pods-VeryFit Kids/Pods-VeryFit Kids.test.xcconfig"; sourceTree = "<group>"; };
 		E4010C2B2BEA3C4C00C0A23F /* video_end.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = video_end.mp3; sourceTree = "<group>"; };
 		E4010C2C2BEA3C4C00C0A23F /* video_start.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = video_start.mp3; sourceTree = "<group>"; };
+		E413891F2D6C75DC000D8850 /* SKDefine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SKDefine.h; sourceTree = "<group>"; };
+		E41389202D6C75DC000D8850 /* SKDefine.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SKDefine.m; sourceTree = "<group>"; };
 		E418495F2B8C8CCA000C18DB /* SKAlarmClockTitleViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKAlarmClockTitleViewController.h; sourceTree = "<group>"; };
 		E41849602B8C8CCB000C18DB /* SKAlarmClockTitleViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SKAlarmClockTitleViewController.m; sourceTree = "<group>"; };
 		E41853892D64745B00F9C739 /* VideoManager+http.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "VideoManager+http.h"; sourceTree = "<group>"; };
@@ -1011,7 +1014,6 @@
 		E4D46A172ADE2CD70092AB29 /* NewPagedFlowView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewPagedFlowView.h; sourceTree = "<group>"; };
 		E4D46A1A2ADE2CE60092AB29 /* CircleProgressView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CircleProgressView.m; sourceTree = "<group>"; };
 		E4D46A212ADE2CE70092AB29 /* CircleProgressView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CircleProgressView.h; sourceTree = "<group>"; };
-		E4D46A322ADE2D980092AB29 /* SKDefine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKDefine.h; sourceTree = "<group>"; };
 		E4D46A342ADE2D980092AB29 /* ServerManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ServerManager.h; sourceTree = "<group>"; };
 		E4D46A352ADE2D980092AB29 /* BlackDoorManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BlackDoorManager.m; sourceTree = "<group>"; };
 		E4D46A362ADE2D980092AB29 /* BlackDoorManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlackDoorManager.h; sourceTree = "<group>"; };
@@ -2332,7 +2334,8 @@
 				E4D46A272ADE2D980092AB29 /* Additions */,
 				E4D46A332ADE2D980092AB29 /* Manager */,
 				E4D46A382ADE2D980092AB29 /* Request */,
-				E4D46A322ADE2D980092AB29 /* SKDefine.h */,
+				E413891F2D6C75DC000D8850 /* SKDefine.h */,
+				E41389202D6C75DC000D8850 /* SKDefine.m */,
 			);
 			path = SikeyCommonSDK;
 			sourceTree = "<group>";
@@ -2979,6 +2982,7 @@
 				E4EB2E302B021F03000C459F /* DataManager+data.m in Sources */,
 				E4FE9B6B2AD9465100DEABCA /* SSHolidayUK.m in Sources */,
 				2738E577205A6B4300ACDF71 /* PushAllMessage.xcdatamodeld in Sources */,
+				E41389212D6C75DC000D8850 /* SKDefine.m in Sources */,
 				E4735C4F2B6CE81900FCF9D9 /* IQKeyboardManager.m in Sources */,
 				E41ECBC52CF9605E00C4C36C /* SKBaseViewController+image.m in Sources */,
 				E4FE9B7B2AD9465100DEABCA /* IanAdsStartView.m in Sources */,