优化暗门

artimenring-iOS/Artimenring/Classes/SikeyCommonSDK/Manager/BlackDoorManager+click.h

@@ -0,0 +1,19 @@
+//
+//  BlackDoorManager+click.h
+//  SikeyComm
+//
+//  Created by 刘振兴 on 2025/2/25.
+//  Copyright © 2025 BaH Cy. All rights reserved.
+//
+
+#import "BlackDoorManager.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface BlackDoorManager (click)
+
++ (void)addBlackDoorButtons:(UIView*)supperView;
+
+@end
+
+NS_ASSUME_NONNULL_END

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

@@ -0,0 +1,132 @@
+//
+//  BlackDoorManager+click.m
+//  SikeyComm
+//
+//  Created by 刘振兴 on 2025/2/25.
+//  Copyright © 2025 BaH Cy. All rights reserved.
+//
+
+#import "BlackDoorManager+click.h"
+#import "BlackDoorManager+data.h"
+
+#define KEY_BDM_USERCLICK_HEADER @"@BDM*"
+#define KEY_BDM_CLICK_TAG 1234567890
+#define BDM_BUTTON_CLICK_SIZE 90
+#define BDM_BUTTON_SERVER_SIZE_WIDTH 120
+#define BDM_BUTTON_SERVER_SIZE_HEIGHT 50
+#define TIME_INTERVAL_MAX 8
+#define BDM_CLICK_ORDER @"323"
+
+@implementation BlackDoorManager (click)
+
++ (void)addBlackDoorButtons:(UIView*)supperView {
+    for (NSInteger i = 1; i <= 4; i++) {
+        UIButton* button = [[UIButton alloc] init];
+        button.tag = KEY_BDM_CLICK_TAG + i;
+        [button setBackgroundColor:[UIColor clearColor]];
+        [supperView addSubview:button];
+        
+        CGFloat x = ((i == 1) || (i == 3))? 0 : (BDM_SCREEN_WIDTH - BDM_BUTTON_CLICK_SIZE);
+        CGFloat y = ((i == 1) || (i == 2))? 60 : (BDM_SCREEN_HEIGHT - BDM_BUTTON_CLICK_SIZE) - 40;
+        [button setFrame:CGRectMake(x, y, BDM_BUTTON_CLICK_SIZE, BDM_BUTTON_CLICK_SIZE)];
+        [button addTarget:self action:@selector(blButtonClick:) forControlEvents:UIControlEventTouchUpInside];
+    }
+}
+
++ (void)blButtonClick:(UIButton*)button {
+    NSInteger index = button.tag % KEY_BDM_CLICK_TAG ;
+    NSLog(@"BlackDoorManager: index:%ld", (long)index);
+    [self blButtonClickEx:index supperView:[button superview]];
+}
+
++ (void)blButtonClickEx:(NSInteger)index supperView:(UIView*)supperView {
+    switch (index) {
+        case 1: {
+            //清空点击消息
+            [self clearUserClickInfo];
+            
+            NSTimeInterval timestamp = [[NSDate date] timeIntervalSince1970];
+            NSString *info = [NSString stringWithFormat:@"%@_%@_",KEY_BDM_USERCLICK_HEADER, @(timestamp)];
+            [self setUserClickInfo:info];
+            break;
+        }
+        case 2:
+        case 3: {
+            //点击信息不全
+            NSString* info = [self getUserClickInfo];
+            NSArray* array = [info componentsSeparatedByString:@"_"];
+            if (array.count < 2) {
+                [self showTosat:@"请重新点击(跳点)" supperView:supperView];
+                [self clearUserClickInfo];
+                break;
+            }
+            
+            //验证头字串不对
+            NSString* header = array[0];
+            if (![header isEqualToString:KEY_BDM_USERCLICK_HEADER]) {
+                [self showTosat:@"请重新点击(校验错误)" supperView:supperView];
+                [self clearUserClickInfo];
+                break;
+            }
+            
+            [self setUserClickInfo:[NSString stringWithFormat:@"%@%@", info, @(index)]];
+            break;
+        }
+        case 4: {
+            //点击信息不全
+            NSString* info = [self getUserClickInfo];
+            NSArray* array = [info componentsSeparatedByString:@"_"];
+            if (array.count < 3) {
+                [self showTosat:@"请重新点击(跳点)" supperView:supperView];
+                [self clearUserClickInfo];
+                break;
+            }
+            
+            //验证头字串不对
+            NSString* header = array[0];
+            if (![header isEqualToString:KEY_BDM_USERCLICK_HEADER]) {
+                [self showTosat:@"请重新点击(校验错误)" supperView:supperView];
+                [self clearUserClickInfo];
+                break;
+            }
+            
+            //点击超时
+            NSTimeInterval beginTime = [array[1] integerValue];
+            NSTimeInterval nowTime = [[NSDate date] timeIntervalSince1970];
+            if (nowTime > beginTime && (nowTime - beginTime > TIME_INTERVAL_MAX)) {
+                [self showTosat:[NSString stringWithFormat:@"请重新点击(%d秒超时)", TIME_INTERVAL_MAX] supperView:supperView];
+                [self clearUserClickInfo];
+                break;
+            }
+            
+            //点击顺序不对
+            NSString* order = array[2];
+            if (![order isEqualToString:BDM_CLICK_ORDER]) {
+                [self showTosat:@"请重新点击(顺序不对)" supperView:supperView];
+                [self clearUserClickInfo];
+                break;
+            }
+            
+            //验证通过
+            [self showBlackDoorView:supperView];
+            break;
+        }
+        default:
+            break;
+    }
+}
+
+//验证通过
++ (void)showBlackDoorView:(UIView*)supperView {
+    BlackDoorManager* view = [[BlackDoorManager alloc] initWithFrame:supperView.bounds];
+    [supperView addSubview:view];
+}
+
++ (void)showTosat:(NSString *)strMsg supperView:(UIView*)supperView {
+    NSInteger serverType = [ServerManager getServerType];
+    if (serverType == 0)
+        return;
+    [EasyTextView showText:strMsg];
+}
+
+@end

