Skip to content

X
xffruit
Commit 3f2023d6 authored by mei's avatar mei
Browse files
Options

no message

parent 3b6e7db6
Show whitespace changes
Inline Side-by-side
Showing with 817 additions and 4 deletions
XFFruit/Controllers/AppViewController/ICRAppViewControllerManager.h
View file @ 3f2023d6
......@@ -10,12 +10,14 @@
#import "IBTTabBarController.h"
#define CR_NAME_HOME @"Home"
#define CR_name_BUSINESS @"Business"
#define CR_NAME_STORE @"Store"
#define CR_NAME_SYNC @"Sync"
#define CR_NAME_SYSTEM @"System"
typedef NS_ENUM(NSUInteger, CRTapBarItemIndex) {
kCRHome = 0,
kCRBusiness,
kCRStore,
kCRSync,
kCRSystem,
......@@ -23,6 +25,7 @@ typedef NS_ENUM(NSUInteger, CRTapBarItemIndex) {
static NSString * const ACETapBarItemNames[] = {
[ kCRHome ] = CR_NAME_HOME,
[ kCRBusiness ] = CR_name_BUSINESS,
[ kCRStore ] = CR_NAME_STORE,
[ kCRSync ] = CR_NAME_SYNC,
[ kCRSystem ] = CR_NAME_SYSTEM,
......
XFFruit/Controllers/AppViewController/ICRAppViewControllerManager.m
View file @ 3f2023d6
......@@ -12,6 +12,7 @@
#import "IBTUINavigationController.h"
#import "ICRLoginViewController.h"
#import "ICRHomeViewController.h"
#import "BusinessViewController.h"
#import "ICRStoreViewController.h"
#import "ICRSyncViewController.h"
#import "ICRSystemViewController.h"
......@@ -124,7 +125,8 @@
[m_arrTabBarBaseViewController removeAllObjects];
[m_arrViewController removeAllObjects];
[self createHomeViewController];
[self createHomeViewController];//首页
[self createBusinessViewController];//业务
[self createStoreViewController];
[self createSyncViewController];
[self createSystemViewController];
......@@ -165,7 +167,18 @@
navCtrl.title = nsTitle;
}
-(void)createBusinessViewController
{
NSString *nsTitle = ACETapBarItemNames[ kCRBusiness ];
BusinessViewController *businessVCtrl=[[BusinessViewController alloc]init];
[m_arrTabBarBaseViewController addObject:businessVCtrl];
businessVCtrl.title=[IBTCommon localizableString:nsTitle];
IBTUINavigationController *navCtrl = [[IBTUINavigationController alloc] initWithRootViewController:businessVCtrl];
[m_arrViewController addObject:navCtrl];
navCtrl.title = nsTitle;
}
- (void)createStoreViewController {
NSString *nsTitle = ACETapBarItemNames[ kCRStore ];
......
XFFruit/Images.xcassets/Tab/TabBusinessIcon.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "TabBusinessIcon@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/TabBusiness2Icon.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "service.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "service@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/aboutme.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "aboutme.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "aboutme@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/aboutme_checked.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "aboutme_checked.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "aboutme_checked@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/create_needs.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "create_needs.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "create_needs@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/create_process.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "create_process.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "create_process@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/create_purchase.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "create_purchase.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "create_purchase@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/create_surver.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "create_surver.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "create_surver@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/create_surver_result.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "create_surver_result.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "create_surver_result@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/create_surver_result@2x-2.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "create_surver_result@2x-2.png"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/create_transport-2.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "create_transport-2.png"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/create_transport.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "create_transport.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "create_transport@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/home.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "home.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "home@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/home_checked.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "home_checked.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "home_checked@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/message.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "message.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "message@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/message@2x-2.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "message@2x-2.png"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/message@2x-3.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "message@2x-3.png"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/message_checked.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "message_checked.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "message_checked@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/month_plan.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "month_plan.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "month_plan@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/notice.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "notice.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "notice@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/report.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "report.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "report@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/report_checked.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "report_checked.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "report_checked@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/review_purchase.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "review_purchase.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "review_purchase@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/select_icon.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "select_icon.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "select_icon@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/service_checked.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "service_checked.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "service_checked@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/watch_needs.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "watch_needs.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "watch_needs@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/watch_process.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "watch_process.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "watch_process@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/watch_purchase.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "watch_purchase.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "watch_purchase@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/watch_surver.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "watch_surver.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "watch_surver@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/watch_transort.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "watch_transort.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "watch_transort@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/week_plan.imageset/Contents.json 0 → 100644
View file @ 3f2023d6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "week_plan.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "week_plan@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/ViewControllers/Business/BusinessViewController.m
View file @ 3f2023d6
......@@ -8,7 +8,11 @@
#import "BusinessViewController.h"
@interface BusinessViewController ()
#import "ICRFunctionBaseView.h"
#import "ICRFunctionEntity.h"
#import "ICRFunctionBaseView.h"
@interface BusinessViewController ()<ICRFunctionBaseViewDelegate>
@end
......@@ -16,14 +20,81 @@
- (void)viewDidLoad {
[super viewDidLoad];
// [self initView];
[self setupSubviews];
// Do any additional setup after loading the view.
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
}
-(void)setupSubviews
{
NSMutableArray *arrFunctionEntities = [NSMutableArray array];
NSArray *functionImageNames = @[ @"AnnouncementIcon",@"create_surver",@"watch_surver",@"create_surver_result",@"create_needs",@"watch_needs",@"create_purchase",@"watch_purchase",@"review_purchase",@"create_transport",@"watch_transort",@"create_process"];
NSArray *fuctionNames = @[ [IBTCommon localizableString:@"Announcement"],
[IBTCommon localizableString:@"AddSurvey"],
[IBTCommon localizableString:@"Survey"],
[IBTCommon localizableString:@"Survey1"],
[IBTCommon localizableString:@"Survey2"],
[IBTCommon localizableString:@"Survey3"],
[IBTCommon localizableString:@"Survey4"],
[IBTCommon localizableString:@"Survey5"],
[IBTCommon localizableString:@"Survey6"],
[IBTCommon localizableString:@"Survey7"],
[IBTCommon localizableString:@"Survey8"],[IBTCommon localizableString:@"Survey9"],
];
NSArray *functionTags = @[ @(kFunctionAnnouncement),
@(kFunctionTaskManagement),
@(kFunctionPatrolPlan),
@(kFunctionMyShop),
@(kFunctionNavigation),
@(kFunctionComeShopReg),
@(kFunctionAnnouncement),
@(kFunctionTaskManagement),
@(kFunctionPatrolPlan),
@(kFunctionMyShop),
@(kFunctionNavigation),
@(kFunctionComeShopReg)];
int i = 0;
for (NSString *functionName in fuctionNames) {
ICRFunctionEntity *funtionEntity = [[ICRFunctionEntity alloc] init];
funtionEntity.functionName = functionName;
funtionEntity.iconName = [functionImageNames objectAtIndex:i];
funtionEntity.functionItemTag = [[functionTags objectAtIndex:i] integerValue];
[arrFunctionEntities addObject:funtionEntity];
i ++;
}
ICRFunctionBaseView *baseView = [ICRFunctionBaseView initWithFunctionData:arrFunctionEntities];
baseView.frame = (CGRect){
.origin.x = 0,
.origin.y =0,
.size.width = CGRectGetWidth(self.view.frame),
.size.height = CGRectGetHeight(self.view.frame),};
baseView.backgroundColor = [UIColor clearColor];
baseView.m_delegate = self;
[self.view addSubview:baseView];
}
-(void)initView
{
NSArray *butArray=[[NSArray alloc]initWithObjects:@"公告", @"新建行情调研",@"查看行情调研",@"填写行情反馈",@"新建采购通知",@"查看采购通知",@"新建采购单",@"查看采购单",@"审核采购单",@"新建发运单",@"查看发运单",@"新建加工单",nil];
for (int i=0; i<butArray.count; i++) {
UIButton *but=[UIButton buttonWithType:UIButtonTypeCustom];
but.frame=CGRectMake(15+i%3*(90+10),10+(i/3)*(100+10) , 90, 90) ;
// but.titleLabel.text=[NSString stringWithFormat:@"%@",[butArray objectAtIndex:i]];
NSString *str=[butArray objectAtIndex:i];
[but setTitle:str forState:UIControlStateNormal];
but.backgroundColor=[UIColor redColor];
[self .view addSubview:but];
}
}
/*
#pragma mark - Navigation
......
XFFruit/en.lproj/Localizable.strings
View file @ 3f2023d6
......@@ -36,6 +36,21 @@
"PatrolPlan" = "巡店计划";
"MyStore" = "我的店铺";
//Business
"Business" = "业务";
"Announcement" = "公告";
"AddSurvey" = "新建行情调研";
"Survey" = "查看行情调研";
"Survey1" = "填写行情反馈";
"Survey2" = "新建采购通知";
"Survey3" = "查看采购通知";
"Survey4" = "新建采购单";
"Survey5" = "查看采购单";
"Survey6" = "审核采购单";
"Survey7" = "新建发运单";
"Survey8" = "查看发运单";
"Survey9" = "新建加工单";
// Store
"Store" = "门店";
"Navigate" = "导航";
......@@ -174,7 +189,7 @@
"Announcement Detail" = "公告详情";
//行情调研
"Survey" = "行情调研";
"AddSurvey" = "新建行情调研";
XFFruit/zh-Hans.lproj/Localizable.strings
View file @ 3f2023d6
......@@ -36,6 +36,10 @@
"PatrolPlan" = "巡店计划";
"MyStore" = "我的店铺";
//Business
"Business" = "业务";
// Store
"Store" = "门店";
"Navigate" = "导航";
......
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