Skip to content

X
xffruit
Commit 87973485 authored by Sandy's avatar Sandy
Browse files
Options

修改菜单图片

parent 75b250fa
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 401 additions and 148 deletions
XFFruit.xcodeproj/project.pbxproj
View file @ 87973485
...@@ -4284,7 +4284,7 @@ ...@@ -4284,7 +4284,7 @@
); );
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.xffruit; PRODUCT_BUNDLE_IDENTIFIER = com.gomore.xffruit;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "e2cec26c-3666-4512-9b9a-cdb4cd9da56d"; PROVISIONING_PROFILE = "";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**"; USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
}; };
name = Debug; name = Debug;
...@@ -4314,7 +4314,7 @@ ...@@ -4314,7 +4314,7 @@
); );
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.xffruit; PRODUCT_BUNDLE_IDENTIFIER = com.gomore.xffruit;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "e2cec26c-3666-4512-9b9a-cdb4cd9da56d"; PROVISIONING_PROFILE = "";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**"; USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
}; };
name = Release; name = Release;
......
XFFruit/Controllers/AppViewController/ICRAppViewControllerManager.m
View file @ 87973485
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
} }
#ifdef Demonstrate #ifdef Demonstrate
#else #else
[self createSyncViewController]; [self createSyncViewController];
#endif #endif
[self createSystemViewController]; [self createSystemViewController];
......
XFFruit/Controllers/DataBaseController/GXFFunctionDBHelper.m
View file @ 87973485
...@@ -100,9 +100,21 @@ ...@@ -100,9 +100,21 @@
@"新建采购通知",@"查看采购通知", @"查看采购通知", @"新建采购通知",@"查看采购通知", @"查看采购通知",
@"新建采购单",@"查看采购单", @"查看采购单", @"供应商确认采购单",//【供应商】", @"新建采购单",@"查看采购单", @"查看采购单", @"供应商确认采购单",//【供应商】",
@"新建发运单",@"查看发运单", @"查看发运单", @"新建发运单",@"查看发运单", @"查看发运单",
@"新增加工单",@"查看加工单", @"查看加工单", @"新建加工单",@"查看加工单", @"查看加工单",
@"新建转运单", @"查看转运单", @"查看转运单", @"新建转运单", @"查看转运单", @"查看转运单",
@"查看收货单", @"查看收货单"]; @"查看收货单", @"查看收货单"];
#ifdef Demonstrate
NSArray *functionsImageName = @[@"notice",
@"demo_survey",@"demo_hangqingfankui", @"watch_surver",
@"demo_hangqingfankui",
@"demo_caigoutongzhi",@"watch_needs", @"watch_needs",
@"demo_xinjiancaigoudan",@"watch_purchase", @"watch_purchase", @"demo_querencaigoudan",
@"demo_xinjianfayundan",@"watch_transort", @"watch_transort",
@"demo_xinjianjiagongdan",@"demo_chakanjiagongdan", @"watch_process",
@"demo_xinjianzhuanyundan", @"demo_chakanzhuanyundan", @"demo_chakanzhuanyundan",
@"demo_chakanshouhuodan", @"demo_chakanshouhuodan" ];//收货单
#else
NSArray *functionsImageName = @[@"notice", NSArray *functionsImageName = @[@"notice",
@"create_surver",@"watch_surver", @"watch_surver", @"create_surver",@"watch_surver", @"watch_surver",
@"create_surver_result", @"create_surver_result",
...@@ -112,6 +124,7 @@ ...@@ -112,6 +124,7 @@
@"create_process",@"watch_process", @"watch_process", @"create_process",@"watch_process", @"watch_process",
@"create_transfer", @"create_transfer", @"create_transfer", @"create_transfer", @"create_transfer", @"create_transfer",
@"create_transfer", @"create_transfer" ];//收货单 @"create_transfer", @"create_transfer" ];//收货单
#endif
//NSArray *functionsSmallImgName = @[]; //NSArray *functionsSmallImgName = @[];
NSArray *functionItemTag = @[@(0), NSArray *functionItemTag = @[@(0),
......
XFFruit/General/Views/FunctionView/ICRFunctionItemControl.h
View file @ 87973485
...@@ -10,37 +10,35 @@ ...@@ -10,37 +10,35 @@
//@protocol ICRFuctionItemControlDelegate; //@protocol ICRFuctionItemControlDelegate;
typedef NS_ENUM (NSUInteger, ICRFunctionID) { typedef NS_ENUM(NSUInteger, ICRFunctionID) {
kFunctionNotice = 0, //公告
kFunctionNotice = 0, //公告 kFunctionNewSurvey, //新建行情调研 1
kFunctionNewSurvey, //新建行情调研 1 kFunctionSeeSurvey, //查看行情调研2
kFunctionSeeSurvey, //查看行情调研2
kFunctionFeedBackSurvey, //填写行情反馈3 kFunctionFeedBackSurvey, //填写行情反馈3
kFunctionNewPurchaseNotice, //新建采购通知4 kFunctionNewPurchaseNotice,//新建采购通知4
kFunctionSeePurchaseNotice, //查看采购通知5 kFunctionSeePurchaseNotice,//查看采购通知5
kFunctionNewPurchase, // 新建采购单6 kFunctionNewPurchase, // 新建采购单6
kFunctionSeePurchase, // 查看采购单7 kFunctionSeePurchase, // 查看采购单7
kFunctionExaminePurchase, // 审核采购单【供应商】8 kFunctionExaminePurchase, // 审核采购单【供应商】8
kFunctionNewShipment, // 新建发运单9 kFunctionNewShipment, // 新建发运单9
kFunctionSeeShipment, // 查看发运单10 kFunctionSeeShipment, // 查看发运单10
kFunctionNewProcessing, // 新增加工单11 kFunctionNewProcessing, // 新增加工单11
kFunctionSeeProcessing, // 查看加工单12 kFunctionSeeProcessing, // 查看加工单12
kFunctionNewTransfer, //新建转运单13 kFunctionNewTransfer, //新建转运单13
kFunctionSeeTransfer, //查看发运单14 kFunctionSeeTransfer, //查看发运单14
kFunctionSeeReceive, //查看收货单15 kFunctionSeeReceive,//查看收货单15
kFunctionAnnouncement,
kFunctionAnnouncement , kFunctionTaskManagement,
kFunctionTaskManagement, kFunctionPatrolPlan,
kFunctionPatrolPlan, kFunctionMyShop,
kFunctionMyShop, kFunctionNavigation,
kFunctionNavigation, kFunctionComeShopReg,
kFunctionComeShopReg, kFunctionLeaveShopReg,
kFunctionLeaveShopReg, kFunctionCreatTask,
kFunctionCreatTask, kFunctionHandleTask
kFunctionHandleTask
}; };
@interface ICRFunctionItemControl : UIControl @interface ICRFunctionItemControl : UIControl
......
XFFruit/Images.xcassets/Demo/Contents.json 0 → 100644
View file @ 87973485
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Demo/demo_caigoutongzhi.imageset/Contents.json 0 → 100644
View file @ 87973485
{
"images" : [
{
"idiom" : "universal",
"filename" : "demo_caigoutongzhi.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "demo_caigoutongzhi@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "demo_caigoutongzhi@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Demo/demo_chakanjiagongdan.imageset/Contents.json 0 → 100644
View file @ 87973485
{
"images" : [
{
"idiom" : "universal",
"filename" : "demo_chakanjiagongdan.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "demo_chakanjiagongdan@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "demo_chakanjiagongdan@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Demo/demo_chakanshouhuodan.imageset/Contents.json 0 → 100644
View file @ 87973485
{
"images" : [
{
"idiom" : "universal",
"filename" : "demo_chakanshouhuodan.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "demo_chakanshouhuodan@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "demo_chakanshouhuodan@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Demo/demo_chakanzhuanyundan.imageset/Contents.json 0 → 100644
View file @ 87973485
{
"images" : [
{
"idiom" : "universal",
"filename" : "demo_chakanzhuanyundan.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "demo_chakanzhuanyundan@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "demo_chakanzhuanyundan@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Demo/demo_hangqingfankui.imageset/Contents.json 0 → 100644
View file @ 87973485
{
"images" : [
{
"idiom" : "universal",
"filename" : "demo_hangqingfankui.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "demo_hangqingfankui@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "demo_hangqingfankui@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Demo/demo_querencaigoudan.imageset/Contents.json 0 → 100644
View file @ 87973485
{
"images" : [
{
"idiom" : "universal",
"filename" : "demo_querencaigoudan.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "demo_querencaigoudan@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "demo_querencaigoudan@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Demo/demo_survey.imageset/Contents.json 0 → 100644
View file @ 87973485
{
"images" : [
{
"idiom" : "universal",
"filename" : "demo_survey.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "demo_survey@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "demo_survey@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Demo/demo_xinjiancaigoudan.imageset/Contents.json 0 → 100644
View file @ 87973485
{
"images" : [
{
"idiom" : "universal",
"filename" : "demo_xinjiancaigoudan.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "demo_xinjiancaigoudan@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "demo_xinjiancaigoudan@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Demo/demo_xinjianfayundan.imageset/Contents.json 0 → 100644
View file @ 87973485
{
"images" : [
{
"idiom" : "universal",
"filename" : "demo_xinjianfayundan.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "demo_xinjianfayundan@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "demo_xinjianfayundan@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Demo/demo_xinjianjiagongdan.imageset/Contents.json 0 → 100644
View file @ 87973485
{
"images" : [
{
"idiom" : "universal",
"filename" : "demo_xinjianjiagongdan.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "demo_xinjianjiagongdan@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "demo_xinjianjiagongdan@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Demo/demo_xinjianzhuanyundan.imageset/Contents.json 0 → 100644
View file @ 87973485
{
"images" : [
{
"idiom" : "universal",
"filename" : "demo_xinjianzhuanyundan.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "demo_xinjianzhuanyundan@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "demo_xinjianzhuanyundan@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Macro/ICRAppMacro.h
View file @ 87973485
...@@ -22,22 +22,23 @@ ...@@ -22,22 +22,23 @@
#define ICR_TABBAR_TINT_COLOR [UIColor colorWithR:36 g:38 b:53 a:1] #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 ICR_IMAGE_BG_COLOR [UIColor colorWithW:242 a:1]
#ifdef Demonstrate
//********演示环境*********
#define HTTP_REST_API_BASE_URL @"http://jdcg.demo.hd123.cn:7080/cruiser-server/rest"
#define HTTP_REST_REPORT_BASE_URL @"http://jdcg.demo.hd123.cn:7080"
#else
//********阿里云内部测试环境******** //********阿里云内部测试环境********
//#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 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" #define HTTP_REST_API_BASE_URL @"http://122.224.171.126:7380/cruiser-server/rest"
//// #define HTTP_REST_REPORT_BASE_URL @"http://122.224.171.126:7380"
//#define HTTP_REST_REPORT_BASE_URL @"http://122.224.171.126:7380" #endif
//********演示环境*********
#define HTTP_REST_API_BASE_URL @"http://jdcg.demo.hd123.cn:7080/cruiser-server/rest"
//
#define HTTP_REST_REPORT_BASE_URL @"http://jdcg.demo.hd123.cn:7080"
// 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"
......
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