Skip to content

X
xffruit
Commit 974cfd18 authored by 陈俊俊's avatar 陈俊俊
Browse files
Options

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

parents 54686c7a ba6abd65
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 42 deletions
Podfile.lock
View file @ 974cfd18
...@@ -33,11 +33,11 @@ PODS: ...@@ -33,11 +33,11 @@ PODS:
- FMDB/common - FMDB/common
- IQKeyboardManager (3.2.4) - IQKeyboardManager (3.2.4)
- MBProgressHUD (0.9.1) - MBProgressHUD (0.9.1)
- MJRefresh (2.2.0) - MJRefresh (2.2.1)
- Reveal-iOS-SDK (1.5.1) - Reveal-iOS-SDK (1.5.1)
- SDWebImage (3.7.2): - SDWebImage (3.7.3):
- SDWebImage/Core (= 3.7.2) - SDWebImage/Core (= 3.7.3)
- SDWebImage/Core (3.7.2) - SDWebImage/Core (3.7.3)
- SSKeychain (1.2.3) - SSKeychain (1.2.3)
DEPENDENCIES: DEPENDENCIES:
...@@ -59,9 +59,9 @@ SPEC CHECKSUMS: ...@@ -59,9 +59,9 @@ SPEC CHECKSUMS:
FMDB: 96e8f1bcc1329e269330f99770ad4285d9003e52 FMDB: 96e8f1bcc1329e269330f99770ad4285d9003e52
IQKeyboardManager: 555b1231fefafb21b19278d7cca72986a27b748b IQKeyboardManager: 555b1231fefafb21b19278d7cca72986a27b748b
MBProgressHUD: c47f2c166c126cf2ce36498d80f33e754d4e93ad MBProgressHUD: c47f2c166c126cf2ce36498d80f33e754d4e93ad
MJRefresh: 65a2bf14abb6feeaed8696aa1551f70e15ab0a08 MJRefresh: c3fa0387e8e97a11a9666639d2f815607edd1c2f
Reveal-iOS-SDK: c9c55cad2729c85f6ced415f1b21857c9a2d8ef9 Reveal-iOS-SDK: c9c55cad2729c85f6ced415f1b21857c9a2d8ef9
SDWebImage: 71b7cdc1d1721d6a82ed62889030225f2c249e29 SDWebImage: 1d2b1a1efda1ade1b00b6f8498865f8ddedc8a84
SSKeychain: 3f42991739c6c60a9cf1bbd4dff6c0d3694bcf3d SSKeychain: 3f42991739c6c60a9cf1bbd4dff6c0d3694bcf3d
COCOAPODS: 0.38.2 COCOAPODS: 0.39.0
XFFruit.xcodeproj/project.pbxproj
View file @ 974cfd18
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
72873CEB1BA27BA6007B3387 /* GXFPopView.m in Sources */ = {isa = PBXBuildFile; fileRef = 72873CEA1BA27BA6007B3387 /* GXFPopView.m */; }; 72873CEB1BA27BA6007B3387 /* GXFPopView.m in Sources */ = {isa = PBXBuildFile; fileRef = 72873CEA1BA27BA6007B3387 /* GXFPopView.m */; };
72873CEE1BA280DD007B3387 /* GXFPopCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 72873CED1BA280DD007B3387 /* GXFPopCell.m */; }; 72873CEE1BA280DD007B3387 /* GXFPopCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 72873CED1BA280DD007B3387 /* GXFPopCell.m */; };
72882D8B1BA9121E00935BA6 /* ChooseProductUnitViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72882D8A1BA9121E00935BA6 /* ChooseProductUnitViewController.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 */; }; 72A8132D1BCA8BBA003631F3 /* ChooseTransportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A8132C1BCA8BBA003631F3 /* ChooseTransportViewController.m */; };
72A813FA1BCD3205003631F3 /* ReceiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A813F71BCD3205003631F3 /* ReceiveViewController.m */; }; 72A813FA1BCD3205003631F3 /* ReceiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A813F71BCD3205003631F3 /* ReceiveViewController.m */; };
72A813FD1BCD33BE003631F3 /* ReceiveBoltView.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A813FC1BCD33BE003631F3 /* ReceiveBoltView.m */; }; 72A813FD1BCD33BE003631F3 /* ReceiveBoltView.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A813FC1BCD33BE003631F3 /* ReceiveBoltView.m */; };
...@@ -2568,6 +2568,7 @@ ...@@ -2568,6 +2568,7 @@
C1F696001AB870B400F9F5DD /* Frameworks */, C1F696001AB870B400F9F5DD /* Frameworks */,
C1F696011AB870B400F9F5DD /* Resources */, C1F696011AB870B400F9F5DD /* Resources */,
1454647E6246AB3D8AAE6FF2 /* Copy Pods Resources */, 1454647E6246AB3D8AAE6FF2 /* Copy Pods Resources */,
DD0C5CA575D0001C5572EB89 /* Embed Pods Frameworks */,
); );
buildRules = ( buildRules = (
); );
...@@ -2707,6 +2708,21 @@ ...@@ -2707,6 +2708,21 @@
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"; 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; showEnvVarsInLog = 0;
}; };
DD0C5CA575D0001C5572EB89 /* 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 */ /* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */
...@@ -3264,8 +3280,8 @@ ...@@ -3264,8 +3280,8 @@
baseConfigurationReference = 1B0B22845F5CD40B5CF655F2 /* Pods.debug.xcconfig */; baseConfigurationReference = 1B0B22845F5CD40B5CF655F2 /* Pods.debug.xcconfig */;
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer: Minglong Hu (TR9LJDJBFT)"; CODE_SIGN_IDENTITY = "iPhone Developer: Fanfan Cui (7S27LB84E2)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Minglong Hu (TR9LJDJBFT)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Fanfan Cui (7S27LB84E2)";
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch"; GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch";
INFOPLIST_FILE = XFFruit/Info.plist; INFOPLIST_FILE = XFFruit/Info.plist;
...@@ -3277,7 +3293,7 @@ ...@@ -3277,7 +3293,7 @@
"$(PROJECT_DIR)/XFFruit/Vendors/JiGuang/lib", "$(PROJECT_DIR)/XFFruit/Vendors/JiGuang/lib",
); );
PRODUCT_NAME = XFFruit; PRODUCT_NAME = XFFruit;
PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4"; PROVISIONING_PROFILE = "3a32e5a9-395f-425a-b1b0-c221be8d15d8";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**"; USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
}; };
name = Debug; name = Debug;
...@@ -3287,8 +3303,8 @@ ...@@ -3287,8 +3303,8 @@
baseConfigurationReference = 7DDFB1D460448C3B45118195 /* Pods.release.xcconfig */; baseConfigurationReference = 7DDFB1D460448C3B45118195 /* Pods.release.xcconfig */;
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer: Minglong Hu (TR9LJDJBFT)"; CODE_SIGN_IDENTITY = "iPhone Developer: Fanfan Cui (7S27LB84E2)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Minglong Hu (TR9LJDJBFT)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Fanfan Cui (7S27LB84E2)";
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch"; GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch";
INFOPLIST_FILE = XFFruit/Info.plist; INFOPLIST_FILE = XFFruit/Info.plist;
...@@ -3300,7 +3316,7 @@ ...@@ -3300,7 +3316,7 @@
"$(PROJECT_DIR)/XFFruit/Vendors/JiGuang/lib", "$(PROJECT_DIR)/XFFruit/Vendors/JiGuang/lib",
); );
PRODUCT_NAME = XFFruit; PRODUCT_NAME = XFFruit;
PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4"; PROVISIONING_PROFILE = "3a32e5a9-395f-425a-b1b0-c221be8d15d8";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**"; USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
}; };
name = Release; name = Release;
......
XFFruit/General/Classes/BaseViewController/ChooseParentViewController.m
View file @ 974cfd18
...@@ -174,6 +174,12 @@ ...@@ -174,6 +174,12 @@
}else{ }else{
sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE ENABLED = 1 ORDER BY %@", tableStr, @"uuid"]; 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 { }else {
if (titleStr.length > 0) { if (titleStr.length > 0) {
sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE NAME LIKE '%%%@%%' or CODE LIKE '%%%@%%' ORDER BY %@", tableStr,titleStr,titleStr, @"uuid"]; sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE NAME LIKE '%%%@%%' or CODE LIKE '%%%@%%' ORDER BY %@", tableStr,titleStr,titleStr, @"uuid"];
......
XFFruit/Macro/ICRAppMacro.h
View file @ 974cfd18
...@@ -28,6 +28,9 @@ ...@@ -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:7280/cruiser-server/rest"
/*********现场正式环境**********/
//#define HTTP_REST_API_BASE_URL @"http://122.224.171.126:7380/cruiser-server/rest"
// HTTP // HTTP
//#define HTTP_REST_API_BASE_URL @"http://115.28.191.44:8080/IPatrol/rest" //#define HTTP_REST_API_BASE_URL @"http://115.28.191.44:8080/IPatrol/rest"
......
XFFruit/en.lproj/Localizable.strings
View file @ 974cfd18
...@@ -22,12 +22,12 @@ ...@@ -22,12 +22,12 @@
"From Camera" = "来自相机"; "From Camera" = "来自相机";
// Login // Login
"XFFruit" = "移动巡店系统"; "XFFruit" = "鲜丰平台";
"CompanyCode" = "公司识别码"; "CompanyCode" = "公司识别码";
"User" = "用户"; "User" = "用户";
"Password" = "密码"; "Password" = "密码";
"AutoLogin" = "是否自动登陆"; "AutoLogin" = "是否自动登录";
"Login" = "登陆"; "Login" = "登录";
// Home // Home
"Home" = "首页"; "Home" = "首页";
......
XFFruit/zh-Hans.lproj/Localizable.strings
View file @ 974cfd18
...@@ -22,12 +22,12 @@ ...@@ -22,12 +22,12 @@
"From Camera" = "来自相机"; "From Camera" = "来自相机";
// Login // Login
"XFFruit" = "移动巡店系统"; "XFFruit" = "鲜丰平台";
"CompanyCode" = "公司识别码"; "CompanyCode" = "公司识别码";
"User" = "用户"; "User" = "用户";
"Password" = "密码"; "Password" = "密码";
"AutoLogin" = "是否自动登陆"; "AutoLogin" = "是否自动登录";
"Login" = "登陆"; "Login" = "登录";
// Home // Home
"Home" = "首页"; "Home" = "首页";
...@@ -36,12 +36,25 @@ ...@@ -36,12 +36,25 @@
"PatrolPlan" = "巡店计划"; "PatrolPlan" = "巡店计划";
"MyStore" = "我的店铺"; "MyStore" = "我的店铺";
//Business //Business
"Business" = "业务"; "Business" = "业务";
"Announcement" = "公告";
"AddSurvey" = "新建行情调研";
"Survey" = "查看行情调研";
"Survey1" = "填写行情反馈";
"Survey2" = "新建采购通知";
"Survey3" = "查看采购通知单";
"Survey4" = "新建采购单";
"Survey5" = "查看采购单";
"Survey6" = "审核采购单";
"Survey7" = "新建发运单";
"Survey8" = "查看发运单";
"Survey9" = "新建加工单";
"EditorShopDetail" ="编辑商品明细";
"AddShopDetail" ="添加商品明细";
// Store // Report
"Store" = "门店"; "Report" = "报表";
"Navigate" = "导航"; "Navigate" = "导航";
"SignUp" = "进店签到"; "SignUp" = "进店签到";
"LeaveStore" = "离店登记"; "LeaveStore" = "离店登记";
...@@ -50,17 +63,17 @@ ...@@ -50,17 +63,17 @@
"Choose a Store" = "选择门店"; "Choose a Store" = "选择门店";
"Store Detail" = "门店详情"; "Store Detail" = "门店详情";
// Sync // Message
"Sync" = "同步"; "Message" = "企信";
"Task Progressing" = "任务处理"; "Task Progressing" = "任务处理";
"Patrol Result" = "巡店结果"; "Patrol Result" = "巡店结果";
"SignIn Record" = "任务处理"; "SignIn Record" = "签到记录";
"Count:" = "数量:"; "Count:" = "数量:";
"numbers" = "条"; "numbers" = "条";
"To Upload Data" = "待上传数据"; "To Upload Data" = "待上传数据";
// System // Me
"System" = "系统"; "Me" = "我的";
"Company" = "公司"; "Company" = "公司";
"User" = "用户"; "User" = "用户";
"Code" = "代码"; "Code" = "代码";
...@@ -86,6 +99,7 @@ ...@@ -86,6 +99,7 @@
"Post by Me" = "我发起"; "Post by Me" = "我发起";
"Task Code" = "任务编号"; "Task Code" = "任务编号";
"Task Type" = "类型"; "Task Type" = "类型";
"Task Charger" = "处理人";
"Task Content" = "内容"; "Task Content" = "内容";
"Task Title" = "任务标题"; "Task Title" = "任务标题";
"Task Deadline" = "要求完成时间"; "Task Deadline" = "要求完成时间";
...@@ -177,11 +191,10 @@ ...@@ -177,11 +191,10 @@
"Announcement Detail" = "公告详情"; "Announcement Detail" = "公告详情";
//行情调研 //行情调研
"Survey" = "行情调研";
"AddSurvey" = "新建行情调研"; "AddSurvey" = "新建行情调研";
"AddPurchase" = "新建采购单"; "AddPurchase" = "新建采购单";
"Purchase" = "采购单"; "Purchase" = "采购单";
//Business //Business
"Business" = "业务"; "Business" = "业务";
"Announcement" = "公告"; "Announcement" = "公告";
...@@ -199,16 +212,5 @@ ...@@ -199,16 +212,5 @@
"EditorShopDetail" ="编辑商品明细"; "EditorShopDetail" ="编辑商品明细";
"AddShopDetail" ="添加商品明细"; "AddShopDetail" ="添加商品明细";
//Avatar
//选择界面 的title
"ProductTitle" = "商品选择";
"VendorTitle" = "供应商";
"WarehouseTitle" = "加工工厂";
"ProductUnitTitle" = "商品单位"; "ProductUnitTitle" = "商品单位";
"ProductUnitTitle" = "商品单位";
\ No newline at end of file
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