切换测试环境移动到 无法登陆 页面

wanghengheng · wanghengheng · commit ef0a7a77c064 · 2015-07-29T15:16:39.000+08:00
diff --git a/Coding_iOS/Controllers/Login/CannotLoginViewController.m b/Coding_iOS/Controllers/Login/CannotLoginViewController.m
@@ -40,11 +40,46 @@ - (void)viewDidLoad
     });
     self.myTableView.tableFooterView=[self customFooterView];
     self.myTableView.tableHeaderView = [self customHeaderView];
+    
+    [self addChangeBaseURLGesture];
+    if ([NSObject baseURLStrIsTest]) {
+        kTipAlert(@"&#22312;&#27492;&#39029;&#38754;&#36830;&#32493;&#28857;&#20987;&#23631;&#24149; 10 &#19979;&#20999;&#25442;&#21040;&#29983;&#20135;&#29615;&#22659;&#65281;");
+    }
 }
+
+- (void)addChangeBaseURLGesture{
+    @weakify(self);
+    UITapGestureRecognizer *tapGR = [UITapGestureRecognizer bk_recognizerWithHandler:^(UIGestureRecognizer *sender, UIGestureRecognizerState state, CGPoint location) {
+        @strongify(self);
+        if (state == UIGestureRecognizerStateRecognized) {
+            [self changeToTest:![NSObject baseURLStrIsTest]];
+        }
+    }];
+    tapGR.numberOfTapsRequired = 10.0;
+    [self.view addGestureRecognizer:tapGR];
+}
+
+- (void)changeToTest:(BOOL)isTest{
+    [NSObject changeBaseURLStrToTest:isTest];
+    NSString *tipstr;
+    if (isTest) {
+        tipstr = @"&#20320;&#29616;&#22312;&#20999;&#25442;&#21040;&#20102;&#27979;&#35797;&#29615;&#22659;&#12290;\n&#33509;&#35201;&#37325;&#26032;&#20999;&#25442;&#22238;&#29983;&#20135;&#29615;&#22659;&#21017;&#38656;&#35201;&#25353;&#29031;&#22914;&#19979;&#27493;&#39588;&#25805;&#20316;&#65306;\n\
+                                                                                1. &#36827;&#21040; '&#30331;&#24405;' &#39029;\n\
+                                                                                2. &#28857;&#20987; '&#26080;&#27861;&#30331;&#38470;' &#25353;&#38062;\n\
+                                                                                3. &#36827;&#20837; '&#25214;&#22238;&#23494;&#30721;/&#37325;&#21457;&#28608;&#27963;&#37038;&#20214;' &#39029;\n\
+                                                                                4. &#21333;&#20987;&#23631;&#24149; 10 &#27425;";
+    }else{
+        tipstr = @"&#20320;&#24050;&#25104;&#21151;&#20999;&#25442;&#21040;&#20102;&#29983;&#20135;&#29615;&#22659;&#65281;";
+    }
+    kTipAlert(@"%@", tipstr);
+    [self.navigationController popToRootViewControllerAnimated:YES];
+}
+
 - (void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
     [self.navigationController setNavigationBarHidden:NO animated:YES];
 }
+
 - (NSString *)titleStr{
     NSString *curStr = @"";
     if (_type == CannotLoginTypeResetPassword) {
diff --git a/Coding_iOS/Controllers/MeSetting/AboutViewController.m b/Coding_iOS/Controllers/MeSetting/AboutViewController.m
@@ -149,20 +149,6 @@ - (void)viewDidLoad
 //        make.height.mas_equalTo(20);
 //    }];
     
-    [self addChangeBaseURLGesture];
-    if ([NSObject baseURLStrIsTest]) {
-        kTipAlert(@"&#22312;&#35813;&#39029;&#38754;&#36830;&#32493;&#28857;&#20987;&#23631;&#24149; 5 &#19979;&#20999;&#25442;&#21040;&#29983;&#20135;&#29615;&#22659;&#65281;");
-    }
-}
-
-- (void)addChangeBaseURLGesture{
-    UITapGestureRecognizer *tapGR = [UITapGestureRecognizer bk_recognizerWithHandler:^(UIGestureRecognizer *sender, UIGestureRecognizerState state, CGPoint location) {
-        if (state == UIGestureRecognizerStateRecognized) {
-            [NSObject changeBaseURLStrToTest:![NSObject baseURLStrIsTest]];
-        }
-    }];
-    tapGR.numberOfTapsRequired = 5.0;
-    [self.view addGestureRecognizer:tapGR];
 }
 
 - (void)didReceiveMemoryWarning
diff --git a/Coding_iOS/Util/OC_Category/NSObject+Common.m b/Coding_iOS/Util/OC_Category/NSObject+Common.m
@@ -133,7 +133,6 @@ + (void)changeBaseURLStrToTest:(BOOL)isTest{
     [CodingNetAPIClient changeJsonClient];
     
     [[UINavigationBar appearance] setBackgroundImage: [UIImage imageWithColor:[UIColor colorWithHexString:isTest?@"0x3bbd79": @"0x28303b"]] forBarMetrics:UIBarMetricsDefault];
-    [((AppDelegate *)[UIApplication sharedApplication].delegate) setupLoginViewController];
 }
 
 #pragma mark File M

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,6 @@ + (void)changeBaseURLStrToTest:(BOOL)isTest{`
`133`	`133`	`[CodingNetAPIClient changeJsonClient];`
`134`	`134`
`135`	`135`	`[[UINavigationBar appearance] setBackgroundImage: [UIImage imageWithColor:[UIColor colorWithHexString:isTest?@"0x3bbd79": @"0x28303b"]] forBarMetrics:UIBarMetricsDefault];`
`136`		`- [((AppDelegate *)[UIApplication sharedApplication].delegate) setupLoginViewController];`
`137`	`136`	`}`
`138`	`137`
`139`	`138`	`#pragma mark File M`