优化暗门

artimenring-iOS/Artimenring/AppDelegate+login.m

@@ -11,10 +11,12 @@
 @implementation AppDelegate (login)
 
 + (void)checkLogin {
-    int area = [UserDataHelper getSelectArea];
+    int area = [UserDataHelper getLoginType];
     if (area == -1) {
         [[DataManager shared] showSKSelectAreaViewController];
     } else {
+        [ServerManager resetServerCategory];
+        
         NSDictionary* loginData = [UserDataHelper getLastLoginInfo];
         LogInModel* loginModel = [LogInModel mj_objectWithKeyValues:loginData];
         

artimenring-iOS/Artimenring/Artimenring-Prefix.pch

@@ -29,6 +29,9 @@
 #import "ERequest.h"
 #import "SKRequestURL.h"
 #import "ServerManager.h"
+#import "ServerManager+type.h"
+#import "ServerManager+category.h"
+#import "ServerManager+domains.h"
 #import "BlackDoorManager.h"
 #import "WindowLoggerManager.h"
 

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

@@ -27,7 +27,7 @@
 }
 
 - (UIView*)addWhiteView {
-    CGFloat Height = BDM_SCREEN_HEIGHT - 100;
+    CGFloat Height = 450;
     UIView* view = [[UIView alloc] initWithFrame:CGRectMake(20, (BDM_SCREEN_HEIGHT-Height)/2, BDM_SCREEN_WIDTH - 40, Height)];
     [view setBackgroundColor:[UIColor whiteColor]];
     [self addSubview:view];
@@ -52,12 +52,15 @@
     UIButton* button = [[UIButton alloc] init];
     button.titleLabel.lineBreakMode = 0;//这句话很重要，不加这句话加上换行符也没用
     [button setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
-    [view addSubview:button];
-    
     button.alpha = 0.1;
     [button setTitle:serverNames[serverType] forState:UIControlStateNormal];
     [button setBackgroundColor:[UIColor greenColor]];
     [button setFrame:CGRectMake(15, 70, view.frame.size.width-30, 100)];
+    [view addSubview:button];
+    
+    UIView* dri = [[UIView alloc] initWithFrame:CGRectMake(0, button.frame.origin.y + button.frame.size.height + 20, view.frame.size.width, 0.5)];
+    [dri setBackgroundColor:[UIColor lightGrayColor]];
+    [view addSubview:dri];
 }
 
 - (void)addTypeButtons:(UIView*)view {
@@ -88,7 +91,7 @@
         }
         else if (i == 2) {
             [button setTitle:serverNames[i] forState:UIControlStateNormal];
-            [button setBackgroundColor:[UIColor redColor]];
+            [button setBackgroundColor:[UIColor orangeColor]];
             [button setFrame:CGRectMake(view.frame.size.width - 150 - 20, 300, 150, 70)];
         }
     }
@@ -96,7 +99,7 @@
 
 //log
 - (void)addLogButton:(UIView*)view {
-    CGFloat height = 100;
+    CGFloat height = 50;
     UIView* logView = [[UIView alloc] initWithFrame:CGRectMake(0, view.frame.size.height-height, view.frame.size.width, height)];
     [logView setBackgroundColor:[UIColor clearColor]];
     [view addSubview:logView];
@@ -106,13 +109,13 @@
     [dri setBackgroundColor:[UIColor lightGrayColor]];
     [logView addSubview:dri];
     
-    UILabel* logText = [[UILabel alloc] initWithFrame:CGRectMake(20, 0, 200, 30)];
+    UILabel* logText = [[UILabel alloc] initWithFrame:CGRectMake(20, 10, 200, 30)];
     [logText setText:@"屏幕上显示日志"];
     [logText setFont:[UIFont systemFontOfSize:17 weight:UIFontWeightBold]];
     [logView addSubview:logText];
     
     NSInteger logStatus = [BlackDoorManager getLogStatus];
-    UISwitch* switchBtn = [[UISwitch alloc] initWithFrame:CGRectMake((logView.frame.size.width - 50 - 20), 0, 50, 30)];
+    UISwitch* switchBtn = [[UISwitch alloc] initWithFrame:CGRectMake((logView.frame.size.width - 50 - 20), 10, 50, 30)];
     [switchBtn setOn:logStatus == 1];
     [switchBtn addTarget:self action:@selector(clickSwitchButton:) forControlEvents:UIControlEventValueChanged];
     [logView addSubview:switchBtn];
@@ -123,8 +126,11 @@
 }
 
 - (void)serverButtonClick:(UIButton*)button {
+    NSInteger type = button.tag;
+    if (type == [ServerManager getServerType])
+        return;
     [EasyTextView showSuccessText:@"切换服务器成功！"];
-    [ServerManager setServerType:button.tag];
+    [ServerManager setServerType:type];
     [self removeFromSuperview];
 }
 

artimenring-iOS/Artimenring/Classes/SikeyCommonSDK/Manager/ServerManager+category.h

@@ -0,0 +1,23 @@
+//
+//  ServerManager+category.h
+//  SikeyComm
+//
+//  Created by 刘振兴 on 2025/2/25.
+//  Copyright © 2025 BaH Cy. All rights reserved.
+//
+
+#import "ServerManager.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ServerManager (category)
+
+//@"H210服务器", @"VeryFit Kids服务器", @"W112A1国外服务器", @"国内服务器"
++ (NSArray*)getServerCategoryNames;
++ (NSInteger)getServerCategory;
++ (void)setServerCategory:(NSInteger)category;
++ (void)resetServerCategory;
+
+@end
+
+NS_ASSUME_NONNULL_END

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

@@ -0,0 +1,39 @@
+//
+//  ServerManager+category.m
+//  SikeyComm
+//
+//  Created by 刘振兴 on 2025/2/25.
+//  Copyright © 2025 BaH Cy. All rights reserved.
+//
+
+#import "ServerManager+category.h"
+
+@implementation ServerManager (category)
+
++ (NSArray*)getServerCategoryNames {
+    return @[@"", @"H210服务器", @"VeryFit Kids服务器", @"W112A1国外服务器", @"国内服务器"];
+}
+
++ (NSInteger)getServerCategory {
+    NSNumber* type = [[NSUserDefaults standardUserDefaults] objectForKey:@"KEY_SERVER_CATEGORY"];
+    if (type) {
+        return [type integerValue];
+    } else {
+        NSInteger value = 0;
+        [self setServerCategory:value];
+        return value;
+    }
+}
+
++ (void)setServerCategory:(NSInteger)category {
+    SK_PROJECT = category;
+    [[NSUserDefaults standardUserDefaults] setObject:@(category) forKey:@"KEY_SERVER_CATEGORY"];
+    [[NSUserDefaults standardUserDefaults] synchronize];
+}
+
++ (void)resetServerCategory {
+    NSInteger category = [self getServerCategory];
+    SK_PROJECT = category;
+}
+
+@end

artimenring-iOS/Artimenring/Classes/SikeyCommonSDK/Manager/ServerManager+domains.h

@@ -0,0 +1,20 @@
+//
+//  ServerManager+domains.h
+//  SikeyComm
+//
+//  Created by 刘振兴 on 2025/2/25.
+//  Copyright © 2025 BaH Cy. All rights reserved.
+//
+
+#import "ServerManager.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ServerManager (domains)
+
++ (NSArray*)getHttpDomains;
++ (NSArray*)getSocketDomains;
+
+@end
+
+NS_ASSUME_NONNULL_END

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

@@ -0,0 +1,48 @@
+//
+//  ServerManager+domains.m
+//  SikeyComm
+//
+//  Created by 刘振兴 on 2025/2/25.
+//  Copyright © 2025 BaH Cy. All rights reserved.
+//
+
+#import "ServerManager+domains.h"
+#import "ServerManager+type.h"
+#import "ServerManager+url.h"
+
+@implementation ServerManager (domains)
+
+#pragma mark - Http
++ (NSArray*)getHttpDomains {
+    NSInteger type = [self getServerType];
+    return [self getHttpDomainsWithType:type];
+}
+
++ (NSArray*)getHttpDomainsWithType:(NSInteger)type {
+    if (type == 2) // 测试服(不加密)
+        return @[[self getHttpDev], @"", @""];
+    
+    else if (type == 1) // 测试服(加密)
+        return @[[self getHttpTest], @"", @""];
+    
+    return @[[self getHttp], @"", @""]; // 正式环境
+}
+
+
+#pragma mark - Socket
++ (NSArray*)getSocketDomains {
+    NSInteger type = [self getServerType];
+    return [self getSocketDomainsWithType:type];
+}
+
++ (NSArray*)getSocketDomainsWithType:(NSInteger)type {
+    if (type == 2) // 测试服(不加密)
+        return @[[self getSocketDev]];
+    
+    else if (type == 1) // 测试服(加密)
+        return @[[self getSocketTest]];
+    
+    return @[[self getSocket]]; // 正式环境
+}
+
+@end

artimenring-iOS/Artimenring/Classes/SikeyCommonSDK/Manager/ServerManager+type.h

@@ -0,0 +1,22 @@
+//
+//  ServerManager+type.h
+//  SikeyComm
+//
+//  Created by 刘振兴 on 2025/2/25.
+//  Copyright © 2025 BaH Cy. All rights reserved.
+//
+
+#import "ServerManager.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ServerManager (type)
+
+//@"正式服", @"测试服(加密)", @"开发服(不加密)"
++ (NSArray*)getServerTypeNames;
++ (NSInteger)getServerType;
++ (void)setServerType:(NSInteger)type;
+
+@end
+
+NS_ASSUME_NONNULL_END

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

@@ -0,0 +1,33 @@
+//
+//  ServerManager+type.m
+//  SikeyComm
+//
+//  Created by 刘振兴 on 2025/2/25.
+//  Copyright © 2025 BaH Cy. All rights reserved.
+//
+
+#import "ServerManager+type.h"
+
+@implementation ServerManager (type)
+
++ (NSArray*)getServerTypeNames {
+    return @[@"正式服", @"测试服(加密)", @"开发服(不加密)", @"待配置", @"待配置",@"待配置"];
+}
+
++ (NSInteger)getServerType {
+    NSNumber* type = [[NSUserDefaults standardUserDefaults] objectForKey:@"KEY_SERVER_TYPE"];
+    if (type) {
+        return [type integerValue];
+    } else {
+        NSInteger value = 0;
+        [self setServerType:value];
+        return value;
+    }
+}
+
++ (void)setServerType:(NSInteger)type {
+    [[NSUserDefaults standardUserDefaults] setObject:@(type) forKey:@"KEY_SERVER_TYPE"];
+    [[NSUserDefaults standardUserDefaults] synchronize];
+}
+
+@end

artimenring-iOS/Artimenring/Classes/SikeyCommonSDK/SKDefine.h → artimenring-iOS/Artimenring/Classes/SikeyCommonSDK/Manager/ServerManager+url.h

@@ -1,20 +1,16 @@
 //
-//  SKDefine.h
+//  ServerManager+url.h
 //  SikeyComm
 //
-//  Created by 刘振兴 on 2025/2/24.
+//  Created by 刘振兴 on 2025/2/25.
 //  Copyright © 2025 BaH Cy. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+#import "ServerManager.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-extern NSInteger SK_PROJECT;
-
-@interface SKDefine : NSObject
-
-+ (NSArray*)getServerCategoryNames;
+@interface ServerManager (url)
 
 + (NSString*)getHttp;
 + (NSString*)getHttpTest;
@@ -24,7 +20,6 @@ extern NSInteger SK_PROJECT;
 + (NSString*)getSocketTest;
 + (NSString*)getSocketDev;
 
-+ (NSString*)getModel;
 @end
 
 NS_ASSUME_NONNULL_END

artimenring-iOS/Artimenring/Classes/SikeyCommonSDK/SKDefine.m → artimenring-iOS/Artimenring/Classes/SikeyCommonSDK/Manager/ServerManager+url.m

@@ -1,21 +1,14 @@
 //
-//  SKDefine.m
+//  ServerManager+url.m
 //  SikeyComm
 //
-//  Created by 刘振兴 on 2025/2/24.
+//  Created by 刘振兴 on 2025/2/25.
 //  Copyright © 2025 BaH Cy. All rights reserved.
 //
 
-#import "SKDefine.h"
+#import "ServerManager+url.h"
 
-//1:H210、H210YH  2:W303欧洲海外儿童表  3:W112a1国外儿童表 4:国内儿童表
-NSInteger SK_PROJECT = 3;
-
-@implementation SKDefine
-
-+ (NSArray*)getServerCategoryNames {
-    return @[@"H210服务器", @"VeryFit Kids服务器", @"W112A1国外服务器", @"国内服务器"];
-}
+@implementation ServerManager (url)
 
 + (NSString*)getHttp {
     if (SK_PROJECT == 1)
@@ -83,16 +76,4 @@ NSInteger SK_PROJECT = 3;
     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/Artimenring/Classes/SikeyCommonSDK/Manager/ServerManager.h

@@ -9,22 +9,11 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface ServerManager : NSObject
-
-//@"H210服务器", @"VeryFit Kids服务器", @"W112A1国外服务器", @"国内服务器"
-+ (NSArray*)getServerCategoryNames;
-+ (NSInteger)getServerCategory;
-+ (void)setServerCategory:(NSInteger)type;
+extern NSInteger SK_PROJECT;
 
-//@"正式服", @"测试服(加密)", @"开发服(不加密)"
-+ (NSArray*)getServerTypeNames;
-+ (NSInteger)getServerType;
-+ (void)setServerType:(NSInteger)type;
+@interface ServerManager : NSObject
 
-+ (NSArray*)getHttpDomains;
-+ (NSArray*)getHttpDomainsWithType:(NSInteger)type;
-+ (NSArray*)getSocketDomains;
-+ (NSArray*)getSocketDomainsWithType:(NSInteger)type;
++ (NSString*)getModel;
 
 @end
 

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

@@ -6,83 +6,26 @@
 //
 
 #import "ServerManager.h"
-#import "SKDefine.h"
+#import "ServerManager+type.h"
+#import "ServerManager+category.h"
+#import "ServerManager+url.h"
 
 @implementation ServerManager
 
-#pragma mark - category
-+ (NSArray*)getServerCategoryNames {
-    return @[@"H210服务器", @"VeryFit Kids服务器", @"W112A1国外服务器", @"国内服务器"];
-}
-
-+ (NSInteger)getServerCategory {
-    NSNumber* type = [[NSUserDefaults standardUserDefaults] objectForKey:@"KEY_SERVER_CATEGORY"];
-    if (type) {
-        return [type integerValue];
-    } else {
-        NSInteger value = 0;
-        [self setServerCategory:value];
-        return value;
-    }
-}
-
-+ (void)setServerCategory:(NSInteger)type {
-    [[NSUserDefaults standardUserDefaults] setObject:@(type) forKey:@"KEY_SERVER_CATEGORY"];
-    [[NSUserDefaults standardUserDefaults] synchronize];
-}
-
-#pragma mark - type
-+ (NSArray*)getServerTypeNames {
-    return @[@"正式服", @"测试服(加密)", @"开发服(不加密)", @"待配置", @"待配置",@"待配置"];
-}
-
-+ (NSInteger)getServerType {
-    NSNumber* type = [[NSUserDefaults standardUserDefaults] objectForKey:@"KEY_SERVER_TYPE"];
-    if (type) {
-        return [type integerValue];
-    } else {
-        NSInteger value = 0;
-        [self setServerType:value];
-        return value;
-    }
-}
+//1:H210、H210YH  2:W303欧洲海外儿童表  3:W112a1国外儿童表 4:国内儿童表
+NSInteger SK_PROJECT = 0;
 
-+ (void)setServerType:(NSInteger)type {
-    [[NSUserDefaults standardUserDefaults] setObject:@(type) forKey:@"KEY_SERVER_TYPE"];
-    [[NSUserDefaults standardUserDefaults] synchronize];
-}
-
-#pragma mark - Http
-+ (NSArray*)getHttpDomains {
-    NSInteger type = [self getServerType];
-    return [self getHttpDomainsWithType:type];
-}
-
-+ (NSArray*)getHttpDomainsWithType:(NSInteger)type {
-    if (type == 2) // 测试服(不加密)
-        return @[[SKDefine getHttpDev], @"", @""];
-    
-    else if (type == 1) // 测试服(加密)
-        return @[[SKDefine getHttpTest], @"", @""];
-    
-    return @[[SKDefine getHttp], @"", @""]; // 正式环境
-}
-
-
-#pragma mark - Socket
-+ (NSArray*)getSocketDomains {
-    NSInteger type = [self getServerType];
-    return [self getSocketDomainsWithType:type];
-}
 
-+ (NSArray*)getSocketDomainsWithType:(NSInteger)type {
-    if (type == 2) // 测试服(不加密)
-        return @[[SKDefine getSocketDev]];
-    
-    else if (type == 1) // 测试服(加密)
-        return @[[SKDefine getSocketTest]];
-    
-    return @[[SKDefine getSocket]]; // 正式环境
++ (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/Artimenring/Classes/SikeyCommonSDK/Request/ERequest.m

@@ -2,7 +2,6 @@
 #import "ServerManager.h"
 #import "NSString+http.h"
 #import "NSData+http.h"
-#import "SKDefine.h"
 #import <AFNetworking/AFNetworking.h>
 
 #define KEY_AES @"a3ca2bcd4bcda6c7" //加密
@@ -51,8 +50,8 @@
     headers[@"sys"] = @"ios";
     headers[@"sys-no"] = iphoneSystemVersion;
     headers[@"timestamp"] = timestamp;
-    headers[@"device-no"] = [SKDefine getModel];
-    headers[@"device-model"] = [SKDefine getModel];
+    headers[@"device-no"] = [ServerManager getModel];
+    headers[@"device-model"] = [ServerManager getModel];
     headers[@"device-mac"] = [self getMacAddress];
     headers[@"device-type"] = @"3";
     

artimenring-iOS/Artimenring/Classes/Util/UserDataHelper.h

@@ -48,7 +48,7 @@
 
 
 //0:大陆 1:除大陆外的所有国家和地区
-+ (void)setSelectArea:(NSInteger)value;
-+ (int)getSelectArea;
++ (void)setLoginType:(NSInteger)value;
++ (int)getLoginType;
 
 @end

artimenring-iOS/Artimenring/Classes/Util/UserDataHelper.m

@@ -22,7 +22,7 @@ static NSString* s_receivedVoiceNum = @"__receivedVoiceNum__";
 static NSString* s_lastUpdateVoiceDate = @"__lastUpdateVoiceDate";
 static NSString* s_lastSimulatorUserIdKey = @"__lastSimulatorUserIdKey__";
 static NSString* s_pushTokenKey = @"__pushTokenKey__";
-static NSString* s_selectAreaKey = @"__selectAreaKey__";
+static NSString* s_loginTypeKey = @"__loginTypeKey__";
 
 @implementation UserDataHelper
 
@@ -134,15 +134,15 @@ static NSString* s_selectAreaKey = @"__selectAreaKey__";
     return token;
 }
 
-+ (void)setSelectArea:(NSInteger)value {
++ (void)setLoginType:(NSInteger)value {
     NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
-    [userDefaults setObject:@(value) forKey:s_selectAreaKey];
+    [userDefaults setObject:@(value) forKey:s_loginTypeKey];
     [userDefaults synchronize];
 }
 
-+ (int)getSelectArea {
++ (int)getLoginType {
     NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
-    id value = [userDefaults valueForKey:s_selectAreaKey];
+    id value = [userDefaults valueForKey:s_loginTypeKey];
     if(value == nil)
         return -1;
     return [value intValue];

artimenring-iOS/Artimenring/Classes/ViewController/Base/SKBaseAccountViewController.m

@@ -93,7 +93,7 @@
 
 //100:手机号码  200:邮箱
 - (void)initAccountType {
-    int area = [UserDataHelper getSelectArea];
+    int area = [UserDataHelper getLoginType];
     int type = area == 0 ? 100 : 200;
     
     NSInteger start = type;
@@ -219,7 +219,7 @@
 }
 
 - (BOOL)checkAccount {
-    int area = [UserDataHelper getSelectArea];
+    int area = [UserDataHelper getLoginType];
     if (area == 0) {
         return [self checkPhoneAccount];
     } else {

artimenring-iOS/Artimenring/Classes/ViewController/Login/SKEnterPassWordViewController.m

@@ -29,7 +29,7 @@
     if ([self checkAccountPasswordTextField] == NO)
         return;
     
-    int area = [UserDataHelper getSelectArea];
+    int area = [UserDataHelper getLoginType];
     if (area == 0) {
         [self requstPhonePwd];
     } else {

artimenring-iOS/Artimenring/Classes/ViewController/Login/SKForgetPassWordViewController.m

@@ -55,7 +55,7 @@
     if ([self checkAccount] == NO)
         return;
     
-    int area = [UserDataHelper getSelectArea];
+    int area = [UserDataHelper getLoginType];
     SKEnterPassWordViewController* controller = [[self storyboard] instantiateViewControllerWithIdentifier:@"EnterPassWordVC"];
     if (area == 0) {
         NSString* areaCode = [self.mPhoneCountryLabel.text stringByReplacingOccurrencesOfString:@"+" withString:@""];

artimenring-iOS/Artimenring/Classes/ViewController/Login/SKLoginViewController.m

@@ -81,7 +81,7 @@
 }
 
 - (void)confirmActionEx {
-    int area = [UserDataHelper getSelectArea];
+    int area = [UserDataHelper getLoginType];
     if (area == 0) {
         [self phoneLoginRequest];
     } else {

artimenring-iOS/Artimenring/Classes/ViewController/Login/SKRegisterViewController.m

@@ -65,7 +65,7 @@
 }
 
 - (void)confirmActionEx {
-    int area = [UserDataHelper getSelectArea];
+    int area = [UserDataHelper getLoginType];
     if (area == 0) {
         [self phoneRegisterRequest];
     } else {

artimenring-iOS/Artimenring/Classes/ViewController/Login/SKSelectAreaViewController.m

@@ -82,9 +82,11 @@
 - (void)setSelectArea:(NSString*)code {
     //0:大陆 1:除大陆外的所有国家和地区
     if ([code isEqualToString:@"86"] || [code isEqualToString:@"+86"]) {
-        [UserDataHelper setSelectArea:0];
+        [ServerManager setServerCategory:4];
+        [UserDataHelper setLoginType:0];
     } else {
-        [UserDataHelper setSelectArea:1];
+        [ServerManager setServerCategory:3];
+        [UserDataHelper setLoginType:1];
     }
 }
 

artimenring-iOS/SikeyComm.xcodeproj/project.pbxproj

@@ -179,9 +179,12 @@
 		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 */; };
 		E41389242D6D6A65000D8850 /* BlackDoorManager+click.m in Sources */ = {isa = PBXBuildFile; fileRef = E41389232D6D6A65000D8850 /* BlackDoorManager+click.m */; };
 		E41389272D6D6B54000D8850 /* BlackDoorManager+data.m in Sources */ = {isa = PBXBuildFile; fileRef = E41389262D6D6B54000D8850 /* BlackDoorManager+data.m */; };
+		E413892A2D6DA4F7000D8850 /* ServerManager+url.m in Sources */ = {isa = PBXBuildFile; fileRef = E41389292D6DA4F6000D8850 /* ServerManager+url.m */; };
+		E413892D2D6DA85D000D8850 /* ServerManager+category.m in Sources */ = {isa = PBXBuildFile; fileRef = E413892C2D6DA85D000D8850 /* ServerManager+category.m */; };
+		E41389302D6DA86A000D8850 /* ServerManager+type.m in Sources */ = {isa = PBXBuildFile; fileRef = E413892F2D6DA86A000D8850 /* ServerManager+type.m */; };
+		E41389332D6DA948000D8850 /* ServerManager+domains.m in Sources */ = {isa = PBXBuildFile; fileRef = E41389322D6DA948000D8850 /* ServerManager+domains.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 */; };
@@ -711,12 +714,18 @@
 		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>"; };
 		E41389222D6D6A65000D8850 /* BlackDoorManager+click.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "BlackDoorManager+click.h"; sourceTree = "<group>"; };
 		E41389232D6D6A65000D8850 /* BlackDoorManager+click.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "BlackDoorManager+click.m"; sourceTree = "<group>"; };
 		E41389252D6D6B54000D8850 /* BlackDoorManager+data.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "BlackDoorManager+data.h"; sourceTree = "<group>"; };
 		E41389262D6D6B54000D8850 /* BlackDoorManager+data.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "BlackDoorManager+data.m"; sourceTree = "<group>"; };
+		E41389282D6DA4F6000D8850 /* ServerManager+url.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ServerManager+url.h"; sourceTree = "<group>"; };
+		E41389292D6DA4F6000D8850 /* ServerManager+url.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "ServerManager+url.m"; sourceTree = "<group>"; };
+		E413892B2D6DA85D000D8850 /* ServerManager+category.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ServerManager+category.h"; sourceTree = "<group>"; };
+		E413892C2D6DA85D000D8850 /* ServerManager+category.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "ServerManager+category.m"; sourceTree = "<group>"; };
+		E413892E2D6DA86A000D8850 /* ServerManager+type.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ServerManager+type.h"; sourceTree = "<group>"; };
+		E413892F2D6DA86A000D8850 /* ServerManager+type.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "ServerManager+type.m"; sourceTree = "<group>"; };
+		E41389312D6DA948000D8850 /* ServerManager+domains.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ServerManager+domains.h"; sourceTree = "<group>"; };
+		E41389322D6DA948000D8850 /* ServerManager+domains.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "ServerManager+domains.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>"; };
@@ -2340,8 +2349,6 @@
 				E4D46A272ADE2D980092AB29 /* Additions */,
 				E4D46A332ADE2D980092AB29 /* Manager */,
 				E4D46A382ADE2D980092AB29 /* Request */,
-				E413891F2D6C75DC000D8850 /* SKDefine.h */,
-				E41389202D6C75DC000D8850 /* SKDefine.m */,
 			);
 			path = SikeyCommonSDK;
 			sourceTree = "<group>";
@@ -2372,6 +2379,14 @@
 				E41389262D6D6B54000D8850 /* BlackDoorManager+data.m */,
 				E4D46A342ADE2D980092AB29 /* ServerManager.h */,
 				E4D46A372ADE2D980092AB29 /* ServerManager.m */,
+				E413892B2D6DA85D000D8850 /* ServerManager+category.h */,
+				E413892C2D6DA85D000D8850 /* ServerManager+category.m */,
+				E41389312D6DA948000D8850 /* ServerManager+domains.h */,
+				E41389322D6DA948000D8850 /* ServerManager+domains.m */,
+				E413892E2D6DA86A000D8850 /* ServerManager+type.h */,
+				E413892F2D6DA86A000D8850 /* ServerManager+type.m */,
+				E41389282D6DA4F6000D8850 /* ServerManager+url.h */,
+				E41389292D6DA4F6000D8850 /* ServerManager+url.m */,
 				E4B4A3FE2C89B819002E9179 /* WindowLoggerManager.h */,
 				E4B4A3FF2C89B819002E9179 /* WindowLoggerManager.m */,
 			);
@@ -2964,6 +2979,7 @@
 				273268121FFDF58F0096C8C1 /* SKContactRelationViewController.m in Sources */,
 				E459F0802B6B3D16002571E3 /* WifiListViewController.m in Sources */,
 				E47504D22AF39796006D424A /* UUImageAvatarBrowser.m in Sources */,
+				E413892A2D6DA4F7000D8850 /* ServerManager+url.m in Sources */,
 				E459F0942B6B3D16002571E3 /* SKSchoolTimeDetailViewController.m in Sources */,
 				E49F8D652BA3F8C900EDBAA8 /* NSString+http.m in Sources */,
 				27F64DBD205124620004B6CD /* PushAllMessage+CoreDataClass.m in Sources */,
@@ -2992,7 +3008,6 @@
 				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 */,
@@ -3036,6 +3051,7 @@
 				E47FBA2F2B6B838600BB42DE /* SKAlarmClockDetailCell.m in Sources */,
 				271CD168200493830060C574 /* SKOnOffHistoryViewController.m in Sources */,
 				E41ECB632CF95C6C00C4C36C /* SKMainViewController+watch.m in Sources */,
+				E413892D2D6DA85D000D8850 /* ServerManager+category.m in Sources */,
 				2738E574205A6B3600ACDF71 /* CoreDataManager.m in Sources */,
 				273141581FCD39DB004AA5F4 /* SKWatchViewCell.m in Sources */,
 				E459F09C2B6B3D16002571E3 /* SKPushFlagViewController.m in Sources */,
@@ -3221,6 +3237,7 @@
 				27BECA1E1CBB504E00E3FD19 /* AmrnbRecorder.mm in Sources */,
 				E4D46A482ADE2D980092AB29 /* ERequest.m in Sources */,
 				E41ECB622CF95C6C00C4C36C /* SKMainViewController+version.m in Sources */,
+				E41389332D6DA948000D8850 /* ServerManager+domains.m in Sources */,
 				E4D46A182ADE2CD70092AB29 /* PGIndexBannerSubiew.m in Sources */,
 				E41ECB962CF95DD700C4C36C /* SKChatTools.m in Sources */,
 				28159C001A3FC46C00A3E1A3 /* UIImage+EAddition.m in Sources */,
@@ -3255,6 +3272,7 @@
 				E4FE9B742AD9465100DEABCA /* ECurveMenuItem.m in Sources */,
 				28159C011A3FC46C00A3E1A3 /* UIView+EAddition.m in Sources */,
 				E4E75FBA2B9F146C00236F73 /* SKChildCellView.m in Sources */,
+				E41389302D6DA86A000D8850 /* ServerManager+type.m in Sources */,
 				E49A83732B625B3A00D5B289 /* SKInCallViewController.m in Sources */,
 				E4499A922D5DD55700653B56 /* SKInCallViewController+touch.m in Sources */,
 				271CD1742004A4F20060C574 /* SKMessageCenterViewController.m in Sources */,