Skip to content

Commit 40e221e

Browse files
wanghenghengwanghengheng
committed
更换服务器地址。。方式优化
1 parent 1678499 commit 40e221e

9 files changed

Lines changed: 83 additions & 52 deletions

File tree

‎Coding_iOS.xcworkspace/xcshareddata/Coding_iOS.xcscmblueprint‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
},
1111
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "433ECD69-91E4-4E60-9763-B27EA86C3648",
1212
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
13-
"0BE8B4916C79C0D6BC415A5C19AC33B37D62A706" : "Coding-iOS\/Coding_iOS\/Resources\/webview",
13+
"0BE8B4916C79C0D6BC415A5C19AC33B37D62A706" : "Coding-iOS\/Coding_iOS\/Resources\/webview\/",
1414
"B810104048DF61B07FF1F2922D434EA5073F4362" : "Coding_iOS",
15-
"9F3660E5AC46AAE96CC141F90EBB3A671D67F2C2" : "Coding-iOS"
15+
"9F3660E5AC46AAE96CC141F90EBB3A671D67F2C2" : "Coding-iOS\/"
1616
},
1717
"DVTSourceControlWorkspaceBlueprintNameKey" : "Coding_iOS",
18-
"DVTSourceControlWorkspaceBlueprintVersion" : 203,
18+
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
1919
"DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "Coding_iOS.xcworkspace",
2020
"DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
2121
{

‎Coding_iOS/AppDelegate.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ - (void)completionStartAnimationWithOptions:(NSDictionary *)launchOptions{
140140
[UMSocialConfig setFinishToastIsHidden:YES position:UMSocialiToastPositionCenter];
141141
[UMSocialConfig setNavigationBarConfig:^(UINavigationBar *bar, UIButton *closeButton, UIButton *backButton, UIButton *postButton, UIButton *refreshButton, UINavigationItem *navigationItem) {
142142
if (bar) {
143-
[bar setBackgroundImage:[UIImage imageWithColor:[UIColor colorWithHexString:[NSObject baseURLStrIsTest]? @"0x3bbd79" : @"0x28303b"]] forBarMetrics:UIBarMetricsDefault];
143+
[bar setBackgroundImage:[UIImage imageWithColor:[UIColor colorWithHexString:![NSObject baseURLStrIsProduction]? @"0x3bbd79" : @"0x28303b"]] forBarMetrics:UIBarMetricsDefault];
144144
}
145145
if (navigationItem) {
146146
if ([[navigationItem titleView] isKindOfClass:[UILabel class]]) {
@@ -249,7 +249,7 @@ - (void)customizeInterface {
249249
//设置Nav的背景色和title色
250250

251251
UINavigationBar *navigationBarAppearance = [UINavigationBar appearance];
252-
[navigationBarAppearance setBackgroundImage:[UIImage imageWithColor:[UIColor colorWithHexString:[NSObject baseURLStrIsTest]? @"0x3bbd79" : @"0x28303b"]] forBarMetrics:UIBarMetricsDefault];
252+
[navigationBarAppearance setBackgroundImage:[UIImage imageWithColor:[UIColor colorWithHexString:![NSObject baseURLStrIsProduction]? @"0x3bbd79" : @"0x28303b"]] forBarMetrics:UIBarMetricsDefault];
253253
[navigationBarAppearance setTintColor:[UIColor whiteColor]];//返回按钮的箭头颜色
254254
NSDictionary *textAttributes = @{
255255
NSFontAttributeName: [UIFont boldSystemFontOfSize:kNavTitleFontSize],

‎Coding_iOS/Controllers/Login/CannotLoginViewController.m‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@ - (void)viewDidLoad
5656
self.myTableView.tableHeaderView = [self customHeaderView];
5757

5858
[self addChangeBaseURLGesture];
59-
if ([NSObject baseURLStrIsTest]) {
60-
kTipAlert(@"在此页面连续点击屏幕 10 下切换到生产环境！");
61-
}
6259
}
6360

6461
- (void)viewWillDisappear:(BOOL)animated{
@@ -71,27 +68,32 @@ - (void)addChangeBaseURLGesture{
7168
UITapGestureRecognizer *tapGR = [UITapGestureRecognizer bk_recognizerWithHandler:^(UIGestureRecognizer *sender, UIGestureRecognizerState state, CGPoint location) {
7269
@strongify(self);
7370
if (state == UIGestureRecognizerStateRecognized) {
74-
[self changeToTest:![NSObject baseURLStrIsTest]];
71+
[self changeBaseURLTip];
7572
}
7673
}];
7774
tapGR.numberOfTapsRequired = 10.0;
7875
[self.view addGestureRecognizer:tapGR];
7976
}
8077

81-
- (void)changeToTest:(BOOL)isTest{
82-
[NSObject changeBaseURLStrToTest:isTest];
83-
NSString *tipstr;
84-
if (isTest) {
85-
tipstr = @"你现在切换到了测试环境。\n若要重新切换回生产环境则需要按照如下步骤操作：\n\
86-
1. 进到 '登录' 页\n\
87-
2. 点击 '无法登陆' 按钮\n\
88-
3. 进入 '忘记密码？/未设置密码？' 页面\n\
89-
4. 单击屏幕 10 次";
90-
}else{
91-
tipstr = @"你已成功切换到了生产环境！";
78+
- (void)changeBaseURLTip{
79+
if ([UIDevice currentDevice].systemVersion.integerValue < 8) {
80+
[NSObject showHudTipStr:@"需要 8.0 以上系统才能切换服务器地址"];
81+
return;
9282
}
93-
kTipAlert(@"%@", tipstr);
94-
[self.navigationController popToRootViewControllerAnimated:YES];
83+
UIAlertController *alertCtrl = [UIAlertController alertControllerWithTitle:@"更改服务器 URL" message:@"空白值可切换回生产环境\n（地址末尾务必加上「/」）" preferredStyle:UIAlertControllerStyleAlert];
84+
85+
UIAlertAction *cancelA = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:nil];
86+
UIAlertAction *confirmA = [UIAlertAction actionWithTitle:@"确定" style:UIAlertActionStyleDestructive handler:^(UIAlertAction * _Nonnull action) {
87+
[NSObject changeBaseURLStrTo:alertCtrl.textFields[0].text];
88+
}];
89+
[alertCtrl addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
90+
textField.placeholder = @"Coding 服务器地址";
91+
textField.text = [NSObject baseURLStr];
92+
}];
93+
[alertCtrl addAction:cancelA];
94+
[alertCtrl addAction:confirmA];
95+
[self presentViewController:alertCtrl animated:YES completion:nil];
96+
9597
}
9698

9799
- (void)viewWillAppear:(BOOL)animated{

‎Coding_iOS/Controllers/Login/LoginViewController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ - (void)viewDidLoad
9292
- (UIButton *)buttonFor2FA{
9393
if (!_buttonFor2FA) {
9494
_buttonFor2FA = ({
95-
UIButton *button = [[UIButton alloc] initWithFrame:CGRectMake(kScreen_Width - 100, 20, 80, 50)];
95+
UIButton *button = [[UIButton alloc] initWithFrame:CGRectMake(kScreen_Width - 100, 20, 90, 50)];
9696
[button.titleLabel setFont:[UIFont systemFontOfSize:13]];
9797
[button setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
9898
[button setTitleColor:[UIColor colorWithWhite:1.0 alpha:0.5] forState:UIControlStateHighlighted];

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"images" : [
3+
{
4+
"idiom" : "iphone",
5+
"size" : "20x20",
6+
"scale" : "2x"
7+
},
8+
{
9+
"idiom" : "iphone",
10+
"size" : "20x20",
11+
"scale" : "3x"
12+
},
313
{
414
"size" : "29x29",
515
"idiom" : "iphone",
@@ -54,6 +64,16 @@
5464
"filename" : "180x180.png",
5565
"scale" : "3x"
5666
},
67+
{
68+
"idiom" : "ipad",
69+
"size" : "20x20",
70+
"scale" : "1x"
71+
},
72+
{
73+
"idiom" : "ipad",
74+
"size" : "20x20",
75+
"scale" : "2x"
76+
},
5777
{
5878
"size" : "29x29",
5979
"idiom" : "ipad",

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"images" : [
3+
{
4+
"idiom" : "iphone",
5+
"size" : "20x20",
6+
"scale" : "2x"
7+
},
8+
{
9+
"idiom" : "iphone",
10+
"size" : "20x20",
11+
"scale" : "3x"
12+
},
313
{
414
"size" : "29x29",
515
"idiom" : "iphone",
@@ -54,6 +64,16 @@
5464
"filename" : "春节特别版15.png",
5565
"scale" : "3x"
5666
},
67+
{
68+
"idiom" : "ipad",
69+
"size" : "20x20",
70+
"scale" : "1x"
71+
},
72+
{
73+
"idiom" : "ipad",
74+
"size" : "20x20",
75+
"scale" : "2x"
76+
},
5777
{
5878
"size" : "29x29",
5979
"idiom" : "ipad",

‎Coding_iOS/Util/Manager/Coding_NetAPIManager.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2621,10 +2621,10 @@ - (void)request_HotTopiclistWithBlock:(void (^)(id data, NSError *error))block {
26212621
}
26222622

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

‎Coding_iOS/Util/OC_Category/NSObject+Common.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424

2525
#pragma mark BaseURL
2626
+ (NSString *)baseURLStr;
27-
+ (BOOL)baseURLStrIsTest;
28-
+ (void)changeBaseURLStrToTest:(BOOL)isTest;
27+
+ (BOOL)baseURLStrIsProduction;
28+
+ (void)changeBaseURLStrTo:(NSString *)baseURLStr;
2929

3030
#pragma mark File M
3131
//获取fileName的完整地址

‎Coding_iOS/Util/OC_Category/NSObject+Common.m‎

Lines changed: 14 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
//
88
#define kPath_ImageCache @"ImageCache"
99
#define kPath_ResponseCache @"ResponseCache"
10-
#define kTestKey @"BaseURLIsTest"
1110
#define kHUDQueryViewTag 101
1211

12+
#define kBaseURLStr @"https://coding.net/"
13+
1314
#import "NSObject+Common.h"
1415
#import "JDStatusBarNotification.h"
1516
#import "Login.h"
@@ -123,38 +124,26 @@ + (void)showStatusBarError:(NSError *)error{
123124

124125
#pragma mark BaseURL
125126
+ (NSString *)baseURLStr{
126-
NSString *baseURLStr;
127-
if ([self baseURLStrIsTest]) {
128-
//staging
129-
baseURLStr = kBaseUrlStr_Test;
130-
}else{
131-
//生产
132-
baseURLStr = @"https://coding.net/";
133-
}
134-
// //staging
135-
// baseURLStr = kBaseUrlStr_Test;
136-
// //村民
137-
// baseURLStr = @"http://192.168.0.188:8080/";
138-
// //彭博
139-
// baseURLStr = @"http://192.168.0.156:9990/";
140-
// //小胖
141-
// baseURLStr = @"http://192.168.0.222:8080/";
142-
143-
return baseURLStr;
127+
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
128+
return [defaults valueForKey:kBaseURLStr] ?: kBaseURLStr;
144129
}
145130

146-
+ (BOOL)baseURLStrIsTest{
147-
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
148-
return [[defaults valueForKey:kTestKey] boolValue];
131+
+ (BOOL)baseURLStrIsProduction{
132+
return [[self baseURLStr] isEqualToString:kBaseURLStr];
149133
}
150-
+ (void)changeBaseURLStrToTest:(BOOL)isTest{
134+
135+
+ (void)changeBaseURLStrTo:(NSString *)baseURLStr{
136+
if (baseURLStr.length <= 0) {
137+
baseURLStr = kBaseURLStr;
138+
}
139+
151140
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
152-
[defaults setObject:@(isTest) forKey:kTestKey];
141+
[defaults setObject:baseURLStr forKey:kBaseURLStr];
153142
[defaults synchronize];
154143

155144
[CodingNetAPIClient changeJsonClient];
156145

157-
[[UINavigationBar appearance] setBackgroundImage: [UIImage imageWithColor:[UIColor colorWithHexString:isTest?@"0x3bbd79": @"0x28303b"]] forBarMetrics:UIBarMetricsDefault];
146+
[[UINavigationBar appearance] setBackgroundImage: [UIImage imageWithColor:[UIColor colorWithHexString:![self baseURLStrIsProduction] ?@"0x3bbd79": @"0x28303b"]] forBarMetrics:UIBarMetricsDefault];
158147
}
159148

160149
#pragma mark File M

0 commit comments

Comments
 (0)