Skip to content

X
xffruit
Commit 7fcf730c 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 59ace950 1dfef5e5
Hide whitespace changes
Inline Side-by-side
Showing with 469 additions and 157 deletions
XFFruit/Controllers/AppViewController/ICRAppViewControllerManager.h
View file @ 7fcf730c
......@@ -10,10 +10,10 @@
#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"
#define CR_name_BUSINESS @"Business"
#define CR_NAME_STORE @"Report"
#define CR_NAME_SYNC @"Message"
#define CR_NAME_SYSTEM @"Me"
typedef NS_ENUM(NSUInteger, CRTapBarItemIndex) {
kCRHome = 0,
......
XFFruit/Controllers/AppViewController/ICRAppViewControllerManager.m
View file @ 7fcf730c
......@@ -95,7 +95,7 @@
return m_arrTabBarBaseViewController[ index ];
}
- (void)openFirstView {
if ([m_window.rootViewController isKindOfClass:[IBTUINavigationController class]]) {
IBTUINavigationController *navCtrl = (IBTUINavigationController *)m_window.rootViewController;
......
XFFruit/General/Classes/UIAppearance/ICRUIAppearance.m
View file @ 7fcf730c
......@@ -52,20 +52,21 @@
+ (void)customTabbarAppearance {
if (IBT_IOS7_OR_LATER) {
[[UITabBar appearance] setBarTintColor:ICR_TABBAR_TINT_COLOR];
[[UITabBar appearance] setBarTintColor:XXFBgColor];
//[[UITabBar appearance] setBarTintColor:ICR_TABBAR_TINT_COLOR];
}
else {
[[UITabBar appearance] setTintColor:ICR_TABBAR_TINT_COLOR];
}
UIImage *selTab = [[UIImage imageNamed:@"TabbarSelectedBG"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
UIImage *selTab = [[UIImage imageNamed:@""] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];//TabbarSelectedBG
CGSize tabSize = CGSizeMake(IBT_MAIN_SCREEN_WIDTH/4, 49);
UIGraphicsBeginImageContext(tabSize);
[selTab drawInRect:CGRectMake(0, 0, tabSize.width, tabSize.height)];
UIImage *reSizeImage = UIGraphicsGetImageFromCurrentImageContext();
UIGraphicsEndImageContext();
[[UITabBar appearance] setSelectionIndicatorImage:reSizeImage];
// [[UITabBar appearance] setSelectionIndicatorImage:reSizeImage];
}
+ (void)customLableAppearance {
......
XFFruit/General/Views/ICRLoginContentView.m
View file @ 7fcf730c
......@@ -9,7 +9,8 @@
#import "ICRLoginContentView.h"
#import "ICRCheckBox.h"
#define LOGIN_ICON_WIDTH (60)
#define LOGIN_ICON_WIDTH (156)
#define LOGIN_ICON_HEIGHT (44)
#define LOGIN_INNER_GAP (20)
#define LOGIN_INPUT_HEIGHT (50)
......@@ -75,6 +76,52 @@
return v;
}
+ (UIView *)p_textFWithLeftImgView:(NSString *)nsLeftImgName
textF:(UITextField * __autoreleasing *)textFPointer
{
UIView *v = [[UIView alloc] init];
v.backgroundColor = [UIColor clearColor];
UIImageView *txtFBG = [[UIImageView alloc] initWithFrame:v.bounds];
txtFBG.userInteractionEnabled = YES;
txtFBG.image =
[[UIImage imageNamed:@"LoginInputBG"] stretchableImageWithLeftCapWidth:10
topCapHeight:25];
[txtFBG autoresizingWithStrechFullSize];
[v addSubview:txtFBG];
// IBTUILabel *leftLabel = [[IBTUILabel alloc] init];
// leftLabel.font = [UIFont systemFontOfSize:16];
// leftLabel.text = nsLeftLabel;
// [leftLabel sizeToFit];
// leftLabel.x = LOGIN_LABEL_MARGIN;
UIImageView *leftImgV = [[UIImageView alloc]initWithImage:[UIImage imageNamed:nsLeftImgName]];
leftImgV.frame = CGRectMake(5, 0, 19, 22);
UIView *labelContainer = [[UIView alloc] init];
labelContainer.backgroundColor = [UIColor clearColor];
labelContainer.frame = (CGRect){
.origin.x = 0,
.origin.y = 0,
.size.width = leftImgV.width + 1 * LOGIN_LABEL_MARGIN,//leftLabel.width + 2 * LOGIN_LABEL_MARGIN,
.size.height = leftImgV.height//leftLabel.height
};
[labelContainer addSubview:leftImgV];
UITextField *txtF = [[UITextField alloc] initWithFrame:txtFBG.bounds];
txtF.leftViewMode = UITextFieldViewModeAlways;
txtF.leftView = labelContainer;
[txtF autoresizingWithStrechFullSize];
[v addSubview:txtF];
if (textFPointer) {
*textFPointer = txtF;
}
return v;
}
#pragma mark - Life Cycle
- (instancetype)initWithFrame:(CGRect)frame
showCCode:(BOOL)bNeedShowCCode
......@@ -107,7 +154,7 @@
.origin.x = (self.width - LOGIN_ICON_WIDTH) * .5f,
.origin.y = 0,
.size.width = LOGIN_ICON_WIDTH,
.size.height = LOGIN_ICON_WIDTH
.size.height = LOGIN_ICON_HEIGHT//LOGIN_ICON_WIDTH
};
self.m_titleLabel.frame = (CGRect){
......@@ -170,33 +217,41 @@
- (void)initSubviews {
self.m_iconView = [[UIImageView alloc] init];
_m_iconView.image = [IBTCommon appIcon];
_m_iconView.image = [UIImage imageNamed:@"logo"];//[IBTCommon appIcon];
[self addSubview:_m_iconView];
self.m_titleLabel = [[IBTUILabel alloc] init];
self.m_titleLabel.font = [UIFont systemFontOfSize:19.0f];
self.m_titleLabel.textColor = [UIColor whiteColor];
self.m_titleLabel.textAlignment = NSTextAlignmentCenter;
self.m_titleLabel.text = [IBTCommon localizableString:@"XFFruit"];
self.m_titleLabel.text = @"移动管理平台";//[IBTCommon localizableString:@"XFFruit"];
[self addSubview:_m_titleLabel];
UITextField *txtF = nil;
// self.m_cCodeView =
// [[self class] TextFWithLeftLabel:[[IBTCommon localizableString:@"CompanyCode"] stringByAppendingString:@":"]
// textF:&txtF];
self.m_cCodeView =
[[self class] TextFWithLeftLabel:[[IBTCommon localizableString:@"CompanyCode"] stringByAppendingString:@":"]
textF:&txtF];
[[self class] p_textFWithLeftImgView:@"公司识别码" textF:&txtF];
self.m_cCodeTextF = txtF;
[self addSubview:_m_cCodeView];
// self.m_userNameView =
// [[self class] TextFWithLeftLabel:[[IBTCommon localizableString:@"User"] stringByAppendingString:@":"]
// textF:&txtF];
self.m_userNameView =
[[self class] TextFWithLeftLabel:[[IBTCommon localizableString:@"User"] stringByAppendingString:@":"]
textF:&txtF];
[[self class] p_textFWithLeftImgView:@"profile" textF:&txtF];
self.m_userNameTextF = txtF;
[self addSubview:_m_userNameView];
// self.m_passwordView =
// [[self class] TextFWithLeftLabel:[[IBTCommon localizableString:@"Password"] stringByAppendingString:@":"]
// textF:&txtF];
self.m_passwordView =
[[self class] TextFWithLeftLabel:[[IBTCommon localizableString:@"Password"] stringByAppendingString:@":"]
textF:&txtF];
[[self class] p_textFWithLeftImgView:@"password" textF:&txtF];
self.m_passwordTextF = txtF;
_m_passwordTextF.secureTextEntry = YES;
[self addSubview:_m_passwordView];
......@@ -205,7 +260,7 @@
[self initCheckBox];
// button
self.m_loginBtn = [IBTUIButton RoundCornerBtnWithTitle:[IBTCommon localizableString:@"Login"] bgColor:nil];
self.m_loginBtn = [IBTUIButton RoundCornerBtnWithTitle:[IBTCommon localizableString:@"Login"] bgColor:GXF_ORIGIN_COLOR];
[self.m_loginBtn setTitle:[IBTCommon localizableString:@"Login"]
forState:UIControlStateNormal];
[self addSubview:_m_loginBtn];
......
XFFruit/General/Views/ICRSystemHeaderView.m
View file @ 7fcf730c
......@@ -81,7 +81,7 @@
#pragma mark - Private Method
- (void)initSubViews {
UIImageView *bg = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"SystemImage"]];
UIImageView *bg = [[UIImageView alloc] initWithImage:[UIImage imageWithColor:HexColor(@"7ebf74")]];//[[UIImageView alloc] initWithImage:[UIImage imageNamed:@"SystemImage"]]; //;
bg.frame = self.bounds;
// bg.contentMode = UIViewContentModeScaleAspectFill;
[bg autoresizingWithStrechFullSize];
......
XFFruit/Images.xcassets/AppIcon.appiconset/Contents.json
View file @ 7fcf730c
......@@ -3,13 +3,18 @@
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "AppIcon58x58.png",
"scale" : "2x"
"filename" : "AppIcon29x29.png",
"scale" : "1x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "AppIcon87x87.png",
"filename" : "AppIcon58x58@.png",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "3x"
},
{
......@@ -19,11 +24,21 @@
"scale" : "2x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "AppIcon120x120.png",
"size" : "40x40",
"scale" : "3x"
},
{
"size" : "57x57",
"idiom" : "iphone",
"filename" : "AppIcon57x57.png",
"scale" : "1x"
},
{
"idiom" : "iphone",
"size" : "57x57",
"scale" : "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
......@@ -37,39 +52,53 @@
"scale" : "3x"
},
{
"size" : "29x29",
"idiom" : "ipad",
"filename" : "AppIcon29x29.png",
"size" : "29x29",
"scale" : "1x"
},
{
"size" : "29x29",
"idiom" : "ipad",
"filename" : "AppIcon58x58.png",
"size" : "29x29",
"scale" : "2x"
},
{
"size" : "40x40",
"idiom" : "ipad",
"filename" : "AppIcon40x40.png",
"size" : "40x40",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "ipad",
"filename" : "AppIcon80x80.png",
"size" : "50x50",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "50x50",
"scale" : "2x"
},
{
"size" : "76x76",
"idiom" : "ipad",
"filename" : "AppIcon76x76.png",
"size" : "72x72",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "72x72",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "1x"
},
{
"idiom" : "ipad",
"filename" : "AppIcon152x152.png",
"size" : "76x76",
"scale" : "2x"
}
],
......
XFFruit/Images.xcassets/Contents.json 0 → 100644
View file @ 7fcf730c
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Tab/Contents.json 0 → 100644
View file @ 7fcf730c
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Tab/TabBusiness.imageset/Contents.json 0 → 100644
View file @ 7fcf730c
{
"images" : [
{
"idiom" : "universal",
"filename" : "business.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "business@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Tab/TabBusiness_HL.imageset/Contents.json 0 → 100644
View file @ 7fcf730c
{
"images" : [
{
"idiom" : "universal",
"filename" : "business_checked.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "business_checked@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Tab/TabHomeIcon.imageset/Contents.json → XFFruit/Images.xcassets/Tab/TabHome.imageset/Contents.json
View file @ 7fcf730c
......@@ -2,12 +2,13 @@
"images" : [
{
"idiom" : "universal",
"filename" : "home.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "TabHomeIcon@2x.png"
"filename" : "home@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
......
XFFruit/Images.xcassets/Tab/TabHomeIcon_HL.imageset/Contents.json deleted 100644 → 0
View file @ 59ace950
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "TabHomeIcon_HL.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "TabHomeIcon_HL@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Tab/TabHome_HL.imageset/Contents.json 0 → 100644
View file @ 7fcf730c
{
"images" : [
{
"idiom" : "universal",
"filename" : "home_selected.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "home_selected@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Tab/TabBusinessIcon.imageset/Contents.json → XFFruit/Images.xcassets/Tab/TabMe.imageset/Contents.json
View file @ 7fcf730c
......@@ -2,12 +2,13 @@
"images" : [
{
"idiom" : "universal",
"filename" : "me.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "TabBusinessIcon@2x.png"
"filename" : "me@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
......
XFFruit/Images.xcassets/Tab/TabMe_HL.imageset/Contents.json 0 → 100644
View file @ 7fcf730c
{
"images" : [
{
"idiom" : "universal",
"filename" : "me_selected.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "me_selected@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Tab/TabMessage.imageset/Contents.json 0 → 100644
View file @ 7fcf730c
{
"images" : [
{
"idiom" : "universal",
"filename" : "message.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "message@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Tab/TabMessage_HL.imageset/Contents.json 0 → 100644
View file @ 7fcf730c
{
"images" : [
{
"idiom" : "universal",
"filename" : "message_selected.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "message_selected@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Tab/TabStoreIcon.imageset/Contents.json → XFFruit/Images.xcassets/Tab/TabReport.imageset/Contents.json
View file @ 7fcf730c
......@@ -2,12 +2,13 @@
"images" : [
{
"idiom" : "universal",
"filename" : "report.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "TabStoreIcon@2x.png"
"filename" : "report@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
......
XFFruit/Images.xcassets/Tab/TabReport_HL.imageset/Contents.json 0 → 100644
View file @ 7fcf730c
{
"images" : [
{
"idiom" : "universal",
"filename" : "report_selected.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "report_selected@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Tab/TabStoreIcon_HL.imageset/Contents.json deleted 100644 → 0
View file @ 59ace950
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "TabStoreIcon_HL.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "TabStoreIcon_HL@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Tab/TabSystemIcon.imageset/Contents.json deleted 100644 → 0
View file @ 59ace950
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "TabSystemIcon@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Tab/hight_bg.imageset/Contents.json 0 → 100644
View file @ 7fcf730c
{
"images" : [
{
"idiom" : "universal",
"filename" : "hight_bg.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "hight_bg@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/登录页/Contents.json 0 → 100644
View file @ 7fcf730c
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/Tab/TabSyncIcon.imageset/Contents.json → XFFruit/Images.xcassets/登录页/logo.imageset/Contents.json
View file @ 7fcf730c
......@@ -2,12 +2,13 @@
"images" : [
{
"idiom" : "universal",
"filename" : "logo.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "TabSyncIcon@2x.png"
"filename" : "logo@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
......
XFFruit/Images.xcassets/登录页/password.imageset/Contents.json 0 → 100644
View file @ 7fcf730c
{
"images" : [
{
"idiom" : "universal",
"filename" : "password.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "password@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/登录页/profile.imageset/Contents.json 0 → 100644
View file @ 7fcf730c
{
"images" : [
{
"idiom" : "universal",
"filename" : "profile.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "profile@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/登录页/公司识别码.imageset/Contents.json 0 → 100644
View file @ 7fcf730c
{
"images" : [
{
"idiom" : "universal",
"filename" : "公司识别码.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "公司识别码@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Images.xcassets/首页切图/Contents.json 0 → 100644
View file @ 7fcf730c
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
XFFruit/Info.plist
View file @ 7fcf730c
......@@ -11,7 +11,7 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<string>鲜丰平台</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
......
XFFruit/Macro/ICRAppMacro.h
View file @ 7fcf730c
......@@ -10,7 +10,7 @@
#define XFFruit_ICRAppMacro_h
// COLOR
#define ICR_TINTCOLOR [UIColor colorWithR:63 g:134 b:244 a:1]
#define ICR_TINTCOLOR [UIColor colorWithR:63 g:134 b:244 a:1] //蓝色
#define ICR_VIEW_BG_COLOR [UIColor whiteColor]
#define ICR_BLUE_BTN_COLOR ICR_TINTCOLOR
#define ICR_GRAY_BTN_COLOR [UIColor lightGrayColor]
......
XFFruit/Utilities/IBTUIKit/IBTTabBarController.m
View file @ 7fcf730c
......@@ -145,7 +145,7 @@
for (UIViewController *vCtrl in controllers) {
// Normal图片命名 Tab+|subname|+Icon+@2x.png
iconImgName = [NSString stringWithFormat:@"Tab%@Icon", vCtrl.title];
iconImgName = [NSString stringWithFormat:@"Tab%@", vCtrl.title];
UITabBarItem *tabBarItem =
[UITabBarItem itemWithTitle:[IBTCommon localizableString:vCtrl.title]
......
XFFruit/ViewControllers/Login/ICRLoginViewController.m
View file @ 7fcf730c
......@@ -67,9 +67,9 @@
#pragma mark - Private Method
- (void)setupSubviews {
UIImageView *bg = [[UIImageView alloc] initWithFrame:self.view.bounds];
bg.image = [UIImage imageNamed:@"LoginBG"];
bg.image = [UIImage imageWithColor:GXF_SAVE_COLOR];//
[bg autoresizingWithStrechFullSize];
UITapGestureRecognizer *tapGesture =
[[UITapGestureRecognizer alloc] initWithTarget:self
action:@selector(onBGTapped:)];
......
XFFruit/ViewControllers/Store/ICRStoreViewController.m
View file @ 7fcf730c
......@@ -57,27 +57,36 @@
// Do any additional setup after loading the view.
// UIBarButtonItem *backBtn = [[UIBarButtonItem alloc]initWithTitle:@"返回" style:UIBarButtonItemStyleDone target:self action:nil];
// self.navigationItem.backBarButtonItem = backBtn;
[self setupSubviews];
//
if ([CLLocationManager locationServicesEnabled]) {
self.locationManager = [[CLLocationManager alloc] init];
_locationManager.delegate = self;
_locationManager.desiredAccuracy = kCLLocationAccuracyBest; //控制定位精度,越高耗电量越大。
_locationManager.distanceFilter = 100; //控制定位服务更新频率。单位是“米”
[_locationManager startUpdatingLocation];
//在ios 8.0下要授权
if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 8.0)
[_locationManager requestWhenInUseAuthorization]; //调用了这句,就会弹出允许框了.
}
CGRect rect = CGRectMake(0, 200, self.view.width, 30);
IBTUILabel *lbl = [[IBTUILabel alloc]initWithFrame:rect];
lbl.text = @"哎呦，功能还没实现呢，下次再来看看吧。";
lbl.textAlignment = NSTextAlignmentCenter;
lbl.font = [UIFont systemFontOfSize:15];
lbl.textColor = GXF_NAVIGAYION_COLOR;
[self.view addSubview:lbl];
// [self setupSubviews];
////
// if ([CLLocationManager locationServicesEnabled]) {
//
// self.locationManager = [[CLLocationManager alloc] init];
//
// _locationManager.delegate = self;
//
// _locationManager.desiredAccuracy = kCLLocationAccuracyBest; //控制定位精度,越高耗电量越大。
//
// _locationManager.distanceFilter = 100; //控制定位服务更新频率。单位是“米”
//
// [_locationManager startUpdatingLocation];
//
// //在ios 8.0下要授权
//
// if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 8.0)
//
// [_locationManager requestWhenInUseAuthorization]; //调用了这句,就会弹出允许框了.
//
// }
}
- (void)didReceiveMemoryWarning {
......@@ -88,7 +97,7 @@
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
[self fetchCurrentStore];
// [self fetchCurrentStore];
}
#pragma mark - Setter
......
XFFruit/ViewControllers/Sync/ICRSyncViewController.m
View file @ 7fcf730c
......@@ -40,11 +40,19 @@ UITableViewDelegate
- (void)viewDidLoad {
[super viewDidLoad];
[self setupSubviews];
[self initData];
[self getUnuploadData];
// [self setupSubviews];
// [self initData];
// [self getUnuploadData];
// Do any additional setup after loading the view.
CGRect rect = CGRectMake(0, 200, self.view.width, 30);
IBTUILabel *lbl = [[IBTUILabel alloc]initWithFrame:rect];
lbl.text = @"哎呦，功能还没实现呢，下次再来看看吧。";
lbl.textAlignment = NSTextAlignmentCenter;
lbl.font = [UIFont systemFontOfSize:15];
lbl.textColor = GXF_NAVIGAYION_COLOR;
[self.view addSubview:lbl];
}
- (void)didReceiveMemoryWarning {
......
XFFruit/ViewControllers/System/ICRSystemViewController.m
View file @ 7fcf730c
......@@ -117,19 +117,19 @@
[self.m_tableViewInfo addSection:secInfo];
#if DEBUG
// HTTP API
secInfo = [IBTTableViewSectionInfo sectionInfoHeader:@"Test"];
cellInfo =
[IBTTableViewCellInfo normalCellForSel:@selector(onShowHTTPTestView:) target:self
title:[IBTCommon localizableString:@"HTTP Restful API"]
rightValue:nil
accessoryType:UITableViewCellAccessoryDisclosureIndicator];
[cellInfo addUserInfoValue:titleColor forKey:CInfoTitleColorKey];
cellInfo.fCellHeight = fCellHeight;
[secInfo addCell:cellInfo];
[self.m_tableViewInfo addSection:secInfo];
#endif
//#if DEBUG
// // HTTP API
// secInfo = [IBTTableViewSectionInfo sectionInfoHeader:@"Test"];
// cellInfo =
// [IBTTableViewCellInfo normalCellForSel:@selector(onShowHTTPTestView:) target:self
// title:[IBTCommon localizableString:@"HTTP Restful API"]
// rightValue:nil
// accessoryType:UITableViewCellAccessoryDisclosureIndicator];
// [cellInfo addUserInfoValue:titleColor forKey:CInfoTitleColorKey];
// cellInfo.fCellHeight = fCellHeight;
// [secInfo addCell:cellInfo];
// [self.m_tableViewInfo addSection:secInfo];
//#endif
}
......
XFFruit/en.lproj/Localizable.strings
View file @ 7fcf730c
......@@ -53,8 +53,8 @@
"EditorShopDetail" ="编辑商品明细";
"AddShopDetail" ="添加商品明细";
// Store
"Store" = "门店";
// Report
"Report" = "报表";
"Navigate" = "导航";
"SignUp" = "进店签到";
"LeaveStore" = "离店登记";
......@@ -63,8 +63,8 @@
"Choose a Store" = "选择门店";
"Store Detail" = "门店详情";
// Sync
"Sync" = "同步";
// Message
"Message" = "企信";
"Task Progressing" = "任务处理";
"Patrol Result" = "巡店结果";
"SignIn Record" = "签到记录";
......@@ -72,8 +72,8 @@
"numbers" = "条";
"To Upload Data" = "待上传数据";
// System
"System" = "系统";
// Me
"Me" = "我的";
"Company" = "公司";
"User" = "用户";
"Code" = "代码";
......
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