Commit fad64efc authored by lmj_521aiau@163.com's avatar lmj_521aiau@163.com

no message

parent 3802d2db
No preview for this file type
......@@ -5,12 +5,11 @@
"scale" : "1x"
},
{
"filename" : "紧急警报@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "紧急警报@3x.png",
"filename" : "jingjiebufang.png",
"idiom" : "universal",
"scale" : "3x"
}
......
......@@ -5,12 +5,11 @@
"scale" : "1x"
},
{
"filename" : "底框@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "底框@3x.png",
"filename" : "daiheyibiaoqianbeijing-2.png",
"idiom" : "universal",
"scale" : "3x"
}
......
......@@ -5,12 +5,11 @@
"scale" : "1x"
},
{
"filename" : "mine_setting_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "mine_setting_icon@3x.png",
"filename" : "shezhi.png",
"idiom" : "universal",
"scale" : "3x"
}
......
......@@ -5,12 +5,11 @@
"scale" : "1x"
},
{
"filename" : "头像@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "头像@3x.png",
"filename" : "touxiang.png",
"idiom" : "universal",
"scale" : "3x"
}
......
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "xuFei_Btn@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "xuFei_Btn@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "我的@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "我的@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
......@@ -5,12 +5,11 @@
"scale" : "1x"
},
{
"filename" : "icon@2x.png",
"filename" : "5-aixin.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
......@@ -5,12 +5,11 @@
"scale" : "1x"
},
{
"filename" : "我的@2x.png",
"filename" : "5-aixin-2.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "我的@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
......@@ -5,12 +5,11 @@
"scale" : "1x"
},
{
"filename" : "关心@2x.png",
"filename" : "4-didian.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "关心@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
......@@ -5,12 +5,11 @@
"scale" : "1x"
},
{
"filename" : "关心@2x.png",
"filename" : "4-didian-2.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "关心@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "18-yinzhang.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "18-yinzhang-3.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
......@@ -30,7 +30,7 @@
- (void)viewDidLoad {
[super viewDidLoad];
[self setTab];
// [self setTab];
[self initUI];
}
......@@ -57,20 +57,20 @@
NSDictionary * switchDic = [[data Read] objectForKey:@"switch"];
BaseNavigationViewController *homeNav = [self baseNavigationWithTtitle:kLocalizedString(@"tabbar_care")
image:[UIImage imageNamed:@"关心"]
selectedImage:[UIImage imageNamed:@"关心_selected"]
image:[UIImage imageNamed:@"tabbar_0"]
selectedImage:[UIImage imageNamed:@"tabbar_0_selected"]
index:DYTTabBarIndexHome
viewController:[[ZJCareStyle2ViewController alloc] init]];
BaseNavigationViewController *iHospNav = [self baseNavigationWithTtitle:@""
image:nil
selectedImage:nil
BaseNavigationViewController *iHospNav = [self baseNavigationWithTtitle:kLocalizedString(@"tabbar_mine")
image:[UIImage imageNamed:@"tabbar_1"]
selectedImage:[UIImage imageNamed:@"tabbar_1_selected"]
index:DYTTabBarIndexIHOSP
viewController:[[ZJMapStyle2ViewController alloc] init]];
BaseNavigationViewController *mineNav = [self baseNavigationWithTtitle:kLocalizedString(@"tabbar_mine")
image:[UIImage imageNamed:@"我的"]
selectedImage:[UIImage imageNamed:@"我的_selected"]
image:[UIImage imageNamed:@"tabbar_2"]
selectedImage:[UIImage imageNamed:@"tabbar_2_selected"]
index:DYTTabBarIndexMine
viewController:[[ZJMineViewController alloc] init]];
......@@ -131,6 +131,4 @@
self.selectedIndex = DYTSelectIndex;
}
@end
......@@ -106,7 +106,7 @@
//functionImageView
UIImageView *functionImageView = [[UIImageView alloc] init];
functionImageView.image = [UIImage imageNamed:@"mine_headerView_function_bg"];
functionImageView.contentMode = UIViewContentModeScaleAspectFit;
functionImageView.contentMode = UIViewContentModeScaleToFill;
functionImageView.userInteractionEnabled = YES;
[self addSubview:functionImageView];
[functionImageView mas_makeConstraints:^(MASConstraintMaker *make) {
......@@ -118,7 +118,7 @@
//xufeiButton
self.xuFeiButton = [UIButton buttonWithType:UIButtonTypeCustom];
[self.xuFeiButton setBackgroundImage:[UIImage imageNamed:@"xuFei_Btn"] forState:UIControlStateNormal];
[self.xuFeiButton setTitle:kLocalizedString(@"mine_unlock") forState:0];
// [self.xuFeiButton setTitle:kLocalizedString(@"mine_unlock") forState:0];
[self.xuFeiButton setTitleColor:[UIColor colorWithHex:0x38180D] forState:0];
[self.xuFeiButton.titleLabel setFont:[UIFont systemFontOfSize:KFont(14)]];
[self.xuFeiButton setBackgroundColor:[UIColor colorWithHex:0xEBC6B4]];
......
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