Skip to content

G
galaxy-iOS
Commit 70882d5d authored by pete谢兆麟's avatar pete谢兆麟
Browse files
Options

Merge branch '630-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into 630-dev

parents db2f3a41 6d3dc5f5
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 26 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 70882d5d
......@@ -3740,7 +3740,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7;
CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -3944,7 +3944,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7;
CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -3990,7 +3990,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7;
CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/V/YHActivityTravelCell.swift
View file @ 70882d5d
......@@ -95,7 +95,7 @@ extension YHActivityTravelCell {
cancelButton.setTitleColor(UIColor.mainTextColor, for: .highlighted)
cancelButton.backgroundColor = .white
cancelButton.backgroundColor = .clear
cancelButton.layer.borderWidth = 1
cancelButton.layer.borderColor = UIColor.mainTextColor50.cgColor
......
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/V/YHActivityTravelitemView.swift
View file @ 70882d5d
......@@ -114,6 +114,59 @@ extension YHActivityTravelitemView {
timeLable.text = model.getDateString(format: "yyyy-MM-dd")
addressLable.text = model.place
navAddressLable.text = model.guidance
let hhhh = nameLabel.requiredHeight
timeStaticLable.snp.removeConstraints()
if hhhh > 72 {
timeStaticLable.snp.remakeConstraints { make in
make.left.equalTo(nameLabel.snp.left)
make.top.equalTo(nameLabel.snp.bottom).offset(24)
make.height.equalTo(20)
make.width.equalTo(28)
}
} else {
timeStaticLable.snp.remakeConstraints { make in
make.left.equalTo(nameLabel.snp.left)
make.top.equalTo(activityImgV.snp.bottom).offset(24)
make.height.equalTo(20)
make.width.equalTo(28)
}
}
timeLable.snp.remakeConstraints { make in
make.left.equalTo(timeStaticLable.snp.right).offset(16)
make.top.equalTo(timeStaticLable.snp.top)
make.right.equalToSuperview().offset(-20)
}
addressStaticLable.snp.remakeConstraints { make in
make.left.equalTo(timeStaticLable.snp.left)
make.top.equalTo(timeLable.snp.bottom).offset(13)
make.height.equalTo(timeStaticLable.snp.height)
make.width.equalTo(timeStaticLable.snp.width)
}
addressLable.snp.remakeConstraints { make in
make.left.equalTo(timeLable.snp.left)
make.top.equalTo(addressStaticLable.snp.top)
make.right.equalToSuperview().offset(-20)
}
navAddressLable.snp.remakeConstraints { make in
make.left.equalTo(addressLable.snp.left)
make.top.equalTo(addressLable.snp.bottom).offset(8)
make.right.equalToSuperview().offset(-20)
make.bottom.equalToSuperview().offset(-20)
}
}
func setupUI() {
......
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/V/YHActivityTwoItemView.swift
View file @ 70882d5d
......@@ -25,7 +25,7 @@ class YHActivityTwoItemView: UIView {
label.textColor = UIColor.mainTextColor50
label.textAlignment = .left
label.font = UIFont.PFSC_R(ofSize:14)
label.text = "您的姓名"
label.text = ""
// label.numberOfLines = 0
return label
}()
......@@ -36,7 +36,7 @@ class YHActivityTwoItemView: UIView {
label.textColor = UIColor.mainTextColor
label.textAlignment = .right
label.font = UIFont.PFSC_R(ofSize:14)
label.text = "侯林俊侯林俊侯林俊侯林俊侯林俊侯林俊侯林俊侯林俊侯林俊侯林俊侯林俊侯林俊侯林俊侯林俊侯林俊侯林俊侯林俊"
label.text = ""
label.numberOfLines = 0
return label
}()
......@@ -65,7 +65,6 @@ extension YHActivityTwoItemView {
make.left.equalTo(titleLable.snp.right).offset(20)
make.right.equalToSuperview()
make.bottom.equalToSuperview()
}
}
......
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/V/YHApplyActivityAlert.swift
View file @ 70882d5d
......@@ -31,8 +31,8 @@ class YHApplyActivityAlert: UIView {
lazy var nameTextField:UITextField = {
let textField = UITextField()
textField.backgroundColor = .clear
textField.attributedPlaceholder = NSAttributedString(string: "请输入您的姓名".local, attributes: [NSAttributedString.Key.foregroundColor : UIColor.yhGreyColor])
textField.font = UIFont.PFSC_M(ofSize: 14)
textField.attributedPlaceholder = NSAttributedString(string: "请输入您的姓名".local, attributes: [NSAttributedString.Key.foregroundColor : UIColor.mainTextColor30])
textField.font = UIFont.PFSC_R(ofSize: 14)
textField.tintColor = UIColor.brandMainColor
textField.textColor = UIColor.mainTextColor
textField.clearButtonMode = .whileEditing
......@@ -93,8 +93,8 @@ class YHApplyActivityAlert: UIView {
lazy var phoneTextField:UITextField = {
let textField = UITextField()
textField.backgroundColor = .clear
textField.attributedPlaceholder = NSAttributedString(string: "请输入".local, attributes: [NSAttributedString.Key.foregroundColor : UIColor.yhGreyColor])
textField.font = UIFont.PFSC_M(ofSize: 14)
textField.attributedPlaceholder = NSAttributedString(string: "请输入".local, attributes: [NSAttributedString.Key.foregroundColor : UIColor.mainTextColor30])
textField.font = UIFont.PFSC_R(ofSize: 14)
textField.tintColor = UIColor.brandMainColor
textField.textColor = UIColor.mainTextColor
textField.clearButtonMode = .whileEditing
......
galaxy/galaxy/Classes/Modules/Community(社区)/C/YHCommunityViewController.swift
View file @ 70882d5d
......@@ -28,7 +28,7 @@ class YHCommunityViewController: YHBaseViewController {
dataSource.titles = arrItemTitles
dataSource.titleNormalFont = UIFont.PFSC_M(ofSize: 15)
dataSource.titleNormalColor = UIColor(hex: 0xFFFFFF, alpha: 0.6)
dataSource.titleNormalColor = UIColor.yhGreyColor
dataSource.titleSelectedFont = UIFont.PFSC_M(ofSize: 21)
dataSource.titleSelectedColor = .white
......@@ -240,7 +240,7 @@ extension YHCommunityViewController: JXSegmentedViewDelegate {
} else {
bgImgV.isHidden = true
friendsBtn.isHidden = true
segmentedDataSource.titleNormalColor = UIColor(hex: 0x94a3b8)
segmentedDataSource.titleNormalColor = UIColor.yhGreyColor
segmentedDataSource.titleSelectedColor = UIColor.mainTextColor
let indicator = JXSegmentedIndicatorLineView()
indicator.indicatorWidth = 16
......
galaxy/galaxy/Classes/Modules/Community(社区)/C/YHMatchResultListViewController.swift
View file @ 70882d5d
......@@ -405,7 +405,7 @@ extension YHMatchResultListViewController: DragCardDataSource {
if success {
YHHUD.flash(message: "已发送申请，继续查看更多人脉吧~")
cardView.bottomBtn.setTitle("已发送好友申请", for: .normal)
cardView.bottomBtn.backgroundColor = .brandMainColor30
cardView.bottomBtn.alpha = 0.3
cardView.bottomBtn.isUserInteractionEnabled = false
userModel.isSendRequest = true
......
galaxy/galaxy/Classes/Modules/Community(社区)/V/YHNameCardInfoView.swift
View file @ 70882d5d
......@@ -62,11 +62,11 @@ class YHNameCardInfoView: DragCardView {
if self.userModel.isSendRequest {
self.bottomBtn.setTitle("已发送好友申请", for: .normal)
self.bottomBtn.backgroundColor = .brandMainColor30
self.bottomBtn.alpha = 0.3
self.bottomBtn.isUserInteractionEnabled = false
} else {
self.bottomBtn.setTitle("交换名片", for: .normal)
self.bottomBtn.backgroundColor = .brandMainColor
self.bottomBtn.alpha = 1.0
self.bottomBtn.isUserInteractionEnabled = true
}
self.setNeedsLayout()
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHAiRadarAreaView.swift
View file @ 70882d5d
......@@ -29,6 +29,7 @@ class YHAiRadarAreaView: UIView {
let imgV : UIImageView = UIImageView()
imgV.contentMode = .scaleAspectFill
imgV.image = UIImage(named: "home_radar_bkg")
imgV.clipsToBounds = true
return imgV
}()
......@@ -36,8 +37,8 @@ class YHAiRadarAreaView: UIView {
lazy var lable1: UILabel = {
let lable : UILabel = UILabel()
lable.text = "AI人脉雷达"
lable.font = UIFont.PFSC_B(ofSize: 16)
lable.textColor = UIColor.brandMainColor
lable.font = UIFont.PFSC_B(ofSize: 17)
lable.textColor = UIColor.mainTextColor
return lable
}()
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeSalonAreaView.swift
View file @ 70882d5d
......@@ -57,7 +57,7 @@ class YHHomeSalonAreaView: UIView {
lable.font = UIFont.PFSC_R(ofSize: 13)
lable.textColor = UIColor.mainTextColor
lable.textAlignment = .center
lable.layer.borderColor = UIColor.mainTextColor30.cgColor
lable.layer.borderColor = UIColor.mainTextColor18.cgColor
lable.layer.borderWidth = 1
return lable
}()
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHOrderTipsItemView.swift
View file @ 70882d5d
......@@ -165,7 +165,11 @@ extension YHOrderTipsItemView {
let tap = UITapGestureRecognizer(target: self, action: #selector(tapButton(gestureRecognizer:)))
self.addGestureRecognizer(tap)
backgroundColor = UIColor.white
backgroundColor = UIColor(hex: 0xffffff, alpha: 0.65)
layer.borderWidth = 0.5
layer.borderColor = UIColor.white.cgColor
addSubview(lableMyOrder)
lableMyOrder.snp.makeConstraints { make in
make.centerY.equalToSuperview()
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHOrderTipsView.swift
View file @ 70882d5d
......@@ -92,13 +92,13 @@ class YHOrderTipsView: UIView {
firstItem.snp.makeConstraints { make in
make.top.equalTo(lableName.snp.bottom).offset(20)
make.left.equalTo(kMargin)
make.right.equalTo(-kMargin)
make.right.equalTo(-20)
make.height.equalTo(YHOrderTipsItemView.viewH)
}
secondItem.snp.makeConstraints { make in
make.top.equalTo(firstItem.snp.bottom).offset(12)
make.left.equalTo(kMargin)
make.right.equalTo(-kMargin)
make.right.equalTo(-20)
make.height.equalTo(YHOrderTipsItemView.viewH)
}
} else if arr.count == 1 {
......
galaxy/galaxy/Classes/Tools/Extention/UILable+Extension.swift
View file @ 70882d5d
......@@ -50,4 +50,17 @@ extension UILabel {
label.sizeToFit()
return label.frame.width
}
var requiredHeight: CGFloat {
let label = UILabel(frame: CGRect(x: 0, y: 0, width: frame.width, height: CGFloat.greatestFiniteMagnitude))
label.numberOfLines = 0
label.lineBreakMode = NSLineBreakMode.byWordWrapping
label.font = font
label.text = text
label.attributedText = attributedText
label.sizeToFit()
return label.frame.height
}
}
galaxy/galaxy/Res/Assets.xcassets/Home/home_radar_bkg.imageset/Contents.json
View file @ 70882d5d
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "渐变背景色@2x.png",
"filename" : "Group 2033194990@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "渐变背景色@3x.png",
"filename" : "Group 2033194990@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
galaxy/galaxy/Res/Assets.xcassets/Mine/mine_item_activity.imageset/Contents.json
View file @ 70882d5d
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "wode_activity.png",
"filename" : "Frame@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "wode_activity 1.png",
"filename" : "Frame@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
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