artimenring-iOS/Artimenring/Classes/SikeyCommonSDK/Manager/BlackDoorManager+data.h

@@ -0,0 +1,24 @@
+//
+//  BlackDoorManager+data.h
+//  SikeyComm
+//
+//  Created by 刘振兴 on 2025/2/25.
+//  Copyright © 2025 BaH Cy. All rights reserved.
+//
+
+#import "BlackDoorManager.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface BlackDoorManager (data)
+
++ (NSString*)getUserClickInfo;
++ (void)clearUserClickInfo;
++ (void)setUserClickInfo:(NSString*)info;
+
++ (NSInteger)getLogStatus;
++ (void)setLogStatus:(NSInteger)type;
+
+@end
+
+NS_ASSUME_NONNULL_END

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

@@ -0,0 +1,46 @@
+//
+//  BlackDoorManager+data.m
+//  SikeyComm
+//
+//  Created by 刘振兴 on 2025/2/25.
+//  Copyright © 2025 BaH Cy. All rights reserved.
+//
+
+#import "BlackDoorManager+data.h"
+
+#define KEY_BDM_USERCLICK @"KEY_BDM_USERCLICK"
+#define KEY_BDM_LOG_TYPE @"KEY_BDM_LOG_TYPE"
+
+@implementation BlackDoorManager (data)
+
++ (NSString*)getUserClickInfo {
+    return [[NSUserDefaults standardUserDefaults] objectForKey:KEY_BDM_USERCLICK];
+}
+
++ (void)clearUserClickInfo {
+    [[NSUserDefaults standardUserDefaults] setObject:@"" forKey:KEY_BDM_USERCLICK];
+    [[NSUserDefaults standardUserDefaults] synchronize];
+}
+
++ (void)setUserClickInfo:(NSString*)info {
+    [[NSUserDefaults standardUserDefaults] setObject:info forKey:KEY_BDM_USERCLICK];
+    [[NSUserDefaults standardUserDefaults] synchronize];
+}
+
++ (NSInteger)getLogStatus {
+    NSNumber* type = [[NSUserDefaults standardUserDefaults] objectForKey:KEY_BDM_LOG_TYPE];
+    if (type) {
+        return [type integerValue];
+    } else {
+        NSInteger value = 0;
+        [self setLogStatus:value];
+        return value;
+    }
+}
+
++ (void)setLogStatus:(NSInteger)type {
+    [[NSUserDefaults standardUserDefaults] setObject:@(type) forKey:KEY_BDM_LOG_TYPE];
+    [[NSUserDefaults standardUserDefaults] synchronize];
+}
+
+@end

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

