Merge branch 'DEV_20150805_001' of http://121.42.32.57/root/xffruit into DEV_20150805_001

Conflicts:
	XFFruit/Macro/ICRAppMacro.h

XFFruit.xcodeproj/project.pbxproj

@@ -3213,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}/**";
@@ -3251,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}/**";
@@ -3278,7 +3278,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.cntaiping.life.xffruit;
 				PRODUCT_NAME = XFFruit;
-				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+				PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
 			name = Debug;
@@ -3302,7 +3302,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.cntaiping.life.xffruit;
 				PRODUCT_NAME = XFFruit;
-				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+				PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
 			name = Release;
@@ -3325,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}/**";
 			};
@@ -3345,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/General/Classes/BaseViewController/ChooseParentViewController.m

@@ -162,9 +162,9 @@
         
         if ([tableStr isEqualToString:GXF_BASECLASS_USER]) {
             if (titleStr.length > 0) {
-                sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE (NAME LIKE '%%%@%%' or LOGIN LIKE  '%%%@%%') AND ENABLED = 1 AND POSITION = 'purchaser'  ORDER BY %@", tableStr,titleStr,titleStr, @"uuid"];
+                sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE (NAME LIKE '%%%@%%' or LOGIN LIKE  '%%%@%%') AND ENABLED = 1 AND POSITION = 'purchaser'  ORDER BY %@", tableStr,titleStr,titleStr, @"LOGIN"];
             }else{
-                sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE ENABLED = 1 AND POSITION = 'purchaser' ORDER BY %@", tableStr, @"uuid"];
+                sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE ENABLED = 1 AND POSITION = 'purchaser' ORDER BY %@", tableStr, @"LOGIN"];
             }
         }else if([tableStr isEqualToString:GXF_BASECLASS_PRODUCTUNIT]){
             if (titleStr.length > 0) {
@@ -180,9 +180,21 @@
             }
         }else if([tableStr isEqualToString:GXF_BASECLASS_PRODUCT]){
             if (titleStr.length > 0) {
-                sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE (NAME LIKE '%%%@%%' or CODE LIKE '%%%@%%') AND ENABLED = 1 ORDER BY %@", tableStr,titleStr,titleStr, @"uuid"];
+                sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE (NAME LIKE '%%%@%%' or CODE LIKE '%%%@%%') AND ENABLED = 1 ORDER BY %@", tableStr,titleStr,titleStr, @"code"];
             }else{
-                sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE ENABLED = 1 ORDER BY %@", tableStr, @"uuid"];
+                sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE ENABLED = 1 ORDER BY %@", tableStr, @"code"];
+            }
+        }else if([tableStr isEqualToString:GXF_BASECLASS_WAREHOUSE]){
+            if (titleStr.length > 0) {
+                sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE (NAME LIKE '%%%@%%' or CODE LIKE '%%%@%%') AND ENABLED = 1 ORDER BY %@", tableStr,titleStr,titleStr, @"code"];
+            }else{
+                sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE ENABLED = 1 ORDER BY %@", tableStr, @"code"];
+            }
+        }else if([tableStr isEqualToString:GXF_BASECLASS_VENDOR]){
+            if (titleStr.length > 0) {
+                sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE (NAME LIKE '%%%@%%' or CODE LIKE '%%%@%%') AND ENABLED = 1 ORDER BY %@", tableStr,titleStr,titleStr, @"code"];
+            }else{
+                sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE ENABLED = 1 ORDER BY %@", tableStr, @"code"];
             }
         }else {
             if (titleStr.length > 0) {

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

@@ -22,13 +22,14 @@
 #define ICR_TABBAR_TINT_COLOR           [UIColor colorWithR:36 g:38 b:53 a:1]
 #define ICR_IMAGE_BG_COLOR              [UIColor colorWithW:242 a:1]
 
-//阿里云内部测试环境
+//********阿里云内部测试环境********
 #define HTTP_REST_API_BASE_URL  @"http://218.244.151.129:7580/cruiser-server/rest"
 
-//现场测试环境
+//********现场测试环境********
 //#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"
 
 

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)
@@ -131,7 +132,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];