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

da4f8c34 · freecui · 010c235e · 5e08d536 · da4f8c34 · da4f8c34
Commit da4f8c34 authored Nov 04, 2015 by freecui
12 changed files
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -33,11 +33,11 @@ PODS:
    - FMDB/common
  - IQKeyboardManager (3.2.4)
  - MBProgressHUD (0.9.1)
-  - MJRefresh (2.2.0)
+  - MJRefresh (2.2.1)
  - Reveal-iOS-SDK (1.5.1)
-  - SDWebImage (3.7.2):
-    - SDWebImage/Core (= 3.7.2)
-  - SDWebImage/Core (3.7.2)
+  - SDWebImage (3.7.3):
+    - SDWebImage/Core (= 3.7.3)
+  - SDWebImage/Core (3.7.3)
  - SSKeychain (1.2.3)

 DEPENDENCIES:
@@ -59,9 +59,9 @@ SPEC CHECKSUMS:
  FMDB: 96e8f1bcc1329e269330f99770ad4285d9003e52
  IQKeyboardManager: 555b1231fefafb21b19278d7cca72986a27b748b
  MBProgressHUD: c47f2c166c126cf2ce36498d80f33e754d4e93ad
-  MJRefresh: 65a2bf14abb6feeaed8696aa1551f70e15ab0a08
+  MJRefresh: c3fa0387e8e97a11a9666639d2f815607edd1c2f
  Reveal-iOS-SDK: c9c55cad2729c85f6ced415f1b21857c9a2d8ef9
-  SDWebImage: 71b7cdc1d1721d6a82ed62889030225f2c249e29
+  SDWebImage: 1d2b1a1efda1ade1b00b6f8498865f8ddedc8a84
  SSKeychain: 3f42991739c6c60a9cf1bbd4dff6c0d3694bcf3d

 COCOAPODS: 0.38.2
--- a/XFFruit.xcodeproj/project.pbxproj
+++ b/XFFruit.xcodeproj/project.pbxproj
@@ -122,7 +122,7 @@
 		724171721B9D30660094DF55 /* ChooseWarehouseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7241716C1B9D30660094DF55 /* ChooseWarehouseViewController.m */; };
 		724171731B9D30660094DF55 /* ChosePersonViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7241716E1B9D30660094DF55 /* ChosePersonViewController.m */; };
 		724171761B9D30DE0094DF55 /* ChooseCostViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 724171751B9D30DE0094DF55 /* ChooseCostViewController.m */; };
-		7249BDD71BE794640059EB8C /* FinishTimeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7249BDD61BE794640059EB8C /* FinishTimeView.m */; settings = {ASSET_TAGS = (); }; };
+		7249BDD71BE794640059EB8C /* FinishTimeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7249BDD61BE794640059EB8C /* FinishTimeView.m */; };
 		726F4C6D1BDE5F83006A5E6D /* RejectView.m in Sources */ = {isa = PBXBuildFile; fileRef = 726F4C6C1BDE5F83006A5E6D /* RejectView.m */; };
 		72805CF31BB8E1B0009E1F82 /* TransferViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72805CF21BB8E1B0009E1F82 /* TransferViewController.m */; };
 		72805CF61BB8E20B009E1F82 /* NewTransferViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72805CF51BB8E20B009E1F82 /* NewTransferViewController.m */; };
@@ -147,7 +147,7 @@
 		72873CEB1BA27BA6007B3387 /* GXFPopView.m in Sources */ = {isa = PBXBuildFile; fileRef = 72873CEA1BA27BA6007B3387 /* GXFPopView.m */; };
 		72873CEE1BA280DD007B3387 /* GXFPopCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 72873CED1BA280DD007B3387 /* GXFPopCell.m */; };
 		72882D8B1BA9121E00935BA6 /* ChooseProductUnitViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72882D8A1BA9121E00935BA6 /* ChooseProductUnitViewController.m */; };