@@ -11,12 +11,10 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface BlackDoorManager : NSObject
+#define BDM_SCREEN_WIDTH [UIScreen mainScreen].bounds.size.width
+#define BDM_SCREEN_HEIGHT [UIScreen mainScreen].bounds.size.height
 
-+ (void)addBlackDoor:(UIView*)supperView;
-
-+ (NSInteger)getLogStatus;
-+ (void)setLogStatus:(NSInteger)type;
+@interface BlackDoorManager : UIView
 
 @end
 

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

@@ -7,142 +7,35 @@
 //
 
 #import "BlackDoorManager.h"
+#import "BlackDoorManager+data.h"
 #import <EasyShowView/EasyShowView.h>
 
-#define KEY_BDM_USERCLICK @"KEY_BDM_USERCLICK"
-#define KEY_BDM_USERCLICK_HEADER @"@BDM*"
-#define KEY_BDM_CLICK_TAG 1234567890
-#define BDM_BUTTON_CLICK_SIZE 90
-#define BDM_BUTTON_SERVER_SIZE_WIDTH 120
-#define BDM_BUTTON_SERVER_SIZE_HEIGHT 50
-#define TIME_INTERVAL_MAX 8
-#define BDM_CLICK_ORDER @"323"
-
-#define BDM_SCREEN_WIDTH [UIScreen mainScreen].bounds.size.width
-#define BDM_SCREEN_HEIGHT [UIScreen mainScreen].bounds.size.height
-
 
 @implementation BlackDoorManager
 
