Skip to content

Z
ZhiJi-Overseas
Commit 36c25281 authored by lmj_521aiau@163.com's avatar lmj_521aiau@163.com
Browse files
Options

guide

parent 3b503cf3
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 80 deletions
.DS_Store
View file @ 36c25281
No preview for this file type
ZhiJi/Assets.xcassets/Goods/pay_icon_0.imageset/Contents.json deleted 100644 → 0
View file @ 3b503cf3
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "iPhone 8备份@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "iPhone 8备份@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
ZhiJi/Assets.xcassets/Goods/pay_icon_1.imageset/Contents.json deleted 100644 → 0
View file @ 3b503cf3
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : " @2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : " @3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
ZhiJi/Assets.xcassets/Goods/pay_icon_2.imageset/Contents.json deleted 100644 → 0
View file @ 3b503cf3
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "支付页面。@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "支付页面。@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
ZhiJi/Classes/Care/View/ZJFriendSettingView.m
View file @ 36c25281
......@@ -172,7 +172,7 @@
UIButton * confirmBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, KScaleWidth(175), KScaleWidth(58))];
[confirmBtn setTitle:kLocalizedString(@"alert_confirm") forState:UIControlStateNormal];
[confirmBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
confirmBtn.backgroundColor = kColorWithRGB(81, 139, 255);
confirmBtn.backgroundColor = kMassColor;
confirmBtn.titleLabel.font = [UIFont systemFontOfSize:KFont(17)];
[confirmBtn addTarget:self action:@selector(confirmBtnClick) forControlEvents:UIControlEventTouchUpInside];
[bgview addSubview:confirmBtn];
......
ZhiJi/Classes/Care/View/ZJUpgradeAlertView.m
View file @ 36c25281
......@@ -65,7 +65,7 @@
[cancelBtn setTitle:kLocalizedString(@"alert_cancel") forState:UIControlStateNormal];
[cancelBtn setTitle:kLocalizedString(@"alert_cancel") forState:UIControlStateSelected];
[cancelBtn setTitleColor:kColorWithRGB(99, 99, 99) forState:UIControlStateNormal];
[cancelBtn setTitleColor:kColorWithRGB(81, 139, 255) forState:UIControlStateSelected];
[cancelBtn setTitleColor:kMassColor forState:UIControlStateSelected];
cancelBtn.titleLabel.font = [UIFont systemFontOfSize:KFont(14)];
[cancelBtn addTarget:self action:@selector(cancelBtnClick) forControlEvents:UIControlEventTouchUpInside];
[bgview addSubview:cancelBtn];
......@@ -79,8 +79,8 @@
UIButton * confirmBtn = [[UIButton alloc] init];
[confirmBtn setTitle:kLocalizedString(@"alert_confirm") forState:UIControlStateNormal];
[confirmBtn setTitle:kLocalizedString(@"alert_confirm") forState:UIControlStateSelected];
[confirmBtn setTitleColor:kColorWithRGB(81, 139, 255) forState:UIControlStateNormal];
[confirmBtn setTitleColor:kColorWithRGB(81, 139, 255) forState:UIControlStateSelected];
[confirmBtn setTitleColor:kMassColor forState:UIControlStateNormal];
[confirmBtn setTitleColor:kMassColor forState:UIControlStateSelected];
confirmBtn.titleLabel.font = [UIFont systemFontOfSize:KFont(14)];
[confirmBtn addTarget:self action:@selector(confirmBtnClick) forControlEvents:UIControlEventTouchUpInside];
[bgview addSubview:confirmBtn];
......
ZhiJi/Classes/Goods/Controller/ZJMemberPayViewController.m
View file @ 36c25281
......@@ -120,19 +120,19 @@
self.automaticallyAdjustsScrollViewInsets = NO;
}
UIView * bgView = [[UIView alloc] initWithFrame:CGRectMake(0, CGRectGetMaxY(banner.frame), KScreenWidth, KScaleWidth(90))];
UIView * bgView = [[UIView alloc] initWithFrame:CGRectMake(0, CGRectGetMaxY(banner.frame), KScreenWidth, KScaleWidth(93))];
bgView.backgroundColor = self.view.backgroundColor;
[self.mainScrollView addSubview:bgView];
[self.mainScrollView sendSubviewToBack:bgView];
UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
btn.frame = CGRectMake((KScreenWidth-KScaleWidth(327))/2, bgView.frame.size.height-KScaleWidth(70), KScaleWidth(327), KScaleWidth(60));
btn.frame = CGRectMake((KScreenWidth-KScaleWidth(327))/2, bgView.frame.size.height-KScaleWidth(65), KScaleWidth(327), KScaleWidth(55));
[btn setBackgroundImage:[UIImage imageNamed:@"goods_guide_confirm"] forState:UIControlStateNormal];
[btn setBackgroundImage:[UIImage imageNamed:@"goods_guide_confirm"] forState:UIControlStateHighlighted];
[btn addTarget:self action:@selector(confirmBtnClick:) forControlEvents:(UIControlEventTouchUpInside)];
[bgView addSubview:btn];
UILabel * priceLab = [[UILabel alloc] initWithFrame:CGRectMake(0, KScaleWidth(37), btn.frame.size.width, KScaleWidth(14))];
UILabel * priceLab = [[UILabel alloc] initWithFrame:CGRectMake(0, KScaleWidth(33), btn.frame.size.width, KScaleWidth(14))];
priceLab.textColor = [UIColor whiteColor];
priceLab.font = [UIFont systemFontOfSize:KFont(12)];
priceLab.textAlignment = NSTextAlignmentCenter;
......@@ -260,7 +260,7 @@
}
if (des) {
CGRect rect = [des boundingRectWithSize:CGSizeMake(KScreenWidth-KScaleWidth(20), MAXFLOAT) options:(NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading) attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:KFont(12)]} context:nil];
CGRect rect = [des boundingRectWithSize:CGSizeMake(KScreenWidth-KScaleWidth(20), MAXFLOAT) options:(NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading) attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:KFont(14)]} context:nil];
// UILabel * desLab = [[UILabel alloc] initWithFrame:CGRectMake(KScaleWidth(10), self.mainScrollView.contentSize.height, KScreenWidth-KScaleWidth(20), rect.size.height)];
// desLab.textColor = [UIColor whiteColor];
......@@ -272,7 +272,7 @@
NSMutableAttributedString * attributeStr = [[NSMutableAttributedString alloc] initWithString:des];
[attributeStr addAttribute:NSLinkAttributeName value:@"user://" range:[des rangeOfString:kLocalizedString(@"setting_service")]];
[attributeStr addAttribute:NSLinkAttributeName value:@"privacy://" range:[des rangeOfString:kLocalizedString(@"setting_privacy")]];
[attributeStr addAttributes:@{NSFontAttributeName:[UIFont systemFontOfSize:KFont(12)]} range:NSMakeRange(0, attributeStr.length)];
[attributeStr addAttributes:@{NSFontAttributeName:[UIFont systemFontOfSize:KFont(14)]} range:NSMakeRange(0, attributeStr.length)];
UITextView * textView = [[UITextView alloc] init];
textView.frame = CGRectMake(KScaleWidth(10), self.mainScrollView.contentSize.height, KScreenWidth-KScaleWidth(20), rect.size.height+KScaleWidth(32));
......@@ -282,7 +282,7 @@
textView.delegate = self;
textView.font = [UIFont systemFontOfSize:KFont(12)];
textView.textColor = kColorWithRGB(153, 153, 153);
textView.textAlignment = NSTextAlignmentLeft;
textView.textAlignment = NSTextAlignmentCenter;
textView.showsHorizontalScrollIndicator = NO;
textView.showsVerticalScrollIndicator = NO;
textView.editable = NO; //必须禁止输入，否则点击将弹出输入键盘
......
ZhiJi/Classes/Mine/Controller/ZJSettingViewController.m
View file @ 36c25281
......@@ -205,6 +205,7 @@
}
BaseWebViewController * web = [[BaseWebViewController alloc] init];
web.url = path;
web.neverRefreshTitle = NO;
[self.navigationController pushViewController:web animated:YES];
}
......
ZhiJi/Classes/Mine/View/ZJAddEmergencyContactView.m
View file @ 36c25281
......@@ -117,8 +117,8 @@
UIView * phoneTFRightBgView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KScaleWidth(85), KScaleWidth(35))];
UIButton * phoneTFRightBtn = [[UIButton alloc] initWithFrame:phoneTFRightBgView.frame];
[phoneTFRightBtn setTitle:kLocalizedString(@"emergency_contact") forState:(UIControlStateNormal)];
[phoneTFRightBtn setTitleColor:kColorWithRGB(82, 139, 252) forState:(UIControlStateNormal)];
phoneTFRightBtn.titleLabel.textColor = kColorWithRGB(82, 139, 252);
[phoneTFRightBtn setTitleColor:kMassColor forState:(UIControlStateNormal)];
phoneTFRightBtn.titleLabel.textColor = kMassColor;
phoneTFRightBtn.titleLabel.font = [UIFont systemFontOfSize:KFont(15)];
phoneTFRightBtn.layer.cornerRadius = phoneTFRightBtn.frame.size.height/2;
phoneTFRightBtn.layer.borderWidth = 1;
......@@ -195,7 +195,7 @@
UIButton * confirmBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, KScaleWidth(175), KScaleWidth(58))];
[confirmBtn setTitle:kLocalizedString(@"alert_confirm") forState:UIControlStateNormal];
[confirmBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
confirmBtn.backgroundColor = kColorWithRGB(81, 139, 255);
confirmBtn.backgroundColor = kMassColor;
confirmBtn.titleLabel.font = [UIFont systemFontOfSize:KFont(17)];
[confirmBtn addTarget:self action:@selector(confirmBtnClick) forControlEvents:UIControlEventTouchUpInside];
[bgview addSubview:confirmBtn];
......
ZhiJi/Classes/Mine/View/ZJUpdateNickNameView.m
View file @ 36c25281
......@@ -103,7 +103,7 @@
UIButton * confirmBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, KScaleWidth(175), KScaleWidth(58))];
[confirmBtn setTitle:kLocalizedString(@"alert_confirm") forState:UIControlStateNormal];
[confirmBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
confirmBtn.backgroundColor = kColorWithRGB(81, 139, 255);
confirmBtn.backgroundColor = kMassColor;
confirmBtn.titleLabel.font = [UIFont systemFontOfSize:KFont(17)];
[confirmBtn addTarget:self action:@selector(confirmBtnClick) forControlEvents:UIControlEventTouchUpInside];
[bgview addSubview:confirmBtn];
......
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