更换服务器地址。。方式优化

Author: wanghengheng

Coding_iOS.xcworkspace/xcshareddata/Coding_iOS.xcscmblueprint

@@ -10,12 +10,12 @@
   },
   "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "433ECD69-91E4-4E60-9763-B27EA86C3648",
   "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
-    "0BE8B4916C79C0D6BC415A5C19AC33B37D62A706" : "Coding-iOS\/Coding_iOS\/Resources\/webview",
+    "0BE8B4916C79C0D6BC415A5C19AC33B37D62A706" : "Coding-iOS\/Coding_iOS\/Resources\/webview\/",
     "B810104048DF61B07FF1F2922D434EA5073F4362" : "Coding_iOS",
-    "9F3660E5AC46AAE96CC141F90EBB3A671D67F2C2" : "Coding-iOS"
+    "9F3660E5AC46AAE96CC141F90EBB3A671D67F2C2" : "Coding-iOS\/"
   },
   "DVTSourceControlWorkspaceBlueprintNameKey" : "Coding_iOS",
-  "DVTSourceControlWorkspaceBlueprintVersion" : 203,
+  "DVTSourceControlWorkspaceBlueprintVersion" : 204,
   "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "Coding_iOS.xcworkspace",
   "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
     {

Coding_iOS/AppDelegate.m

@@ -140,7 +140,7 @@ - (void)completionStartAnimationWithOptions:(NSDictionary *)launchOptions{
     [UMSocialConfig setFinishToastIsHidden:YES position:UMSocialiToastPositionCenter];
     [UMSocialConfig setNavigationBarConfig:^(UINavigationBar *bar, UIButton *closeButton, UIButton *backButton, UIButton *postButton, UIButton *refreshButton, UINavigationItem *navigationItem) {
         if (bar) {
-            [bar setBackgroundImage:[UIImage imageWithColor:[UIColor colorWithHexString:[NSObject baseURLStrIsTest]? @"0x3bbd79" : @"0x28303b"]] forBarMetrics:UIBarMetricsDefault];
+            [bar setBackgroundImage:[UIImage imageWithColor:[UIColor colorWithHexString:![NSObject baseURLStrIsProduction]? @"0x3bbd79" : @"0x28303b"]] forBarMetrics:UIBarMetricsDefault];
         }
         if (navigationItem) {
             if ([[navigationItem titleView] isKindOfClass:[UILabel class]]) {
@@ -249,7 +249,7 @@ - (void)customizeInterface {
     //设置Nav的背景色和title色
 
     UINavigationBar *navigationBarAppearance = [UINavigationBar appearance];
-    [navigationBarAppearance setBackgroundImage:[UIImage imageWithColor:[UIColor colorWithHexString:[NSObject baseURLStrIsTest]? @"0x3bbd79" : @"0x28303b"]] forBarMetrics:UIBarMetricsDefault];
+    [navigationBarAppearance setBackgroundImage:[UIImage imageWithColor:[UIColor colorWithHexString:![NSObject baseURLStrIsProduction]? @"0x3bbd79" : @"0x28303b"]] forBarMetrics:UIBarMetricsDefault];
     [navigationBarAppearance setTintColor:[UIColor whiteColor]];//返回按钮的箭头颜色
     NSDictionary *textAttributes = @{
                                      NSFontAttributeName: [UIFont boldSystemFontOfSize:kNavTitleFontSize],

Coding_iOS/Controllers/Login/CannotLoginViewController.m

@@ -56,9 +56,6 @@ - (void)viewDidLoad
     self.myTableView.tableHeaderView = [self customHeaderView];
 
     [self addChangeBaseURLGesture];
-    if ([NSObject baseURLStrIsTest]) {
-        kTipAlert(@"在此页面连续点击屏幕 10 下切换到生产环境！");
-    }
 }
 
 - (void)viewWillDisappear:(BOOL)animated{
@@ -71,27 +68,32 @@ - (void)addChangeBaseURLGesture{
     UITapGestureRecognizer *tapGR = [UITapGestureRecognizer bk_recognizerWithHandler:^(UIGestureRecognizer *sender, UIGestureRecognizerState state, CGPoint location) {
         @strongify(self);
         if (state == UIGestureRecognizerStateRecognized) {
-            [self changeToTest:![NSObject baseURLStrIsTest]];
+            [self changeBaseURLTip];
         }
     }];
     tapGR.numberOfTapsRequired = 10.0;
     [self.view addGestureRecognizer:tapGR];
 }
 
-- (void)changeToTest:(BOOL)isTest{
-    [NSObject changeBaseURLStrToTest:isTest];
-    NSString *tipstr;
-    if (isTest) {
-        tipstr = @"你现在切换到了测试环境。\n若要重新切换回生产环境则需要按照如下步骤操作：\n\
-                                                                                1. 进到 '登录' 页\n\
-                                                                                2. 点击 '无法登陆' 按钮\n\
-                                                                                3. 进入 '忘记密码？/未设置密码？' 页面\n\
-                                                                                4. 单击屏幕 10 次";
-    }else{
-        tipstr = @"你已成功切换到了生产环境！";
+- (void)changeBaseURLTip{
+    if ([UIDevice currentDevice].systemVersion.integerValue < 8) {
+        [NSObject showHudTipStr:@"需要 8.0 以上系统才能切换服务器地址"];
+        return;
     }
-    kTipAlert(@"%@", tipstr);
-    [self.navigationController popToRootViewControllerAnimated:YES];
+    UIAlertController *alertCtrl = [UIAlertController alertControllerWithTitle:@"更改服务器 URL" message:@"空白值可切换回生产环境\n（地址末尾务必加上「/」）" preferredStyle:UIAlertControllerStyleAlert];
+    
+    UIAlertAction *cancelA = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:nil];
+    UIAlertAction *confirmA = [UIAlertAction actionWithTitle:@"确定" style:UIAlertActionStyleDestructive handler:^(UIAlertAction * _Nonnull action) {
+        [NSObject changeBaseURLStrTo:alertCtrl.textFields[0].text];
+    }];
+    [alertCtrl addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
+        textField.placeholder = @"Coding 服务器地址";
+        textField.text = [NSObject baseURLStr];
+    }];
+    [alertCtrl addAction:cancelA];
+    [alertCtrl addAction:confirmA];
+    [self presentViewController:alertCtrl animated:YES completion:nil];
+
 }
 
 - (void)viewWillAppear:(BOOL)animated{

Coding_iOS/Controllers/Login/LoginViewController.m

@@ -92,7 +92,7 @@ - (void)viewDidLoad
 - (UIButton *)buttonFor2FA{
     if (!_buttonFor2FA) {
         _buttonFor2FA = ({
-            UIButton *button = [[UIButton alloc] initWithFrame:CGRectMake(kScreen_Width - 100, 20, 80, 50)];
+            UIButton *button = [[UIButton alloc] initWithFrame:CGRectMake(kScreen_Width - 100, 20, 90, 50)];
             [button.titleLabel setFont:[UIFont systemFontOfSize:13]];
             [button setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
             [button setTitleColor:[UIColor colorWithWhite:1.0 alpha:0.5] forState:UIControlStateHighlighted];

Coding_iOS/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "size" : "29x29",
       "idiom" : "iphone",
@@ -54,6 +64,16 @@
       "filename" : "180x180.png",
       "scale" : "3x"
     },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
     {
       "size" : "29x29",
       "idiom" : "ipad",

Coding_iOS/Images.xcassets/AppIconTemp.appiconset/Contents.json

@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "size" : "29x29",
       "idiom" : "iphone",
@@ -54,6 +64,16 @@
       "filename" : "春节特别版15.png",
       "scale" : "3x"
     },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
     {
       "size" : "29x29",
       "idiom" : "ipad",

Coding_iOS/Util/Manager/Coding_NetAPIManager.m

@@ -2621,10 +2621,10 @@ - (void)request_HotTopiclistWithBlock:(void (^)(id data, NSError *error))block {
 }
 
 - (void)request_DefautsHotTopicNamelistWithBlock:(void (^)(id data, NSError *error))block {
-    NSString *defaultsPath = @"api/tweet_topic/defaults";
+    NSString *defaultsPath = @"api/tweet/pop";
     [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:defaultsPath withParams:nil withMethodType:Get andBlock:^(id data, NSError *error) {
         if (data) {
-            NSMutableArray *resultList = [[data[@"data"] valueForKey:@"name"] mutableCopy];
+            NSMutableArray *resultList = [[data[@"data"][@"default_topics"] valueForKey:@"name"] mutableCopy];
             NSString *hotPath = @"/api/tweet_topic/hot";
             [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:hotPath withParams:nil withMethodType:Get andBlock:^(id dataHot, NSError *errorHot) {
                 if (dataHot) {

Coding_iOS/Util/OC_Category/NSObject+Common.h

@@ -24,8 +24,8 @@
 
 #pragma mark BaseURL
 + (NSString *)baseURLStr;
-+ (BOOL)baseURLStrIsTest;
-+ (void)changeBaseURLStrToTest:(BOOL)isTest;
++ (BOOL)baseURLStrIsProduction;
++ (void)changeBaseURLStrTo:(NSString *)baseURLStr;
 
 #pragma mark File M
 //获取fileName的完整地址

Coding_iOS/Util/OC_Category/NSObject+Common.m

@@ -7,9 +7,10 @@
 //
 #define kPath_ImageCache @"ImageCache"
 #define kPath_ResponseCache @"ResponseCache"
-#define kTestKey @"BaseURLIsTest"
 #define kHUDQueryViewTag 101
 
+#define kBaseURLStr @"https://coding.net/"
+
 #import "NSObject+Common.h"
 #import "JDStatusBarNotification.h"
 #import "Login.h"
@@ -123,38 +124,26 @@ + (void)showStatusBarError:(NSError *)error{
 
 #pragma mark BaseURL
 + (NSString *)baseURLStr{
-    NSString *baseURLStr;
-    if ([self baseURLStrIsTest]) {
-        //staging
-        baseURLStr = kBaseUrlStr_Test;
-    }else{
-        //生产
-        baseURLStr = @"https://coding.net/";
-    }
-//    //staging
-//    baseURLStr = kBaseUrlStr_Test;
-//    //村民
-//    baseURLStr = @"http://192.168.0.188:8080/";
-//    //彭博
-//    baseURLStr = @"http://192.168.0.156:9990/";
-//    //小胖
-//    baseURLStr = @"http://192.168.0.222:8080/";
-
-    return baseURLStr;
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    return [defaults valueForKey:kBaseURLStr] ?: kBaseURLStr;
 }
 
-+ (BOOL)baseURLStrIsTest{
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    return [[defaults valueForKey:kTestKey] boolValue];
++ (BOOL)baseURLStrIsProduction{
+    return [[self baseURLStr] isEqualToString:kBaseURLStr];
 }
-+ (void)changeBaseURLStrToTest:(BOOL)isTest{
+
++ (void)changeBaseURLStrTo:(NSString *)baseURLStr{
+    if (baseURLStr.length <= 0) {
+        baseURLStr = kBaseURLStr;
+    }
+
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    [defaults setObject:@(isTest) forKey:kTestKey];
+    [defaults setObject:baseURLStr forKey:kBaseURLStr];
     [defaults synchronize];
 
     [CodingNetAPIClient changeJsonClient];
 
-    [[UINavigationBar appearance] setBackgroundImage: [UIImage imageWithColor:[UIColor colorWithHexString:isTest?@"0x3bbd79": @"0x28303b"]] forBarMetrics:UIBarMetricsDefault];
+    [[UINavigationBar appearance] setBackgroundImage: [UIImage imageWithColor:[UIColor colorWithHexString:![self baseURLStrIsProduction] ?@"0x3bbd79": @"0x28303b"]] forBarMetrics:UIBarMetricsDefault];
 }
 
 #pragma mark File M