提交
This commit is contained in:
@@ -50,10 +50,7 @@
|
||||
@property (nonatomic,strong)NSString *icon_wd_notselect;
|
||||
*/
|
||||
-(void)getAppTheme{
|
||||
NSString *server = ServerUrl;
|
||||
if (QXGlobal.shareGlobal.isNeedChangeServer) {
|
||||
server = RServerUrl;
|
||||
}
|
||||
NSString *server = QXGlobal.shareGlobal.currentServer;
|
||||
NSString *themeUrl = [NSString stringWithFormat:@"%@%@",server,QXAppTheme];
|
||||
[[QXRequset shareInstance] getWithUrl:themeUrl parameters:@{} needCache:NO success:^(id responseObject) {
|
||||
[QXConfig defaultConfig];
|
||||
@@ -158,6 +155,8 @@
|
||||
} fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
|
||||
NSLog(@"请求失败");
|
||||
[self alertNetworkError];
|
||||
QXGlobal.shareGlobal.currentServer = RServerUrl;
|
||||
QXGlobal.shareGlobal.currentH5Server = RH5ServerUrl;
|
||||
QXGlobal.shareGlobal.isNeedChangeServer = YES;
|
||||
}];
|
||||
}
|
||||
|
||||
@@ -21,6 +21,8 @@ typedef void (^showFinishBlock)(void);
|
||||
+(instancetype)shareGlobal;
|
||||
@property (nonatomic,assign)BOOL isNeedUpdate;
|
||||
@property (nonatomic,assign)BOOL isNeedChangeServer;
|
||||
@property (nonatomic,strong)NSString *currentServer;
|
||||
@property (nonatomic,strong)NSString *currentH5Server;
|
||||
// 是否登录
|
||||
@property (nonatomic,readonly,assign)BOOL isLogin;
|
||||
@property (nonatomic,assign)BOOL isShowLoginVC;
|
||||
|
||||
@@ -49,6 +49,8 @@
|
||||
dispatch_once(&onceToken, ^{
|
||||
global = [[self alloc] init];
|
||||
global.isShowLoginVC = NO;
|
||||
global.currentServer = ServerUrl;
|
||||
global.currentH5Server = H5ServerUrl;
|
||||
});
|
||||
return global;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user