no message

Podfile.lock

@@ -64,4 +64,4 @@ SPEC CHECKSUMS:
   SDWebImage: 1d2b1a1efda1ade1b00b6f8498865f8ddedc8a84
   SSKeychain: 3f42991739c6c60a9cf1bbd4dff6c0d3694bcf3d
 
-COCOAPODS: 0.39.0
+COCOAPODS: 0.38.2

XFFruit.xcodeproj/project.pbxproj

@@ -2568,7 +2568,6 @@
 				C1F696001AB870B400F9F5DD /* Frameworks */,
 				C1F696011AB870B400F9F5DD /* Resources */,
 				1454647E6246AB3D8AAE6FF2 /* Copy Pods Resources */,
-				CE6AE18C05B31A4FEE20BD67 /* Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -2708,21 +2707,6 @@
 			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
-		CE6AE18C05B31A4FEE20BD67 /* Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -3229,7 +3213,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+				PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
@@ -3267,7 +3251,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
-				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+				PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
@@ -3280,8 +3264,8 @@
 			baseConfigurationReference = 1B0B22845F5CD40B5CF655F2 /* Pods.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "iPhone Developer: Fanfan Cui (7S27LB84E2)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Fanfan Cui (7S27LB84E2)";
+				CODE_SIGN_IDENTITY = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
 				ENABLE_BITCODE = NO;
 				GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch";
 				INFOPLIST_FILE = XFFruit/Info.plist;
@@ -3294,7 +3278,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.cntaiping.life.xffruit;
 				PRODUCT_NAME = XFFruit;
-				PROVISIONING_PROFILE = "3a32e5a9-395f-425a-b1b0-c221be8d15d8";
+				PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
 			name = Debug;
@@ -3304,8 +3288,8 @@
 			baseConfigurationReference = 7DDFB1D460448C3B45118195 /* Pods.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "iPhone Developer: Fanfan Cui (7S27LB84E2)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Fanfan Cui (7S27LB84E2)";
+				CODE_SIGN_IDENTITY = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
 				ENABLE_BITCODE = NO;
 				GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch";
 				INFOPLIST_FILE = XFFruit/Info.plist;
@@ -3318,7 +3302,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.cntaiping.life.xffruit;
 				PRODUCT_NAME = XFFruit;
-				PROVISIONING_PROFILE = "3a32e5a9-395f-425a-b1b0-c221be8d15d8";
+				PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
 			name = Release;
@@ -3341,7 +3325,7 @@
 				INFOPLIST_FILE = XFFruitTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = XFFruitTests;
-				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+				PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/XFFruit.app/XFFruit";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
@@ -3361,7 +3345,7 @@
 				INFOPLIST_FILE = XFFruitTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = XFFruitTests;
-				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+				PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/XFFruit.app/XFFruit";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};

XFFruit/AppDelegate/ICRAppDelegate.h

@@ -12,4 +12,5 @@
 
 @property (strong, nonatomic) UIWindow *window;
 @property (readonly, assign, nonatomic) ICRAppViewControllerManager *m_appViewControllerMgr;
+-(void)comperVersion;
 @end

XFFruit/AppDelegate/ICRAppDelegate.m

@@ -17,6 +17,9 @@
 @property (strong, nonatomic) BMKMapManager *mapManager;
 @property (strong, nonatomic) NSString *version;//本地版本号
 @property (strong, nonatomic) NSString *severVersion;//服务器版本号
+@property (strong, nonatomic) NSString *intVersion;//本地版本号
+@property (strong, nonatomic) NSString *intSeverVersion;//服务器版本号
+
 @property (strong, nonatomic) NSString *severUrl;//Ipa下载地址
 @property (assign, nonatomic) BOOL severForceUpdate;//强制更新
 
@@ -119,9 +122,22 @@
 -(void)comperVersion
 {
     if (self.version && self.severVersion) {
-        NSComparisonResult comResult = [self p_compareVersions: self.version betweenVersion2:self.severVersion];
+        self.intVersion=@"";
+        self.intSeverVersion=@"";
+        NSArray *array1 = [self.version componentsSeparatedByString:@"."];
+         NSArray *array2 = [self.severVersion componentsSeparatedByString:@"."];
+        for (int i = 0; i < [array1 count]; i++) {
+            self.intVersion=[self.intVersion stringByAppendingFormat:@"%@",[array1 objectAtIndex:i]];
+            NSLog(@"string:%@", [array1 objectAtIndex:i]);
+        }
+        for (int i = 0; i < [array2 count]; i++) {
+            self.intSeverVersion=[self.intSeverVersion stringByAppendingFormat:@"%@",[array2 objectAtIndex:i]];
+            NSLog(@"string:%@", [array2 objectAtIndex:i]);
+        }
+        BOOL isNeedUpdate=[self compareVersion];
+//        NSComparisonResult comResult = [self p_compareVersions: self.version betweenVersion2:self.severVersion];
         
-        if (comResult == NSOrderedAscending) {
+        if (isNeedUpdate) {
             if (self.severForceUpdate) {
                 //强制更新
                 UIAlertView *alertV = [[UIAlertView alloc]initWithTitle:@"新版本告知" message:  @"有新版本发布请您下载最新版本" delegate:self cancelButtonTitle:nil otherButtonTitles: @"去下载", nil];
@@ -136,7 +152,17 @@
         }
     }
 }
-
+-(BOOL)compareVersion
+{
+    float  version=[self.intVersion floatValue];
+    float severVersion=[self.intSeverVersion floatValue];
+    if (severVersion >version) {
+        return YES;
+    }else
+    {
+        return NO;
+    }
+}
 - (void) alertView:(UIAlertView *)alertView
 clickedButtonAtIndex:(NSInteger)buttonIndex {
     if (alertView.tag==1001) {

XFFruit/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.0</string>
+	<string>1.0</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

XFFruit/Macro/ICRAppMacro.h

@@ -28,8 +28,8 @@
 //现场测试环境
 #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:7380/cruiser-server/rest"
+////********现场正式环境*********
+// #define HTTP_REST_API_BASE_URL  @"http://122.224.171.126:7380/cruiser-server/rest"
 
 
 // HTTP

XFFruit/ViewControllers/Login/ICRLoginViewController.m

@@ -12,6 +12,7 @@
 #import "GXFFunctionDB.h"
 #import "GXFFunctionDBHelper.h"
 #import "APService.h"
+#import "ICRAppDelegate.h"
 
 #define LOGIN_CONTAINER_LEFT_MARGIN         (20)
 #define LOGIN_CONTAINER_HEIGHT              (450)
@@ -127,7 +128,9 @@
 }
 
 - (void)onLoginTapped:(__unused id)sender {
-//    
+//
+    ICRAppDelegate *appDelegate = (ICRAppDelegate *)[[UIApplication sharedApplication] delegate];
+    [appDelegate comperVersion];
     NSString *nsRegisterCode = self.m_containerView.m_cCodeTextF.text;
     NSString *nsUserName = self.m_containerView.m_userNameTextF.text;
     NSString *nsPassword = [self.m_containerView.m_passwordTextF.text uppercaseMD5String];