-+ (void)addBlackDoor:(UIView*)supperView {
-    for (NSInteger i = 1; i <= 4; i++) {
-        UIButton* button = [[UIButton alloc] init];
-        button.tag = KEY_BDM_CLICK_TAG + i;
-        [button setBackgroundColor:[UIColor clearColor]];
-        [supperView addSubview:button];
-        
-        CGFloat x = ((i == 1) || (i == 3))? 0 : (BDM_SCREEN_WIDTH - BDM_BUTTON_CLICK_SIZE);
-        CGFloat y = ((i == 1) || (i == 2))? 60 : (BDM_SCREEN_HEIGHT - BDM_BUTTON_CLICK_SIZE) - 40;
-        [button setFrame:CGRectMake(x, y, BDM_BUTTON_CLICK_SIZE, BDM_BUTTON_CLICK_SIZE)];
-        [button addTarget:self action:@selector(blButtonClick:) forControlEvents:UIControlEventTouchUpInside];
+- (instancetype)initWithFrame:(CGRect)frame {
+    self = [super initWithFrame:frame];
+    if (self) {
+        [self setBackgroundColor:[UIColor colorWithRed:0 green:0 blue:0 alpha:0.4]];
+        UIView* view = [self addWhiteView];
+        [self addBackButton:view];
+        [self addCategoryButtons:view];
+        [self addTypeButtons:view];
+        [self addLogButton:view];
     }
+    return self;
 }
 
-+ (void)blButtonClick:(UIButton*)button {
-    NSInteger index = button.tag % KEY_BDM_CLICK_TAG ;
-    NSLog(@"BlackDoorManager: index:%ld", (long)index);
-    [self blButtonClickEx:index supperView:[button superview]];
-}
-
-+ (void)blButtonClickEx:(NSInteger)index supperView:(UIView*)supperView {
-    switch (index) {
-        case 1: {
-            //清空点击消息
-            [self clearUserClickInfo];
-            
-            NSTimeInterval timestamp = [[NSDate date] timeIntervalSince1970];
-            NSString *info = [NSString stringWithFormat:@"%@_%@_",KEY_BDM_USERCLICK_HEADER, @(timestamp)];
-            [self setUserClickInfo:info];
-            break;
-        }
-        case 2:
-        case 3: {
-            //点击信息不全
-            NSString* info = [self getUserClickInfo];
-            NSArray* array = [info componentsSeparatedByString:@"_"];
-            if (array.count < 2) {
-                [self showTosatWithMsg:@"请重新点击(跳点)" supperView:supperView];
-                [self clearUserClickInfo];
-                break;
-            }
-            
-            //验证头字串不对
-            NSString* header = array[0];
-            if (![header isEqualToString:KEY_BDM_USERCLICK_HEADER]) {
-                [self showTosatWithMsg:@"请重新点击(校验错误)" supperView:supperView];
-                [self clearUserClickInfo];
-                break;
-            }
-            
-            [self setUserClickInfo:[NSString stringWithFormat:@"%@%@", info, @(index)]];
-            break;
-        }
-        case 4: {
-            //点击信息不全
-            NSString* info = [self getUserClickInfo];
-            NSArray* array = [info componentsSeparatedByString:@"_"];
-            if (array.count < 3) {
-                [self showTosatWithMsg:@"请重新点击(跳点)" supperView:supperView];
-                [self clearUserClickInfo];
-                break;
-            }
-            
-            //验证头字串不对
-            NSString* header = array[0];
-            if (![header isEqualToString:KEY_BDM_USERCLICK_HEADER]) {
-                [self showTosatWithMsg:@"请重新点击(校验错误)" supperView:supperView];
-                [self clearUserClickInfo];
-                break;
-            }
-            
-            //点击超时
-            NSTimeInterval beginTime = [array[1] integerValue];
-            NSTimeInterval nowTime = [[NSDate date] timeIntervalSince1970];
-            if (nowTime > beginTime && (nowTime - beginTime > TIME_INTERVAL_MAX)) {
-                [self showTosatWithMsg:[NSString stringWithFormat:@"请重新点击(%d秒超时)", TIME_INTERVAL_MAX] supperView:supperView];
-                [self clearUserClickInfo];
-                break;
-            }
-            
-            //点击顺序不对
-            NSString* order = array[2];
-            if (![order isEqualToString:BDM_CLICK_ORDER]) {
-                [self showTosatWithMsg:@"请重新点击(顺序不对)" supperView:supperView];
-                [self clearUserClickInfo];
-                break;
-            }
-            
-            //验证通过
-            [self showBlackDoorView:supperView];
-            break;
-        }
-        default:
-            break;
-    }
-}
-
-+ (void)showBlackDoorView:(UIView*)supperView {
-    UIView* view = [self showBackground:supperView];
-    [self showBackButton:view];
-    [self showServerAllButtons:view];
-    [self showServerTestDevButtons:view];
-    [self showLogButton:view];
-}
-
-+ (UIView*)showBackground:(UIView*)supperView {
-    UIView* bgview = [[UIView alloc] initWithFrame:CGRectMake(0, 0, BDM_SCREEN_WIDTH, BDM_SCREEN_HEIGHT)];
-    [bgview setBackgroundColor:[UIColor colorWithRed:0 green:0 blue:0 alpha:0.4]];
-    [supperView addSubview:bgview];
-    
+- (UIView*)addWhiteView {
     CGFloat Height = BDM_SCREEN_HEIGHT - 100;
     UIView* view = [[UIView alloc] initWithFrame:CGRectMake(20, (BDM_SCREEN_HEIGHT-Height)/2, BDM_SCREEN_WIDTH - 40, Height)];
     [view setBackgroundColor:[UIColor whiteColor]];
-    [bgview addSubview:view];
+    [self addSubview:view];
     return view;
 }
 
 //关闭
-+ (void)showBackButton:(UIView*)view {
+- (void)addBackButton:(UIView*)view {
     UIButton* backBtn = [[UIButton alloc] init];
     [backBtn setTitle:@"关闭" forState:UIControlStateNormal];
     [backBtn setBackgroundColor:[UIColor redColor]];
@@ -151,44 +44,26 @@
     [view addSubview:backBtn];
 }
 
-+ (void)showServerAllButtons:(UIView*)view {
+- (void)addCategoryButtons:(UIView*)view {
     //当前服务器//
-    NSInteger serverType = [ServerManager getServerType];
-    NSArray* serverNames = [ServerManager getServerNames];
+    NSInteger serverType = [ServerManager getServerCategory];
+    NSArray* serverNames = [ServerManager getServerCategoryNames];
     
-    for (NSInteger i = 0; i <= 2; i++) {
-        UIButton* button = [[UIButton alloc] init];
-        button.tag = i;
-        button.titleLabel.lineBreakMode = 0;//这句话很重要，不加这句话加上换行符也没用
-        [button setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
-        [button addTarget:self action:@selector(serverButtonClick:) forControlEvents:UIControlEventTouchUpInside];
-        [view addSubview:button];
-        
-        //如果是当前服务器//
-        button.alpha = serverType != i ? 1:0.1;
-        
-        if (i == 0) {
-            [button setTitle:serverNames[i] forState:UIControlStateNormal];
-            [button setBackgroundColor:[UIColor greenColor]];
-            [button setFrame:CGRectMake((view.frame.size.width/2 - 200/2), 70, 200, 100)];
-        }
-        else if (i == 1) {
-            [button setTitle:serverNames[i] forState:UIControlStateNormal];
-            [button setBackgroundColor:[UIColor magentaColor]];
-            [button setFrame:CGRectMake(20, 200, 150, 100)];
-        }
-        else if (i == 2) {
-            [button setTitle:serverNames[i] forState:UIControlStateNormal];
-            [button setBackgroundColor:[UIColor redColor]];
-            [button setFrame:CGRectMake(view.frame.size.width - 150 - 20, 200, 150, 100)];
-        }
-    }
+    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)];
 }
 
-+ (void)showServerTestDevButtons:(UIView*)view {
+- (void)addTypeButtons:(UIView*)view {
     //当前服务器//
     NSInteger serverType = [ServerManager getServerType];
-    NSArray* serverNames = [ServerManager getServerNames];
+    NSArray* serverNames = [ServerManager getServerTypeNames];
     
     for (NSInteger i = 0; i <= 2; i++) {
         UIButton* button = [[UIButton alloc] init];
@@ -204,23 +79,23 @@
         if (i == 0) {
             [button setTitle:serverNames[i] forState:UIControlStateNormal];
             [button setBackgroundColor:[UIColor greenColor]];
-            [button setFrame:CGRectMake((view.frame.size.width/2 - 200/2), 70, 200, 100)];
+            [button setFrame:CGRectMake((view.frame.size.width/2 - 200/2), 210, 200, 70)];
         }
         else if (i == 1) {
             [button setTitle:serverNames[i] forState:UIControlStateNormal];
             [button setBackgroundColor:[UIColor magentaColor]];
-            [button setFrame:CGRectMake(20, 200, 150, 100)];
+            [button setFrame:CGRectMake(20, 300, 150, 70)];
         }
         else if (i == 2) {
             [button setTitle:serverNames[i] forState:UIControlStateNormal];
             [button setBackgroundColor:[UIColor redColor]];
-            [button setFrame:CGRectMake(view.frame.size.width - 150 - 20, 200, 150, 100)];
+            [button setFrame:CGRectMake(view.frame.size.width - 150 - 20, 300, 150, 70)];
         }
     }
 }
 
 //log
-+ (void)showLogButton:(UIView*)view {
+- (void)addLogButton:(UIView*)view {
     CGFloat height = 100;
     UIView* logView = [[UIView alloc] initWithFrame:CGRectMake(0, view.frame.size.height-height, view.frame.size.width, height)];
     [logView setBackgroundColor:[UIColor clearColor]];
@@ -243,57 +118,20 @@
     [logView addSubview:switchBtn];
 }
 
-+ (void)serverButtonClick:(UIButton*)button {
-    [EasyTextView showSuccessText:@"切换服务器成功！"];
-    [ServerManager setServerType:button.tag];
-    [[[button superview] superview] removeFromSuperview];
+- (void)backButtonClick:(id)sender {
+    [self removeFromSuperview];
 }
 
-+ (void)backButtonClick:(UIButton*)button {
-    [[[button superview] superview] removeFromSuperview];
+- (void)serverButtonClick:(UIButton*)button {
+    [EasyTextView showSuccessText:@"切换服务器成功！"];
+    [ServerManager setServerType:button.tag];
+    [self removeFromSuperview];
 }
 
-+ (void)clickSwitchButton:(id)sender {
+- (void)clickSwitchButton:(id)sender {
     UISwitch* switchBtn = (UISwitch*)sender;
     [BlackDoorManager setLogStatus:switchBtn.isOn ? 1 : 0];
     [WindowLoggerManager refreshWindowLoggerStatus];
 }
 
-+ (void)setUserClickInfo:(NSString*)info {
-    [[NSUserDefaults standardUserDefaults] setObject:info forKey:KEY_BDM_USERCLICK];
-    [[NSUserDefaults standardUserDefaults] synchronize];
-}
-
-+ (void)clearUserClickInfo {
-    [[NSUserDefaults standardUserDefaults] setObject:@"" forKey:KEY_BDM_USERCLICK];
-    [[NSUserDefaults standardUserDefaults] synchronize];
-}
-
-+ (NSString*)getUserClickInfo {
-    return [[NSUserDefaults standardUserDefaults] objectForKey:KEY_BDM_USERCLICK];
-}
-
-+ (NSInteger)getLogStatus {
-    NSNumber* type = [[NSUserDefaults standardUserDefaults] objectForKey:@"KEY_LOG_TYPE"];
-    if (type) {
-        return [type integerValue];
-    } else {
-        NSInteger value = 0;
-        [self setLogStatus:value];
-        return value;
-    }
-}
-
-+ (void)setLogStatus:(NSInteger)type {
-    [[NSUserDefaults standardUserDefaults] setObject:@(type) forKey:@"KEY_LOG_TYPE"];
-    [[NSUserDefaults standardUserDefaults] synchronize];
-}
-
-+ (void)showTosatWithMsg:(NSString *)strMsg supperView:(UIView*)supperView {
-    NSInteger serverType = [ServerManager getServerType];
-    if (serverType == 0)
-        return;
-    [EasyTextView showText:strMsg];
-}
-
 @end

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

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

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

@@ -10,7 +10,29 @@
 
 @implementation ServerManager
 
-+ (NSArray*)getServerNames {
+#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 @[@"正式服", @"测试服(加密)", @"开发服(不加密)", @"待配置", @"待配置",@"待配置"];
 }
 

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

@@ -7,6 +7,7 @@
 //
 
 #import "WindowLoggerManager.h"
+#import "BlackDoorManager+data.h"
 
 @implementation WindowLoggerManager
 

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

@@ -13,6 +13,9 @@ NS_ASSUME_NONNULL_BEGIN
 extern NSInteger SK_PROJECT;
 
 @interface SKDefine : NSObject
+
++ (NSArray*)getServerCategoryNames;
+
 + (NSString*)getHttp;
 + (NSString*)getHttpTest;
 + (NSString*)getHttpDev;

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

@@ -13,6 +13,10 @@ NSInteger SK_PROJECT = 3;
 
 @implementation SKDefine
 
++ (NSArray*)getServerCategoryNames {
+    return @[@"H210服务器", @"VeryFit Kids服务器", @"W112A1国外服务器", @"国内服务器"];
+}
+
 + (NSString*)getHttp {
     if (SK_PROJECT == 1)
         return @"http://api.tecanswer.com";

artimenring-iOS/Artimenring/Classes/ViewController/Location/SKMainViewController+server.m

@@ -13,7 +13,7 @@
 
 - (void)initNetwork {
     [self.networkLabel setText:NSLocalizedString(@"Watch.Network", nil)];
-    NSString* serValue = [self getServerName];
+    NSString* serValue = [self getServerTypeName];
     UIView* serverView = [self.mNetworkStackView viewWithTag:11];
     [serverView setHidden:serValue.length <= 0];
 }
@@ -25,21 +25,20 @@
 
 - (void)onSocketStatusChange {
     BOOL status = [[SKWebSocket share] isConnected];
-    NSString* serValue = [self getServerName];
+    NSString* serValue = [self getServerTypeName];
     NSString* sktValue = [self getSocketStatus:status];
     self.devLabel.text = [NSString stringWithFormat:@"%@ / %@", serValue, sktValue];
     [self.devLabel setAdjustsFontSizeToFitWidth:YES];
     [self.devLabel setHidden:NO];
-
     [self.mSocketStatusLabel setText: status ? @"_" : @""];
 }
 
-- (NSString*)getServerName {
+- (NSString*)getServerTypeName {
     NSInteger type = [ServerManager getServerType];
     if (type <= 0) {
         return @"";
     } else {
-        NSArray* names = [ServerManager getServerNames];
+        NSArray* names = [ServerManager getServerTypeNames];
         return names[type];
     }
 }

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

@@ -9,6 +9,7 @@
 #import "SKLoginViewController.h"
 #import "SKLoginViewController+guide.h"
 #import "SKLoginViewController+thirdparty.h"
+#import "BlackDoorManager+click.h"
 #import "UserDataHelper.h"
 
 @interface SKLoginViewController ()
@@ -20,7 +21,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     [self createGoogleFacebook];
-    [BlackDoorManager addBlackDoor:self.view];
+    [BlackDoorManager addBlackDoorButtons:self.view];
     [self createGuideView];
     
     [self initAccountType];

artimenring-iOS/SikeyComm.xcodeproj/project.pbxproj

@@ -180,6 +180,8 @@
 		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 */; };
 		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,6 +713,10 @@
 		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>"; };
 		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>"; };
@@ -2360,6 +2366,10 @@
 			children = (
 				E4D46A362ADE2D980092AB29 /* BlackDoorManager.h */,
 				E4D46A352ADE2D980092AB29 /* BlackDoorManager.m */,
+				E41389222D6D6A65000D8850 /* BlackDoorManager+click.h */,
+				E41389232D6D6A65000D8850 /* BlackDoorManager+click.m */,
+				E41389252D6D6B54000D8850 /* BlackDoorManager+data.h */,
+				E41389262D6D6B54000D8850 /* BlackDoorManager+data.m */,
 				E4D46A342ADE2D980092AB29 /* ServerManager.h */,
 				E4D46A372ADE2D980092AB29 /* ServerManager.m */,
 				E4B4A3FE2C89B819002E9179 /* WindowLoggerManager.h */,
@@ -2996,6 +3006,7 @@
 				E41ECB612CF95C6C00C4C36C /* SKMainViewController+server.m in Sources */,
 				E45EFDFA2B1755CA001BAB84 /* DataManager+session.m in Sources */,
 				E49F8D6B2BA3FA0600EDBAA8 /* NSArray+jlExtension.m in Sources */,
+				E41389272D6D6B54000D8850 /* BlackDoorManager+data.m in Sources */,
 				E459F0882B6B3D16002571E3 /* WatchSMSRecordViewCell.m in Sources */,
 				E41ECBC62CF9605E00C4C36C /* SKBaseViewController+timer.m in Sources */,
 				2718AFD11CBE40ED009F506A /* ZSEmojiPageControl.m in Sources */,
@@ -3224,6 +3235,7 @@
 				E4B1123B2B9B269900F48C90 /* BaseCheckboxCell.m in Sources */,
 				E4DE9E522B31786900A8B7FB /* DataManager+api.m in Sources */,
 				E41ECBD32CF960DA00C4C36C /* SKBaseAccountViewController+code.m in Sources */,
+				E41389242D6D6A65000D8850 /* BlackDoorManager+click.m in Sources */,
 				E459F07E2B6B3D16002571E3 /* WifiAddListViewController.m in Sources */,
 				E42001642BAD3202000D26B2 /* NSDate+format.m in Sources */,
 				7B27DCAF1B32DD630071203A /* SKAboutViewController.m in Sources */,