-		729A2E931BE60C0200493603 /* GeometryView.m in Sources */ = {isa = PBXBuildFile; fileRef = 729A2E921BE60C0200493603 /* GeometryView.m */; settings = {ASSET_TAGS = (); }; };
+		729A2E931BE60C0200493603 /* GeometryView.m in Sources */ = {isa = PBXBuildFile; fileRef = 729A2E921BE60C0200493603 /* GeometryView.m */; };
 		72A8132D1BCA8BBA003631F3 /* ChooseTransportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A8132C1BCA8BBA003631F3 /* ChooseTransportViewController.m */; };
 		72A813FA1BCD3205003631F3 /* ReceiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A813F71BCD3205003631F3 /* ReceiveViewController.m */; };
 		72A813FD1BCD33BE003631F3 /* ReceiveBoltView.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A813FC1BCD33BE003631F3 /* ReceiveBoltView.m */; };
@@ -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}/**";
@@ -3264,8 +3264,8 @@
 			baseConfigurationReference = 1B0B22845F5CD40B5CF655F2 /* Pods.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
+				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
 				ENABLE_BITCODE = NO;
 				GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch";
 				INFOPLIST_FILE = XFFruit/Info.plist;
@@ -3277,7 +3277,7 @@
 					"$(PROJECT_DIR)/XFFruit/Vendors/JiGuang/lib",
 				);
 				PRODUCT_NAME = XFFruit;
-				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+				PROVISIONING_PROFILE = "5747a061-d994-4f1f-8eac-4b028fb34d89";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
 			name = Debug;
@@ -3287,8 +3287,8 @@
 			baseConfigurationReference = 7DDFB1D460448C3B45118195 /* Pods.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
+				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
 				ENABLE_BITCODE = NO;
 				GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch";
 				INFOPLIST_FILE = XFFruit/Info.plist;
@@ -3300,7 +3300,7 @@
 					"$(PROJECT_DIR)/XFFruit/Vendors/JiGuang/lib",
 				);
 				PRODUCT_NAME = XFFruit;
-				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+				PROVISIONING_PROFILE = "5747a061-d994-4f1f-8eac-4b028fb34d89";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
 			name = Release;
@@ -3323,7 +3323,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}/**";
 			};
@@ -3343,7 +3343,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}/**";
 			};

--- a/XFFruit/AppDelegate/ICRAppDelegate.m
+++ b/XFFruit/AppDelegate/ICRAppDelegate.m
@@ -133,15 +133,10 @@
                alertV.tag = 1002;
                [alertV show];
            }
-            
-            
-        }else{
-            [IBTLoadingView showProgressLabel:@"暂无新版本"];
-            
        }
- 
    }
 }
+
 - (void) alertView:(UIAlertView *)alertView
 clickedButtonAtIndex:(NSInteger)buttonIndex {
    if (alertView.tag==1001) {

--- a/XFFruit/General/Classes/BaseViewController/ChooseParentViewController.m
+++ b/XFFruit/General/Classes/BaseViewController/ChooseParentViewController.m
@@ -174,6 +174,12 @@
            }else{
                sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE ENABLED = 1 ORDER BY %@", tableStr, @"uuid"];
            }
+        }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"];
+            }else{
+                sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE ENABLED = 1 ORDER BY %@", tableStr, @"uuid"];
+            }
        }else {
            if (titleStr.length > 0) {
                sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE NAME LIKE '%%%@%%' or CODE LIKE '%%%@%%' ORDER BY %@", tableStr,titleStr,titleStr, @"uuid"];

--- a/XFFruit/Macro/ICRAppMacro.h
+++ b/XFFruit/Macro/ICRAppMacro.h
@@ -28,6 +28,9 @@
 //现场测试环境
 #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"
+

 // HTTP
 //#define HTTP_REST_API_BASE_URL          @"http://115.28.191.44:8080/IPatrol/rest"

--- a/XFFruit/ViewControllers/PurchaseNotice/Controllers/NewPurchaseNoticeViewController.m
+++ b/XFFruit/ViewControllers/PurchaseNotice/Controllers/NewPurchaseNoticeViewController.m
@@ -541,7 +541,7 @@ typedef enum : NSUInteger {
    if (!_startTimeView) {
        NSString *currentStr  = @"";
        if ([_finishDateLabel.text isEqualToString:@"选择要求完成日期"] || _finishDateLabel.text.length < 1) {
-            currentStr = [IBTCommon stringFromDateWithFormat:[NSDate date] format:@"yyyy-MM-dd HH:mm"];
+            currentStr = [IBTCommon stringFromDateWithFormat:[NSDate date] format:@"yyyy-MM-dd HH:mm:ss"];
        }else{
            currentStr = _finishDateLabel.text;
        }
@@ -566,7 +566,9 @@ typedef enum : NSUInteger {
 - (void)okTimeView:(NSString *)time{
    
    _finishDateLabel.textColor = GXF_CONTENT_COLOR;
-    _finishDateLabel.text = time;
+    if (time.length > 15) {
+        _finishDateLabel.text = [time substringToIndex:16];
+    }
    self.finishDateStr = time;
    // 关闭选择器
    [self clearDatePickView];

--- a/XFFruit/ViewControllers/Survey/Views/FinishTimeView.m
+++ b/XFFruit/ViewControllers/Survey/Views/FinishTimeView.m
@@ -303,9 +303,9 @@
    NSArray *array2 = [NSArray arrayWithObjects:hour,minute, nil];
    NSString *date1 = [array1 componentsJoinedByString:@"-"];
    NSString *date2 = [array2 componentsJoinedByString:@":"];
-    NSString *date = [NSString stringWithFormat:@"%@ %@",date1,date2];
+    NSString *date = [NSString stringWithFormat:@"%@ %@:00",date1,date2];
    NSDateFormatter *formatter = [[NSDateFormatter alloc]init];
-    formatter.dateFormat = @"yyyy-MM-dd HH:mm";
+    formatter.dateFormat = @"yyyy-MM-dd HH:mm:ss";
    
    return [formatter stringFromDate:[formatter dateFromString:date]];
    

--- a/XFFruit/ViewControllers/Survey/controllers/SurveyDetailViewController.m
+++ b/XFFruit/ViewControllers/Survey/controllers/SurveyDetailViewController.m
@@ -87,7 +87,9 @@ typedef enum : NSUInteger {
            NSString *message  = data[@"message"] ;
            if (success == 1) {
                NSString *dataStr = data[@"data"];
-               NSString *urlStr = [NSString stringWithFormat:@"%@/DisplayChart?filename=%@",@"http://122.224.171.126:7280/cruiser-server",dataStr];
+                NSRange range = [HTTP_REST_API_BASE_URL rangeOfString:@"rest"];
+                NSString *serverURl = [HTTP_REST_API_BASE_URL substringToIndex:range.location];
+               NSString *urlStr = [NSString stringWithFormat:@"%@DisplayChart?filename=%@",serverURl,dataStr];
                [_chartImageView sd_setImageWithURL:[NSURL URLWithString:urlStr]];
            }else{
                [IBTLoadingView showTips:message];

--- a/XFFruit/ViewControllers/Transfer/Views/TopTransferView.m
+++ b/XFFruit/ViewControllers/Transfer/Views/TopTransferView.m
@@ -272,7 +272,9 @@
 - (void)okTimeView:(NSString *)time{
    
    _arriveDateLabel.textColor = GXF_CONTENT_COLOR;
-    _arriveDateLabel.text = time;
+    if (time.length > 15) {
+        _arriveDateLabel.text = [time substringToIndex:16];
+    }
    self.arriveDate = time;
    // 关闭选择器
    [self clearDatePickView];

--- a/XFFruit/ViewControllers/Transport/Views/TopTransportView.m
+++ b/XFFruit/ViewControllers/Transport/Views/TopTransportView.m
@@ -247,7 +247,7 @@
    if (!self.startTimeView) {
        NSString *currentStr  = @"";
        if ([self.arriveDateLabel.text isEqualToString:@"选择预计到货时间"] || self.arriveDateLabel.text.length < 1) {
-            currentStr = [IBTCommon stringFromDateWithFormat:[NSDate date] format:@"yyyy-MM-dd HH:mm"];
+            currentStr = [IBTCommon stringFromDateWithFormat:[NSDate date] format:@"yyyy-MM-dd HH:mm:ss"];
        }else{
            currentStr = self.arriveDateLabel.text;
        }
@@ -271,7 +271,9 @@
 - (void)okTimeView:(NSString *)time{
    
    _arriveDateLabel.textColor = GXF_CONTENT_COLOR;
-    _arriveDateLabel.text = time;
+    if (time.length > 15) {
+        _arriveDateLabel.text = [time substringToIndex:16];
+    }
    self.arriveDate = time;
    // 关闭选择器
    [self clearDatePickView];

--- a/XFFruit/en.lproj/Localizable.strings
+++ b/XFFruit/en.lproj/Localizable.strings
@@ -22,12 +22,12 @@
 "From Camera"                           = "来自相机";

 // Login
-"XFFruit"                               = "移动巡店系统";
+"XFFruit"                               = "鲜丰平台";
 "CompanyCode"                           = "公司识别码";
 "User"                                  = "用户";
 "Password"                              = "密码";
-"AutoLogin"                             = "是否自动登陆";
-"Login"                                 = "登陆";
+"AutoLogin"                             = "是否自动登录";
+"Login"                                 = "登录";

 // Home
 "Home"                                  = "首页";

--- a/XFFruit/zh-Hans.lproj/Localizable.strings
+++ b/XFFruit/zh-Hans.lproj/Localizable.strings
@@ -22,12 +22,12 @@
 "From Camera"                           = "来自相机";

 // Login
-"XFFruit"                               = "移动巡店系统";
+"XFFruit"                               = "鲜丰平台";
 "CompanyCode"                           = "公司识别码";
 "User"                                  = "用户";
 "Password"                              = "密码";
-"AutoLogin"                             = "是否自动登陆";
-"Login"                                 = "登陆";
+"AutoLogin"                             = "是否自动登录";
+"Login"                                 = "登录";

 // Home
 "Home"                                  = "首页";
@@ -36,12 +36,25 @@
 "PatrolPlan"                            = "巡店计划";
 "MyStore"                               = "我的店铺";

-
 //Business
 "Business"                              = "业务";
+"Announcement"                          = "公告";
+"AddSurvey"                              = "新建行情调研";
+"Survey"                                 = "查看行情调研";
+"Survey1"                                 = "填写行情反馈";
+"Survey2"                                 = "新建采购通知";
+"Survey3"                                 = "查看采购通知单";
+"Survey4"                                 = "新建采购单";
+"Survey5"                                 = "查看采购单";
+"Survey6"                                 = "审核采购单";
+"Survey7"                                 = "新建发运单";
+"Survey8"                                 = "查看发运单";
+"Survey9"                                 = "新建加工单";
+"EditorShopDetail"                        ="编辑商品明细";
+"AddShopDetail"                           ="添加商品明细";

-// Store
-"Store"                                 = "门店";
+// Report
+"Report"                                 = "报表";
 "Navigate"                              = "导航";
 "SignUp"                                = "进店签到";
 "LeaveStore"                            = "离店登记";
@@ -50,17 +63,17 @@
 "Choose a Store"                        = "选择门店";
 "Store Detail"                          = "门店详情";

-// Sync
-"Sync"                                  = "同步";
+// Message
+"Message"                                  = "企信";
 "Task Progressing"                      = "任务处理";
 "Patrol Result"                         = "巡店结果";
-"SignIn Record"                         = "任务处理";
+"SignIn Record"                         = "签到记录";
 "Count:"                                = "数量:";
 "numbers"                               = "条";
 "To Upload Data"                        = "待上传数据";

-// System
-"System"                                = "系统";
+// Me
+"Me"                                = "我的";
 "Company"                               = "公司";
 "User"                                  = "用户";
 "Code"                                  = "代码";
@@ -86,6 +99,7 @@
 "Post by Me"                            = "我发起";
 "Task Code"                             = "任务编号";
 "Task Type"                             = "类型";
+"Task Charger"                          = "处理人";
 "Task Content"                          = "内容";
 "Task Title"                            = "任务标题";
 "Task Deadline"                         = "要求完成时间";
@@ -177,11 +191,10 @@
 "Announcement Detail"                    = "公告详情";

 //行情调研
-"Survey"                                 = "行情调研";
+
 "AddSurvey"                              = "新建行情调研";
 "AddPurchase"                            = "新建采购单";
 "Purchase"                               = "采购单";
-
 //Business
 "Business"                              = "业务";
 "Announcement"                          = "公告";
@@ -199,16 +212,5 @@
 "EditorShopDetail"                        ="编辑商品明细";
 "AddShopDetail"                           ="添加商品明细";

-
-
-
-
-
-
-//Avatar
-//选择界面 的title
-"ProductTitle"                                 = "商品选择";
-"VendorTitle"                              = "供应商";
-"WarehouseTitle"                            = "加工工厂";
 "ProductUnitTitle"                            = "商品单位";
-
+"ProductUnitTitle"                            = "商品单位";
\ No newline at end of file