Skip to content

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

no message

parent 84f7a8e1
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 38 deletions
ZhiJi/Assets.xcassets/Care/矢量智能对象(1).imageset/Contents.json
View file @ 14ba157f
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "矢量智能对象@2x(1).png",
"filename" : "icon-test@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "矢量智能对象@3x(1).png",
"filename" : "icon-test@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
ZhiJi/Assets.xcassets/Map/map_card_profile.imageset/Contents.json
View file @ 14ba157f
......@@ -5,18 +5,18 @@
"scale" : "1x"
},
{
"filename" : "icon-test@2x.png",
"idiom" : "universal",
"filename" : "map_card_profile@2x.png",
"scale" : "2x"
},
{
"filename" : "icon-test@3x.png",
"idiom" : "universal",
"filename" : "map_card_profile@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
\ No newline at end of file
}
ZhiJi/Assets.xcassets/xiaoXiTiShi/message_revice_btn.imageset/Contents.json
View file @ 14ba157f
......@@ -5,12 +5,11 @@
"scale" : "1x"
},
{
"filename" : "矩形 2@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "矩形 2@3x.png",
"filename" : "矩形 2@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
ZhiJi/Assets.xcassets/xiaoXiTiShi/message_revice_btn_zh.imageset/Contents.json
View file @ 14ba157f
......@@ -5,7 +5,6 @@
"scale" : "1x"
},
{
"filename" : "矩形 2@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
......
ZhiJi/Assets.xcassets/xiaoXiTiShi/组 2.imageset/Contents.json
View file @ 14ba157f
......@@ -5,7 +5,6 @@
"scale" : "1x"
},
{
"filename" : "组 2@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
......
ZhiJi/Classes/Care/View/ZJFriendSettingView.m
View file @ 14ba157f
......@@ -154,13 +154,13 @@
removeBtn = customViewArr[3];
removeBtn.frame = CGRectMake(0, 0, KScaleWidth(70), KScaleWidth(35));
[removeBtn setTitle:kLocalizedString(@"alert_unfriend") forState:0];
[removeBtn setTitleColor:[UIColor colorWithHex:0x528BFF] forState:0];
[removeBtn setTitleColor:kMassColor forState:0];
[removeBtn.titleLabel setFont:[UIFont systemFontOfSize:KFont(14)]];
[removeBtn setBackgroundColor:[UIColor colorWithHex:0xffffff]];
removeBtn.layer.cornerRadius = removeBtn.frame.size.height/2;
removeBtn.layer.masksToBounds = YES;
removeBtn.layer.borderWidth = 1;
removeBtn.layer.borderColor = [UIColor colorWithHex:0x528BFF].CGColor;
removeBtn.layer.borderColor = kMassColor.CGColor;
[removeBtn addTarget:self action:@selector(removeBtnClick) forControlEvents:UIControlEventTouchUpInside];
[removeBtn mas_updateConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(KScaleWidth(70));
......
ZhiJi/Classes/Care/View/ZJSheZhiView.m
View file @ 14ba157f
......@@ -201,7 +201,7 @@
//guanXiButton
_guanXiButton = [UIButton buttonWithType:UIButtonTypeCustom];
[_guanXiButton setTitle:kLocalizedString(@"alert_unfriend") forState:0];
[_guanXiButton setTitleColor:[UIColor colorWithHex:0x528BFF] forState:0];
[_guanXiButton setTitleColor:kMassColor forState:0];
[_guanXiButton.titleLabel setFont:[UIFont systemFontOfSize:KFont(14)]];
[_guanXiButton setBackgroundColor:[UIColor colorWithHex:0xffffff]];
[_beiJingView addSubview:_guanXiButton];
......@@ -213,7 +213,7 @@
_guanXiButton.layer.cornerRadius = KScaleWidth(17);
_guanXiButton.layer.masksToBounds = YES;
_guanXiButton.layer.borderWidth = 0.5;
_guanXiButton.layer.borderColor = [UIColor colorWithHex:0x528BFF].CGColor;
_guanXiButton.layer.borderColor = kMassColor.CGColor;
[_guanXiButton addTarget:self action:@selector(guanXiButtonClick) forControlEvents:UIControlEventTouchUpInside];
......@@ -234,7 +234,7 @@
[_queRenButton setTitle:kLocalizedString(@"alert_confirm") forState:0];
[_queRenButton setTitleColor:[UIColor colorWithHex:0xFFFFFF] forState:0];
[_queRenButton.titleLabel setFont:[UIFont systemFontOfSize:KFont(14)]];
[_queRenButton setBackgroundColor:[UIColor colorWithHex:0x528BFF]];
[_queRenButton setBackgroundColor:kMassColor];
[_beiJingView addSubview:_queRenButton];
[_queRenButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.equalTo(_beiJingView).mas_offset(0);
......
ZhiJi/Classes/Care/View/ZJXiaoXiTableViewCell.m
View file @ 14ba157f
......@@ -104,7 +104,7 @@
//tongYiButton
self.tongYiButton = [UIButton buttonWithType:UIButtonTypeCustom];
[self.tongYiButton setTitle:kLocalizedString(@"message_confirm") forState:0];
[self.tongYiButton setTitleColor:[UIColor colorWithHex:0x528BFF] forState:0];
[self.tongYiButton setTitleColor:kMassColor forState:0];
[self.tongYiButton.titleLabel setFont:[UIFont systemFontOfSize:KFont(14)]];
[self.tongYiButton setBackgroundColor:[UIColor colorWithHex:0xffffff]];
[self.contentView addSubview:self.tongYiButton];
......@@ -116,7 +116,7 @@
self.tongYiButton.layer.cornerRadius = KScaleWidth(13.5);
self.tongYiButton.layer.masksToBounds = YES;
self.tongYiButton.layer.borderWidth = 0.5;
self.tongYiButton.layer.borderColor = [UIColor colorWithHex:0x528BFF].CGColor;
self.tongYiButton.layer.borderColor = kMassColor.CGColor;
[self.tongYiButton addTarget:self action:@selector(tongYiButtonClick) forControlEvents:UIControlEventTouchUpInside];
}
......@@ -150,9 +150,9 @@
break;
case 3:
[self.tongYiButton setTitle:kLocalizedString(@"message_confirm") forState:0];
[self.tongYiButton setTitleColor:[UIColor colorWithHex:0x528BFF] forState:0];
[self.tongYiButton setTitleColor:kMassColor forState:0];
self.tongYiButton.enabled = YES;
self.tongYiButton.layer.borderColor = [UIColor colorWithHex:0x528BFF].CGColor;
self.tongYiButton.layer.borderColor = kMassColor.CGColor;
break;
default:
break;
......
ZhiJi/Classes/Care/View/ZJXiaoxiView.m
View file @ 14ba157f
......@@ -114,7 +114,7 @@
_juJueButton= [[UIButton alloc] init];
[_beiJingView addSubview:_juJueButton];
[_juJueButton setTitle:kLocalizedString(@"alert_decline") forState:UIControlStateNormal];
[_juJueButton setTitleColor:[UIColor colorWithHex:0x528BFF] forState:UIControlStateNormal];
[_juJueButton setTitleColor:kMassColor forState:UIControlStateNormal];
[_juJueButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(_jieSouButton.mas_bottom).mas_offset(KScaleWidth(17));
make.centerX.equalTo(_beiJingView);
......
ZhiJi/Classes/LocationAttention/ZJLocationRemindSelectController.m
View file @ 14ba157f
......@@ -112,9 +112,9 @@
slider.round = true;
slider.trackImageView.backgroundColor = [UIColor colorWithHex:0xEEEEEE];
slider.traceImageView.backgroundColor = [UIColor colorWithHex:0x528BFF];
slider.traceImageView.backgroundColor = kMassColor;
slider.thumbImageView.image = [UIImage imageNamed:@"location_find_seleted_icon"];
slider.thumbImageView.backgroundColor = [UIColor colorWithHex:0x528BFF];
slider.thumbImageView.backgroundColor = kMassColor;
slider.thumbImageView.layer.cornerRadius = 10;
slider;
});
......
ZhiJi/Classes/Login/Controller/ZJPhoneLoginViewController.m
View file @ 14ba157f
......@@ -140,7 +140,7 @@
sendBtn = [[UIButton alloc] init];
[sendBtn setTitle:kLocalizedString(@"login_send_code") forState:UIControlStateNormal];
[sendBtn setTitleColor:kColorWithRGB(85, 142, 252) forState:UIControlStateNormal];
[sendBtn setTitleColor:kMassColor forState:UIControlStateNormal];
sendBtn.titleLabel.font = [UIFont systemFontOfSize:KFont(18)];
[sendBtn addTarget:self action:@selector(sendSmsCode:) forControlEvents:(UIControlEventTouchUpInside)];
[self.view addSubview:sendBtn];
......@@ -184,7 +184,7 @@
lab.font = [UIFont systemFontOfSize:KFont(28)];
lab.textAlignment = NSTextAlignmentCenter;
lab.tag = 0x64+x;
lab.backgroundColor = kColorWithRGBA(86, 152, 252, .2f);
lab.backgroundColor = kMassColorAlpha(.2f);
lab.layer.cornerRadius = KScaleWidth(8);
lab.layer.masksToBounds = YES;
[codeView addSubview:lab];
......@@ -214,7 +214,7 @@
[loginBtn setTitle:kLocalizedString(@"login") forState:UIControlStateSelected];
// loginBtn.backgroundColor = kMassColor;
loginBtn.userInteractionEnabled = NO;
loginBtn.backgroundColor = kColorWithRGBA(86, 142, 252, 0.5f);
loginBtn.backgroundColor = kMassColorAlpha(.5f);
loginBtn.titleLabel.font = [UIFont systemFontOfSize:KFont(18)];
loginBtn.layer.cornerRadius = KScaleWidth(50)/2;
[loginBtn addTarget:self action:@selector(login) forControlEvents:(UIControlEventTouchUpInside)];
......@@ -381,8 +381,8 @@
}else{
dispatch_async(dispatch_get_main_queue(), ^{
[sender setTitle:kLocalizedString(@"login_send_code_again") forState:UIControlStateNormal];
[sender setTitleColor:kColorWithRGB(85, 142, 252) forState:UIControlStateNormal];
sender.titleLabel.textColor = kColorWithRGB(85, 142, 252);
[sender setTitleColor:kMassColor forState:UIControlStateNormal];
sender.titleLabel.textColor = kMassColor;
sender.layer.borderColor = sender.titleLabel.textColor.CGColor;
sender.enabled = YES;
});
......
ZhiJi/Classes/Mine/Controller/ZJEmergencyContactViewController.m
View file @ 14ba157f
......@@ -136,10 +136,10 @@
UIButton * addBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, KScaleWidth(125), KScaleWidth(42))];
[addBtn setTitle:kLocalizedString(@"emergency_add") forState:UIControlStateNormal];
[addBtn setTitleColor:kColorWithRGB(85, 142, 252) forState:UIControlStateNormal];
[addBtn setTitleColor:kMassColor forState:UIControlStateNormal];
addBtn.layer.cornerRadius = addBtn.frame.size.height/2;
addBtn.layer.borderWidth = 1.f;
addBtn.layer.borderColor = kColorWithRGB(85, 142, 252).CGColor;
addBtn.layer.borderColor = kMassColor.CGColor;
addBtn.titleLabel.font = [UIFont systemFontOfSize:KFont(17)];
[addBtn addTarget:self action:@selector(addBtnClick:) forControlEvents:UIControlEventTouchUpInside];
[_emptyHintView addSubview:addBtn];
......
ZhiJi/Classes/Mine/Controller/ZJSelectEmergencyPersonVC.m
View file @ 14ba157f
......@@ -129,10 +129,10 @@
UIButton * addBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, KScaleWidth(125), KScaleWidth(42))];
[addBtn setTitle:kLocalizedString(@"alert_back") forState:UIControlStateNormal];
[addBtn setTitleColor:kColorWithRGB(85, 142, 252) forState:UIControlStateNormal];
[addBtn setTitleColor:kMassColor forState:UIControlStateNormal];
addBtn.layer.cornerRadius = addBtn.frame.size.height/2;
addBtn.layer.borderWidth = 1.f;
addBtn.layer.borderColor = kColorWithRGB(85, 142, 252).CGColor;
addBtn.layer.borderColor = kMassColor.CGColor;
addBtn.titleLabel.font = [UIFont systemFontOfSize:KFont(17)];
[addBtn addTarget:self action:@selector(pop) forControlEvents:UIControlEventTouchUpInside];
[_emptyHintView addSubview:addBtn];
......
ZhiJi/Classes/Tools/PCH/PrefixHeader.pch
View file @ 14ba157f
......@@ -78,7 +78,9 @@ isPhoneX = [[UIApplication sharedApplication] delegate].window.safeAreaInsets.bo
#define kColorFromRGB(rgbValue) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 green:((float)((rgbValue & 0xFF00) >> 8))/255.0 blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
#define kColorWithRGBA(r, g, b, a) [UIColor colorWithRed:(r) / 255.f green:(g) / 255.f blue:(b) / 255.f alpha:(a)]
#define kColorWithRGB(r, g, b) kColorWithRGBA(r, g, b, 1.f)
#define kMassColor kColorFromRGB(0x05aa60)
#define kMassColorAlpha(a) [UIColor colorWithRed:5 / 255.f green:170 / 255.f blue:96 / 255.f alpha:(a)]
#define kLocalizedString(key) NSLocalizedString(key, @"")
......
ZhiJi/Classes/Tools/PCH/ResourceHeader.pch
View file @ 14ba157f
......@@ -22,14 +22,14 @@
//#if DEBUG
//
//#define ServerReport @"http://report.linking100.com"
//#define ServerHost @"https://feedapitest.zhangxinhulian.com"
//#define ServerHostFeed @"https://feedapitest.zhangxinhulian.com"
#define ServerReport @"http://report.linking100.com"
#define ServerHost @"https://feedapitest.zhangxinhulian.com"
#define ServerHostFeed @"https://feedapitest.zhangxinhulian.com"
//
//#else
#define ServerReport @"http://report.linking100.com"
#define ServerHost @"https://feedapi.linking100.com"
#define ServerHostFeed @"https://feedapi.linking100.com"
//#define ServerReport @"http://report.linking100.com"
//#define ServerHost @"https://feedapi.linking100.com"
//#define ServerHostFeed @"https://feedapi.linking100.com"
//#endif
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