Commit accd72fe authored by 陈俊俊's avatar 陈俊俊

版本

parent cb7eb2f0
...@@ -35,7 +35,8 @@ ...@@ -35,7 +35,8 @@
NSString * path = [NSSearchPathForDirectoriesInDomains(NSDocumentationDirectory, NSUserDomainMask, YES) lastObject]; NSString * path = [NSSearchPathForDirectoriesInDomains(NSDocumentationDirectory, NSUserDomainMask, YES) lastObject];
CLog(@"%@",path); CLog(@"%@",path);
[self enterpriseUpdate];
// Required // Required
#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_7_1 #if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_7_1
if ([[UIDevice currentDevice].systemVersion floatValue] >= 8.0) { if ([[UIDevice currentDevice].systemVersion floatValue] >= 8.0) {
...@@ -66,7 +67,6 @@ ...@@ -66,7 +67,6 @@
[self setupBMKMapMgr]; [self setupBMKMapMgr];
_m_appViewControllerMgr = [ICRAppViewControllerManager getAppViewControllerManager]; _m_appViewControllerMgr = [ICRAppViewControllerManager getAppViewControllerManager];
#pragma 版本更新 #pragma 版本更新
[self enterpriseUpdate];
[self.window makeKeyAndVisible]; [self.window makeKeyAndVisible];
return YES; return YES;
} }
...@@ -101,8 +101,6 @@ ...@@ -101,8 +101,6 @@
self.severUrl=serverUrl; self.severUrl=serverUrl;
self.severForceUpdate=forceUpdate; self.severForceUpdate=forceUpdate;
[strongSelf comperVersion]; [strongSelf comperVersion];
}else{ }else{
[IBTLoadingView showTips:message]; [IBTLoadingView showTips:message];
} }
...@@ -120,29 +118,29 @@ ...@@ -120,29 +118,29 @@
//比较版本号及是否下载 //比较版本号及是否下载
-(void)comperVersion -(void)comperVersion
{ {
NSComparisonResult comResult = [self p_compareVersions: self.version betweenVersion2:self.severVersion]; if (self.version && self.severVersion) {
NSComparisonResult comResult = [self p_compareVersions: self.version betweenVersion2:self.severVersion];
if (comResult == NSOrderedAscending) {
if (self.severForceUpdate) {
//强制更新
// UIAlertView *alertV = [[UIAlertView alloc]initWithTitle:@"新版本告知" message: @"有新版本发布请您下载最新版本" delegate:self cancelButtonTitle:nil otherButtonTitles: @"去下载", nil];
// alertV.tag = 1001;
// [alertV show];
}else
{
UIAlertView *alertV = [[UIAlertView alloc]initWithTitle:@"新版本告知" message: @"有新版本发布请您下载最新版本" delegate:self cancelButtonTitle:@"下次再说"otherButtonTitles: @"去下载", nil];//
alertV.tag = 1002;
[alertV show];
}
}else{
[IBTLoadingView showProgressLabel:@"暂无新版本"];
if (comResult == NSOrderedAscending) {
if (self.severForceUpdate) {
//强制更新
UIAlertView *alertV = [[UIAlertView alloc]initWithTitle:@"新版本告知" message: @"有新版本发布请您下载最新版本" delegate:self cancelButtonTitle:nil otherButtonTitles: @"去下载", nil];
alertV.tag = 1001;
[alertV show];
}else
{
UIAlertView *alertV = [[UIAlertView alloc]initWithTitle:@"新版本告知" message: @"有新版本发布请您下载最新版本" delegate:self cancelButtonTitle:@"下次再说"otherButtonTitles: @"去下载", nil];//
alertV.tag = 1002;
[alertV show];
}
}else{
[IBTLoadingView showProgressLabel:@"暂无新版本"];
}
} }
} }
- (void) alertView:(UIAlertView *)alertView - (void) alertView:(UIAlertView *)alertView
clickedButtonAtIndex:(NSInteger)buttonIndex { clickedButtonAtIndex:(NSInteger)buttonIndex {
......
...@@ -243,7 +243,7 @@ static NSString * const ICRHTTPInterface[] = { ...@@ -243,7 +243,7 @@ static NSString * const ICRHTTPInterface[] = {
//收货 //收货
[XFFHttp_SaveRctinfo] =@"transfer/save_rctinfo", [XFFHttp_SaveRctinfo] =@"transfer/save_rctinfo",
[XFFHttp_SaveReceipt] =@"transfer/receipt", [XFFHttp_SaveReceipt] =@"transfer/receipt",
[XFFHttp_getVersionId] = @"rest/ipapk", [XFFHttp_getVersionId] =@"ipapk",
}; };
......
...@@ -24,11 +24,9 @@ ...@@ -24,11 +24,9 @@
//阿里云内部测试环境 //阿里云内部测试环境
//#define HTTP_REST_API_BASE_URL @"http://218.244.151.129:7580/cruiser-server/rest" //#define HTTP_REST_API_BASE_URL @"http://218.244.151.129:7580/cruiser-server/rest"
//#define Server_Url @"http://218.244.151.129:7580/cruiser-server"
//现场测试环境 //现场测试环境
#define HTTP_REST_API_BASE_URL @"http://122.224.171.126:7280/cruiser-server/rest" #define HTTP_REST_API_BASE_URL @"http://122.224.171.126:7280/cruiser-server/rest"
//#define Server_Url @"http://122.224.171.126:7280/cruiser-server"
// HTTP // HTTP
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment