Skip to content

G
galaxy-iOS
Commit 6976ddbc authored by Steven杜宇's avatar Steven杜宇
Browse files
Options

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

parents 3660023a e2164ea6
Show whitespace changes
Inline Side-by-side
Showing with 653 additions and 47 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 6976ddbc
......@@ -51,6 +51,10 @@
044D0BEE2C2019C100C5CF5E /* YHCommunityViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044D0BED2C2019C100C5CF5E /* YHCommunityViewController.swift */; };
044D0BF02C2025FF00C5CF5E /* YHActivityViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044D0BEF2C2025FF00C5CF5E /* YHActivityViewController.swift */; };
044D0BF22C20262100C5CF5E /* YHPeopleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044D0BF12C20262100C5CF5E /* YHPeopleViewController.swift */; };
044D0BF42C21247100C5CF5E /* YHUserInfoSettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044D0BF32C21247100C5CF5E /* YHUserInfoSettingViewController.swift */; };
044D0BF62C2154CA00C5CF5E /* YHAllowUseMyInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044D0BF52C2154CA00C5CF5E /* YHAllowUseMyInfoViewController.swift */; };
044D0BF82C21572B00C5CF5E /* YHAllowSettingTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044D0BF72C21572B00C5CF5E /* YHAllowSettingTableViewCell.swift */; };
044D0BFA2C215C6F00C5CF5E /* YHSettingItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044D0BF92C215C6F00C5CF5E /* YHSettingItem.swift */; };
045EEE792B9F171A0022A143 /* YHPreviewViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EED9A2B9F171A0022A143 /* YHPreviewViewModel.swift */; };
045EEE7A2B9F171A0022A143 /* YHPreviewForOtherInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EED9C2B9F171A0022A143 /* YHPreviewForOtherInfoModel.swift */; };
045EEE7B2B9F171A0022A143 /* YHPersonInfoCellModel2.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EED9D2B9F171A0022A143 /* YHPersonInfoCellModel2.swift */; };
......@@ -457,6 +461,7 @@
A5DE0D3C2BB9016200976FE1 /* YHEmailInputAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DE0D3B2BB9016200976FE1 /* YHEmailInputAlertView.swift */; };
A5DF3D462BF72BA1003D5F03 /* YHTestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DF3D452BF72BA0003D5F03 /* YHTestViewController.swift */; };
A5E69D512BA304D400411932 /* DIN Alternate Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */; };
A5EE41EF2C21387C005BBA5D /* YHAiRadarAreaView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EE41EE2C21387C005BBA5D /* YHAiRadarAreaView.swift */; };
A5EF21312BA6DF94005027E6 /* YHMineSchemeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EF21302BA6DF94005027E6 /* YHMineSchemeViewController.swift */; };
A5EF21332BA6E030005027E6 /* YHFileListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EF21322BA6E030005027E6 /* YHFileListViewController.swift */; };
A5EF21352BA6E05E005027E6 /* YHQuestionAndAnswerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EF21342BA6E05E005027E6 /* YHQuestionAndAnswerViewController.swift */; };
......@@ -549,6 +554,10 @@
044D0BED2C2019C100C5CF5E /* YHCommunityViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCommunityViewController.swift; sourceTree = "<group>"; };
044D0BEF2C2025FF00C5CF5E /* YHActivityViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHActivityViewController.swift; sourceTree = "<group>"; };
044D0BF12C20262100C5CF5E /* YHPeopleViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPeopleViewController.swift; sourceTree = "<group>"; };
044D0BF32C21247100C5CF5E /* YHUserInfoSettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHUserInfoSettingViewController.swift; sourceTree = "<group>"; };
044D0BF52C2154CA00C5CF5E /* YHAllowUseMyInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAllowUseMyInfoViewController.swift; sourceTree = "<group>"; };
044D0BF72C21572B00C5CF5E /* YHAllowSettingTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAllowSettingTableViewCell.swift; sourceTree = "<group>"; };
044D0BF92C215C6F00C5CF5E /* YHSettingItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSettingItem.swift; sourceTree = "<group>"; };
045EED9A2B9F171A0022A143 /* YHPreviewViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHPreviewViewModel.swift; sourceTree = "<group>"; };
045EED9C2B9F171A0022A143 /* YHPreviewForOtherInfoModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHPreviewForOtherInfoModel.swift; sourceTree = "<group>"; };
045EED9D2B9F171A0022A143 /* YHPersonInfoCellModel2.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHPersonInfoCellModel2.swift; sourceTree = "<group>"; };
......@@ -964,6 +973,7 @@
A5DE0D3B2BB9016200976FE1 /* YHEmailInputAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHEmailInputAlertView.swift; sourceTree = "<group>"; };
A5DF3D452BF72BA0003D5F03 /* YHTestViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHTestViewController.swift; sourceTree = "<group>"; };
A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "DIN Alternate Bold.ttf"; sourceTree = "<group>"; };
A5EE41EE2C21387C005BBA5D /* YHAiRadarAreaView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAiRadarAreaView.swift; sourceTree = "<group>"; };
A5EF21302BA6DF94005027E6 /* YHMineSchemeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMineSchemeViewController.swift; sourceTree = "<group>"; };
A5EF21322BA6E030005027E6 /* YHFileListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFileListViewController.swift; sourceTree = "<group>"; };
A5EF21342BA6E05E005027E6 /* YHQuestionAndAnswerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHQuestionAndAnswerViewController.swift; sourceTree = "<group>"; };
......@@ -1759,6 +1769,7 @@
isa = PBXGroup;
children = (
0468D4352B57752F00CFB916 /* YHUserModel.swift */,
044D0BF92C215C6F00C5CF5E /* YHSettingItem.swift */,
);
path = M;
sourceTree = "<group>";
......@@ -2223,6 +2234,7 @@
A567E5902BD7643D00D5D5A0 /* YHHkLifeAndIdItemView.swift */,
049AB5ED2C0EF68700155DDF /* YHOrderTipsView.swift */,
A567E5912BD7643D00D5D5A0 /* YHSearchItemLayout.swift */,
A5EE41EE2C21387C005BBA5D /* YHAiRadarAreaView.swift */,
);
path = V;
sourceTree = "<group>";
......@@ -2281,6 +2293,8 @@
04B9EE592C06CC3100A4018D /* YHOtherLoginViewController.swift */,
0468D4252B495A5400CFB916 /* YHPickPhoneAddressViewController.swift */,
04E86E0C2B70D51D00A35F4B /* YHWebViewViewController.swift */,
044D0BF32C21247100C5CF5E /* YHUserInfoSettingViewController.swift */,
044D0BF52C2154CA00C5CF5E /* YHAllowUseMyInfoViewController.swift */,
);
path = C;
sourceTree = "<group>";
......@@ -2294,6 +2308,7 @@
A5ACE8E62B4564F7002C94D2 /* YHValidateCodeInputView.swift */,
0468D4212B493A5E00CFB916 /* YHPhoneMessageView.swift */,
0468D4272B50D4AF00CFB916 /* YHPrivacyAlertView.swift */,
044D0BF72C21572B00C5CF5E /* YHAllowSettingTableViewCell.swift */,
);
path = V;
sourceTree = "<group>";
......@@ -2892,6 +2907,7 @@
045EEF132B9F171A0022A143 /* YHCountryMessage.swift in Sources */,
045EEE7B2B9F171A0022A143 /* YHPersonInfoCellModel2.swift in Sources */,
A53B61122BB128AF0010B573 /* YHFileListItemsView2.swift in Sources */,
044D0BF62C2154CA00C5CF5E /* YHAllowUseMyInfoViewController.swift in Sources */,
04F9574D2C20644E003C631C /* YHFriendsRequestView.swift in Sources */,
04F5F8702C1AC4C2004A463C /* YHHKEventWebViewController.swift in Sources */,
045EEE892B9F171A0022A143 /* YHPreviewBaseViewController.swift in Sources */,
......@@ -2961,6 +2977,7 @@
045EEED82B9F171A0022A143 /* YHQuestionInfo.swift in Sources */,
A567E5B82BD7643D00D5D5A0 /* YHSearchItemLayout.swift in Sources */,
A567E5A02BD7643D00D5D5A0 /* YHHomeWebViewController.swift in Sources */,
044D0BF42C21247100C5CF5E /* YHUserInfoSettingViewController.swift in Sources */,
A567E5942BD7643D00D5D5A0 /* YHHomeListModel.swift in Sources */,
A5ACE94E2B4564F7002C94D2 /* AlignedCollectionViewFlowLayout.swift in Sources */,
A567E5B32BD7643D00D5D5A0 /* YHServiceOrderAlertView.swift in Sources */,
......@@ -3026,6 +3043,7 @@
A5ACE9392B4564F7002C94D2 /* UIDevice+Extension.swift in Sources */,
045EEEE82B9F171A0022A143 /* YHFamilyMemberViewModel.swift in Sources */,
045EEED02B9F171A0022A143 /* YHScoreResultView.swift in Sources */,
044D0BFA2C215C6F00C5CF5E /* YHSettingItem.swift in Sources */,
0425E6442BA95FE100A5E763 /* YHSchemeTableHeadView.swift in Sources */,
045EEEBC2B9F171A0022A143 /* YHClipperButton.swift in Sources */,
045EEF102B9F171A0022A143 /* YHMainApplicantInformationViewModel.swift in Sources */,
......@@ -3079,6 +3097,7 @@
045EEEEC2B9F171A0022A143 /* YHBrotherInfoVC.swift in Sources */,
0477E17A2BA41C7E00436346 /* YHCertificateModel.swift in Sources */,
045EEF242B9F171A0022A143 /* YHStepView.swift in Sources */,
044D0BF82C21572B00C5CF5E /* YHAllowSettingTableViewCell.swift in Sources */,
A5ACE9482B4564F7002C94D2 /* YHHUDWariningView.swift in Sources */,
045EEF0F2B9F171A0022A143 /* YHSelectCountryViewModel.swift in Sources */,
045EEEB52B9F171A0022A143 /* YHWorkIntroductionItemView.swift in Sources */,
......@@ -3108,6 +3127,7 @@
A58556BA2B6BCF1A003746B2 /* YHPersonInfoFillStepModel.swift in Sources */,
045EEEC92B9F171A0022A143 /* YHOtherInfoSessionView.swift in Sources */,
A567E59B2BD7643D00D5D5A0 /* YHWebModel.swift in Sources */,
A5EE41EF2C21387C005BBA5D /* YHAiRadarAreaView.swift in Sources */,
045EEEE22B9F171A0022A143 /* YHMySignatureDetailViewModel.swift in Sources */,
045EEE7D2B9F171A0022A143 /* YHWorkExpDataModel.swift in Sources */,
045EEE832B9F171A0022A143 /* YHMainInfoPreviewModel.swift in Sources */,
......
galaxy/galaxy/Classes/Base/C/YHBaseViewController.swift
View file @ 6976ddbc
......@@ -22,7 +22,7 @@ class YHBaseViewController: UIViewController {
gk_navLineHidden = true
gk_navBarAlpha = 0
gk_backImage = UIImage(named: "nav_back_icon")
gk_backImage = UIImage(named: "back_icon")
#if DEBUG
......
galaxy/galaxy/Classes/Modules/AutoLogin(一键登录)/M/YHOneKeyLoginManager.swift
View file @ 6976ddbc
......@@ -264,7 +264,7 @@ extension YHOneKeyLoginManager {
}
// 登录按钮自定义UI
model.loginBtnText = NSAttributedString(string: "本机号码一键登录", attributes: [NSAttributedString.Key.foregroundColor : UIColor.init(hex: 0x121A26), NSAttributedString.Key.font: UIFont.PFSC_M(ofSize: 16)])
model.loginBtnText = NSAttributedString(string: "本机号码一键登录", attributes: [NSAttributedString.Key.foregroundColor : UIColor.mainTextColor, NSAttributedString.Key.font: UIFont.PFSC_M(ofSize: 16)])
let enableLoginBgImg = TXCommonUtils.image(with: .white, size: CGSize(width: KScreenWidth-20*2, height: 48), isRoundedCorner: true, radius: kCornerRadius3)!
let disableLoginBgImg = TXCommonUtils.image(with: .white, size: CGSize(width: KScreenWidth-20*2, height: 48), isRoundedCorner: true, radius: kCornerRadius3)!
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHAiRadarAreaView.swift 0 → 100644
View file @ 6976ddbc
//
// YHAiRadarAreaView.swift
// galaxy
//
// Created by davidhuangA on 2024/6/18.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHAiRadarAreaView: UIView {
static let viewH = 88.0
override init(frame: CGRect) {
super.init(frame: frame)
setupUI()
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
lazy var bkgImageV: UIImageView = {
let imgV : UIImageView = UIImageView()
imgV.contentMode = .scaleAspectFill
return imgV
}()
lazy var lable1: UILabel = {
let lable : UILabel = UILabel()
lable.text = "AI人脉雷达"
lable.font = UIFont.PFSC_B(ofSize: 16)
lable.textColor = UIColor.brandMainColor
return lable
}()
lazy var lable2: UILabel = {
let lable : UILabel = UILabel()
lable.text = "为您找到更多同行"
lable.font = UIFont.PFSC_R(ofSize: 12)
lable.textColor = UIColor.yhGreyColor
return lable
}()
lazy var lable3: UILabel = {
let lable : UILabel = UILabel()
lable.text = "前往查看"
lable.font = UIFont.PFSC_R(ofSize: 13)
lable.textColor = UIColor.white
lable.backgroundColor = UIColor.brandMainColor
return lable
}()
}
extension YHAiRadarAreaView {
@objc func didLookOrderBtnClicked() {
goTabBarBy(tabType: .service)
}
func setupUI() {
// self.backgroundColor = UIColor(hex: 0xF8FAFB)
//
// let imgView = UIImageView(image: UIImage(named: "home_tips_order"))
// addSubview(imgView)
// imgView.snp.makeConstraints { make in
// make.width.height.equalTo(31)
// make.centerY.equalToSuperview()
// make.left.equalTo(14)
// }
//
// let label = UILabel()
// label.textAlignment = .left
// let aa: ASAttributedString = .init("您有", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
// let bb: ASAttributedString = .init("1", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.brandMainColor))
// let cc: ASAttributedString = .init("个服务中的优才订单", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
// label.attributed.text = aa+bb+cc
// addSubview(label)
// label.snp.makeConstraints { make in
// make.centerY.equalToSuperview()
// make.left.equalTo(imgView.snp.right).offset(6)
// }
//
// let btn = UIButton()
// btn.setTitle("查看进度", for: .normal)
// btn.setTitleColor(.white, for: .normal)
// btn.backgroundColor = UIColor.brandMainColor
// btn.titleLabel?.font = .PFSC_R(ofSize: 12)
// btn.addTarget(self, action: #selector(didLookOrderBtnClicked), for: .touchUpInside)
// addSubview(btn)
// btn.snp.makeConstraints { make in
// make.width.equalTo(72)
// make.height.equalTo(33)
// make.centerY.equalToSuperview()
// make.left.equalTo(label.snp.right).offset(16)
// make.right.equalTo(-16)
// }
}
}
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHkLifeAndIdItemView.swift
View file @ 6976ddbc
......@@ -50,7 +50,7 @@ class YHHkLifeAndIdItemView: UIView {
lazy var subtitleLable:UILabel = {
let label = UILabel()
label.text = "去香港"
label.textColor = UIColor(hex: 0x94A3B8, alpha: 1.0)
label.textColor = UIColor.yhGreyColor
label.font = UIFont.PFSC_R(ofSize: 11)
label.lineBreakMode = .byTruncatingMiddle
return label
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeHeadView.swift
View file @ 6976ddbc
......@@ -30,20 +30,31 @@ class YHHomeHeadView: UIView {
return view
}()
// 优才订单提示视图
//2.优才订单提示视图 - 未登录态不
lazy var orderTipsView: YHOrderTipsView = {
let view = YHOrderTipsView(frame: .zero)
view.isHidden = true
return view
}()
//2.香港身份 香港生活
//3. ai人脉雷达
lazy var aiRadarArea: YHOrderTipsView = {
let view = YHOrderTipsView(frame: .zero)
view.isHidden = true
return view
}()
//4.银河线下沙龙
//5.香港身份 香港生活
lazy var homeHkLife : YHHkLifeAndIdView = {
let view = YHHkLifeAndIdView()
return view
}()
//3. 四大金刚区
//6. 四大金刚区
lazy var homeKingKongBlock : YHHomeKingKongBlockView = {
let view = YHHomeKingKongBlockView()
return view
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeKingKongBlockItem.swift
View file @ 6976ddbc
......@@ -27,7 +27,7 @@ class YHHomeKingKongBlockItem: UIView {
lazy var subtitleLable:UILabel = {
let label = UILabel()
label.text = "去香港"
label.textColor = UIColor(hex: 0x94A3B8, alpha: 1.0)
label.textColor = UIColor.yhGreyColor
label.font = UIFont.PFSC_M(ofSize: 12)
label.lineBreakMode = .byTruncatingMiddle
label.textAlignment = .center
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeSearchView.swift
View file @ 6976ddbc
......@@ -13,7 +13,7 @@ class YHHomeSearchView: UIView {
let lable = UILabel()
lable.text = "香港身份"
lable.font = UIFont.PFSC_R(ofSize: 13)
lable.textColor = UIColor(hex: 0x94A3B8, alpha: 1.0)
lable.textColor = UIColor.yhGreyColor
return lable
}()
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHSearchInfoBar.swift
View file @ 6976ddbc
......@@ -37,7 +37,7 @@ class YHSearchInfoBar: UIView {
lazy var textField:UITextField = {
let textField = UITextField()
textField.backgroundColor = .clear
textField.attributedPlaceholder = NSAttributedString(string: "香港身份".local, attributes: [NSAttributedString.Key.foregroundColor : UIColor(hex: 0x94A3B8)])
textField.attributedPlaceholder = NSAttributedString(string: "香港身份".local, attributes: [NSAttributedString.Key.foregroundColor : UIColor.yhGreyColor])
textField.font = UIFont.PFSC_M(ofSize: 12)
textField.tintColor = UIColor.brandMainColor
textField.textColor = UIColor.mainTextColor
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHSearchInfoHistoryView.swift
View file @ 6976ddbc
......@@ -22,7 +22,7 @@ class YHSearchInfoHistoryView: UIView {
lazy var titleLabel: UILabel = {
let label = UILabel()
label.font = .PFSC_R(ofSize: 14)
label.textColor = UIColor(hex: 0x94A3B8)
label.textColor = UIColor.yhGreyColor
label.text = "历史搜索"
return label
}()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterMainViewController.swift
View file @ 6976ddbc
......@@ -196,7 +196,7 @@ extension YHServiceCenterMainViewController {
let button = UIButton(type: .custom)
button.setTitle("我的订单", for: .normal)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.setTitleColor(UIColor(hex: 0x94a3b8), for: .normal)
button.setTitleColor(UIColor.yhGreyColor, for: .normal)
button.addTarget(self, action: #selector(pushOrderView), for: .touchUpInside)
return button
}()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/V/YHFileListItemsView.swift
View file @ 6976ddbc
......@@ -86,7 +86,7 @@ private extension YHFileListItemsView {
let lable = UILabel()
lable.text = "暂无待完善清单"
lable.font = UIFont.PFSC_R(ofSize: 12)
lable.textColor = UIColor(hex: 0x94A3B8, alpha: 1.0)
lable.textColor = UIColor.yhGreyColor
holdView.addSubview(lable)
lable.snp.makeConstraints { make in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceNoOrderView.swift
View file @ 6976ddbc
......@@ -30,7 +30,7 @@ class YHServiceNoOrderView: UIView {
private lazy var noFindLab : UILabel = {
let lable = UILabel()
lable.textColor = UIColor.init(hex: 0x94A3B8)
lable.textColor = UIColor.yhGreyColor
lable.font = UIFont.PFSC_R(ofSize: 12)
lable.textAlignment = .center
lable.text = "找不到订单"
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceOrderProgressTableViewCell.swift
View file @ 6976ddbc
......@@ -72,7 +72,7 @@ extension YHServiceOrderProgressTableViewCell {
// 0未知 1待开始 2进行中 3 已完成
if model.status == 1 {
titleLabel.textColor = UIColor.mainTextColor50
messageLabel.textColor = UIColor(hex: 0x94a3b8,transparency: 0.5)
messageLabel.textColor = UIColor.yhGreyColor50
buttonLabel.text = "待开始"
buttonLabel.backgroundColor = UIColor(hex: 0xb8babe,transparency: 0.5)
progressImageView.image = UIImage(named: "service_progress_normal")
......@@ -115,23 +115,23 @@ extension YHServiceOrderProgressTableViewCell {
titleLabel.text = "我的证件"
// messageLabel.text = "恭喜您，证件已全部上传完~"
buttonLabel.text = "去上传"
let a: ASAttributedString = .init("您还有", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
let a: ASAttributedString = .init("您还有", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
let aa: ASAttributedString = .init(NSAttributedString(string: "\(model.num)份"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.brandMainColor))
let aaa: ASAttributedString = .init("证件待上传哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
let aaa: ASAttributedString = .init("证件待上传哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
messageLabel.attributed.text = a + aa + aaa
}
if model.type == 2 {
titleLabel.text = "我的信息"
buttonLabel.text = "去填写"
if model.reject_status == 0 {
let a: ASAttributedString = .init("您还有", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
let a: ASAttributedString = .init("您还有", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
let aa: ASAttributedString = .init(NSAttributedString(string: "\(model.num)份"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.brandMainColor))
let aaa: ASAttributedString = .init("信息待填写哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
let aaa: ASAttributedString = .init("信息待填写哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
messageLabel.attributed.text = a + aa + aaa
} else {
let a: ASAttributedString = .init("您的信息被", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
let a: ASAttributedString = .init("您的信息被", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
let aa: ASAttributedString = .init(NSAttributedString(string: "驳回"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.failColor))
let aaa: ASAttributedString = .init("了哦～", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
let aaa: ASAttributedString = .init("了哦～", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
messageLabel.attributed.text = a + aa + aaa
buttonLabel.text = "去修改"
}
......@@ -147,25 +147,25 @@ extension YHServiceOrderProgressTableViewCell {
if model.type == 5 {
titleLabel.text = "我的签字"
buttonLabel.text = "去签字"
let a: ASAttributedString = .init("您还有", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
let a: ASAttributedString = .init("您还有", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
let aa: ASAttributedString = .init(NSAttributedString(string: "\(model.num)份"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.brandMainColor))
let aaa: ASAttributedString = .init("文件待签字哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
let aaa: ASAttributedString = .init("文件待签字哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
messageLabel.attributed.text = a + aa + aaa
}
if model.type == 6 {
titleLabel.text = "我的文书"
buttonLabel.text = "去确认"
if model.percentage == 66 {
let a: ASAttributedString = .init("您的文书正在", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
let a: ASAttributedString = .init("您的文书正在", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
let aa: ASAttributedString = .init(NSAttributedString(string: "审核中"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.brandMainColor))
let aaa: ASAttributedString = .init("哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
let aaa: ASAttributedString = .init("哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
messageLabel.attributed.text = a + aa + aaa
buttonLabel.text = "请稍候"
buttonLabel.backgroundColor = UIColor(hex: 0x94a3b8,transparency: 0.5)
buttonLabel.backgroundColor = UIColor.yhGreyColor50
} else {
let a: ASAttributedString = .init("您还有", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
let a: ASAttributedString = .init("您还有", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
let aa: ASAttributedString = .init(NSAttributedString(string: "\(model.num)份"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.brandMainColor))
let aaa: ASAttributedString = .init("文书待返稿哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
let aaa: ASAttributedString = .init("文书待返稿哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
messageLabel.attributed.text = a + aa + aaa
}
......@@ -176,7 +176,7 @@ extension YHServiceOrderProgressTableViewCell {
}
if model.status == 3 {
titleLabel.textColor = UIColor.mainTextColor
messageLabel.textColor = UIColor(hex: 0x94a3b8)
messageLabel.textColor = UIColor.yhGreyColor
buttonLabel.text = "去查看"
progress.changeColor(UIColor(hex: 0x55cba0))
buttonLabel.backgroundColor = UIColor(hex: 0x55cba0)
......@@ -213,16 +213,16 @@ extension YHServiceOrderProgressTableViewCell {
if model.status == 4 {
titleLabel.textColor = UIColor.mainTextColor
buttonLabel.text = "请稍候"
buttonLabel.backgroundColor = UIColor(hex: 0x94a3b8,transparency: 0.5)
buttonLabel.backgroundColor = UIColor.yhGreyColor50
progressImageView.image = UIImage(named: "service_progress_start")
progress.changeColor(UIColor.brandMainColor)
// 1 证件 2 信息完善 3 我的评分 4 我的方案 5 我的签字 6我的文书
if model.type == 1 {
titleLabel.text = "我的证件"
// messageLabel.text = "恭喜您，证件已全部上传完~"
let a: ASAttributedString = .init("您的", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
let a: ASAttributedString = .init("您的", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
let aa: ASAttributedString = .init(NSAttributedString(string: "证件清单"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.brandMainColor))
let aaa: ASAttributedString = .init("正在制作中哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
let aaa: ASAttributedString = .init("正在制作中哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
messageLabel.attributed.text = a + aa + aaa
}
if model.type == 2 {
......@@ -231,30 +231,30 @@ extension YHServiceOrderProgressTableViewCell {
}
if model.type == 3 {
titleLabel.text = "我的评分"
let a: ASAttributedString = .init("您的", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
let a: ASAttributedString = .init("您的", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
let aa: ASAttributedString = .init(NSAttributedString(string: "自评报告"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.brandMainColor))
let aaa: ASAttributedString = .init("正在制作中哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
let aaa: ASAttributedString = .init("正在制作中哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
messageLabel.attributed.text = a + aa + aaa
}
if model.type == 4 {
titleLabel.text = "我的方案"
let a: ASAttributedString = .init("您的", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
let a: ASAttributedString = .init("您的", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
let aa: ASAttributedString = .init(NSAttributedString(string: "专属方案"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.brandMainColor))
let aaa: ASAttributedString = .init("正在制作中哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
let aaa: ASAttributedString = .init("正在制作中哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
messageLabel.attributed.text = a + aa + aaa
}
if model.type == 5 {
titleLabel.text = "我的签字"
let a: ASAttributedString = .init("您的", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
let a: ASAttributedString = .init("您的", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
let aa: ASAttributedString = .init(NSAttributedString(string: "签字清单"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.brandMainColor))
let aaa: ASAttributedString = .init("正在制作中哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
let aaa: ASAttributedString = .init("正在制作中哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
messageLabel.attributed.text = a + aa + aaa
}
if model.type == 6 {
titleLabel.text = "我的文书"
let a: ASAttributedString = .init("您的", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
let a: ASAttributedString = .init("您的", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
let aa: ASAttributedString = .init(NSAttributedString(string: "文书清单"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.brandMainColor))
let aaa: ASAttributedString = .init("正在制作中哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
let aaa: ASAttributedString = .init("正在制作中哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
messageLabel.attributed.text = a + aa + aaa
}
let b: ASAttributedString = .init(NSAttributedString(string: "\(model.percentage)"), .font(UIFont(name: "DINAlternate-Bold", size: 24)!),.foreground(UIColor.mainTextColor))
......
galaxy/galaxy/Classes/Modules/Login(登录)/C/YHAllowUseMyInfoViewController.swift 0 → 100644
View file @ 6976ddbc
//
// YHAllowUseMyInfoViewController.swift
// galaxy
//
// Created by EDY on 2024/6/18.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHAllowUseMyInfoViewController: YHBaseViewController {
var tableView: UITableView!
var nextButton: UIButton!
let items: [YHSettingItem] = [YHSettingItem(title: "允许您的信息在名片中使用", subTitle: "开启后，您的信息将自动同步至您的个人名片，并对您的好友公开可见", isSelect: true, isShowAlert: false)]
override func viewDidLoad() {
super.viewDidLoad()
gk_navTitle = "设置"
gk_navBackgroundColor = .white
gk_navBarAlpha = 1
setView()
// Do any additional setup after loading the view.
}
func setView() {
view.backgroundColor = .contentBkgColor
tableView = {
let tableView = UITableView(frame:.zero, style:.grouped)
if #available(iOS 11.0, *) {
tableView.contentInsetAdjustmentBehavior = .never
}
tableView.backgroundColor = .white
tableView.separatorStyle = .none
tableView.delegate = self
tableView.dataSource = self
tableView.register(cellWithClass: YHAllowSettingTableViewCell.self)
return tableView
}()
view.addSubview(tableView)
tableView.snp.makeConstraints { make in
make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
make.bottom.equalTo(-k_Height_safeAreaInsetsBottom() - 48)
make.left.right.equalTo(view)
}
nextButton = {
let button = UIButton(type: .custom)
button.backgroundColor = UIColor.brandMainColor
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
button.contentHorizontalAlignment = .center
button.setTitle("下一步", for: .normal)
button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
button.layer.cornerRadius = kCornerRadius3
button.addTarget(self, action: #selector(nextStep), for: .touchUpInside)
return button
}()
view.addSubview(nextButton)
nextButton.snp.makeConstraints { make in
make.left.equalTo(16)
make.right.equalTo(-16)
make.bottom.equalTo(-8 - k_Height_safeAreaInsetsBottom())
make.height.equalTo(48)
}
}
@objc func nextStep() {
}
}
extension YHAllowUseMyInfoViewController: UITableViewDelegate, UITableViewDataSource {
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return items.count
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withClass: YHAllowSettingTableViewCell.self)
cell.item = items[indexPath.row]
return cell
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return 98.0
}
func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
let view = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 0.01))
return view
}
func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
return 0.01
}
func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
return UIView()
}
func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
return 0.01
}
}
galaxy/galaxy/Classes/Modules/Login(登录)/C/YHUserInfoSettingViewController.swift 0 → 100644
View file @ 6976ddbc
//
// YHUserInfoSettingViewController.swift
// galaxy
//
// Created by EDY on 2024/6/18.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHUserInfoSettingViewController: YHBaseViewController {
var photoImageView: UIImageView!
var photoButton: UIButton!
var changeButton: UIButton!
var nameLabel: UILabel!
var nameTextField: UITextField!
var nextButton: UIButton!
override func viewDidLoad() {
super.viewDidLoad()
setView()
}
func setView() {
gk_navTitle = "设置"
view.backgroundColor = .white
photoImageView = {
let imageView = UIImageView()
imageView.image = UIImage(named: "user_photo_default")
imageView.contentMode = .scaleAspectFill
imageView.isUserInteractionEnabled = true
imageView.layer.cornerRadius = 46.5
imageView.layer.masksToBounds = true
return imageView
}()
view.addSubview(photoImageView)
photoImageView.snp.makeConstraints { make in
make.centerX.equalToSuperview()
make.top.equalTo(k_Height_NavigationtBarAndStatuBar + 30)
make.height.width.equalTo(93)
}
photoButton = {
let button = UIButton(type: .custom)
button.setImage(UIImage(named: "user_take_photo"), for: .normal)
button.addTarget(self, action: #selector(takePhoto), for: .touchUpInside)
return button
}()
view.addSubview(photoButton)
photoButton.snp.makeConstraints { make in
make.bottom.equalTo(photoImageView.snp.bottom)
make.right.equalTo(photoImageView.snp.right)
make.width.height.equalTo(28)
}
changeButton = {
let button = UIButton(type: .custom)
button.setImage(UIImage(named: "user_change_photo"), for: .normal)
button.addTarget(self, action: #selector(changeHead), for: .touchUpInside)
return button
}()
view.addSubview(changeButton)
changeButton.snp.makeConstraints { make in
make.centerX.equalToSuperview()
make.top.equalTo(photoImageView.snp.bottom).offset(20)
make.width.equalTo(68.5)
make.height.equalTo(20)
}
nameLabel = {
let label = UILabel()
label.text = "真实姓名"
label.font = UIFont.PFSC_M(ofSize: 15)
label.textColor = UIColor.mainTextColor
return label
}()
view.addSubview(nameLabel)
nameLabel.snp.makeConstraints { make in
make.left.equalTo(21)
make.width.equalTo(70)
make.top.equalTo(changeButton.snp.bottom).offset(44)
make.height.equalTo(21)
}
nameTextField = {
let textField = UITextField()
textField.textColor = UIColor.mainTextColor
textField.font = UIFont.PFSC_M(ofSize: 15)
textField.adjustsFontSizeToFitWidth = true
//最小字体
textField.minimumFontSize = 12
textField.placeholder = "请输入"
return textField
}()
view.addSubview(nameTextField)
nameTextField.snp.makeConstraints { make in
make.centerY.equalTo(nameLabel.snp.centerY)
make.left.equalTo(129)
make.right.equalTo(-21)
make.height.equalTo(21)
}
nextButton = {
let button = UIButton(type: .custom)
button.backgroundColor = UIColor.brandMainColor
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
button.contentHorizontalAlignment = .center
button.setTitle("下一步", for: .normal)
button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
button.layer.cornerRadius = kCornerRadius3
button.addTarget(self, action: #selector(nextStep), for: .touchUpInside)
return button
}()
view.addSubview(nextButton)
nextButton.snp.makeConstraints { make in
make.left.equalTo(16)
make.right.equalTo(-16)
make.bottom.equalTo(-8 - k_Height_safeAreaInsetsBottom())
make.height.equalTo(48)
}
}
@objc func takePhoto() {
view.endEditing(true)
YHImagePickerView.show() {[weak self] image in
guard let self = self else { return }
self.photoImageView.image = image
}
}
@objc func changeHead() {
}
@objc func nextStep() {
if nameTextField.text?.count == 0 {
YHHUD.flash(message: "请填写您的真实姓名")
return
}
let vc = YHAllowUseMyInfoViewController()
self.navigationController?.pushViewController(vc)
}
}
galaxy/galaxy/Classes/Modules/Login(登录)/M/YHSettingItem.swift 0 → 100644
View file @ 6976ddbc
//
// YHSettingItem.swift
// galaxy
//
// Created by EDY on 2024/6/18.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHSettingItem: NSObject {
var title: String = ""
var subTitle: String = ""
var isSelect: Bool = true
var isShowAlert: Bool = true
init(title: String, subTitle: String, isSelect: Bool, isShowAlert: Bool) {
self.title = title
self.subTitle = subTitle
self.isSelect = isSelect
self.isShowAlert = isShowAlert
}
}
galaxy/galaxy/Classes/Modules/Login(登录)/M/YHUserModel.swift
View file @ 6976ddbc
......@@ -16,7 +16,6 @@ struct YHUserModel: SmartCodable {
var headpic: String?
var sex: Int?
var token: String?
}
struct YHDeviceTokenModel {
......
galaxy/galaxy/Classes/Modules/Login(登录)/V/YHAllowSettingTableViewCell.swift 0 → 100644
View file @ 6976ddbc
//
// YHAllowSettingTableViewCell.swift
// galaxy
//
// Created by EDY on 2024/6/18.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHAllowSettingTableViewCell: UITableViewCell {
var titleLabel: UILabel!
var exampleButton: UIButton!
var subTitleLabel: UILabel!
var detailSwitch: UISwitch!
var item: YHSettingItem? {
didSet {
updateData()
}
}
override func awakeFromNib() {
super.awakeFromNib()
// Initialization code
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
}
required init?(coder: NSCoder) {
super.init(coder: coder)
}
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
super.init(style: style, reuseIdentifier: reuseIdentifier)
selectionStyle = .none
setupUI()
}
func setupUI() {
contentView.backgroundColor = .clear
backgroundColor = .clear
titleLabel = {
let label = UILabel()
label.font = UIFont.PFSC_M(ofSize: 17)
label.textColor = UIColor.mainTextColor
return label
}()
contentView.addSubview(titleLabel)
titleLabel.snp.makeConstraints { make in
make.left.equalTo(21)
make.top.equalTo(16)
make.height.equalTo(22)
}
exampleButton = {
let button = UIButton(type: .custom)
button.setBackgroundImage(UIImage(named: "work_experience_alert"), for: .normal)
button.addTarget(self, action: #selector(exampleClick), for: .touchUpInside)
return button
}()
contentView.addSubview(exampleButton)
exampleButton.snp.makeConstraints { make in
make.left.equalTo(titleLabel.snp.right).offset(4)
make.centerY.equalTo(titleLabel.snp.centerY)
make.height.equalTo(18)
make.width.equalTo(18)
}
subTitleLabel = {
let label = UILabel()
label.font = UIFont.PFSC_R(ofSize: 13)
label.textColor = UIColor.mainTextColor30
label.numberOfLines = 0
return label
}()
contentView.addSubview(subTitleLabel)
subTitleLabel.snp.makeConstraints { make in
make.left.equalTo(21)
make.right.equalTo(-87)
make.top.equalTo(46)
}
detailSwitch = {
let switchView = UISwitch()
switchView.onTintColor = UIColor.brandMainColor
switchView.addTarget(self, action: #selector(switchViewChange), for: .valueChanged)
return switchView
}()
contentView.addSubview(detailSwitch)
detailSwitch.snp.makeConstraints { make in
make.right.equalTo(-21)
make.centerY.equalToSuperview()
make.height.equalTo(22)
make.width.equalTo(40)
}
exampleButton.YH_clickEdgeInsets = UIEdgeInsets(top: 50, left: 50, bottom: 50, right: 50)
detailSwitch.transform = CGAffineTransform(scaleX: 0.77, y: 0.77)
}
@objc func exampleClick() {
}
@objc func switchViewChange() {
}
func updateData() {
guard let model = item else { return }
titleLabel.text = model.title
subTitleLabel.text = model.subTitle
exampleButton.isHidden = !model.isShowAlert
detailSwitch.isOn = model.isSelect
}
}
galaxy/galaxy/Classes/Modules/Login(登录)/V/YHPhoneMessageView.swift
View file @ 6976ddbc
......@@ -29,7 +29,7 @@ class YHPhoneMessageView: UIView {
let button = UIButton(type: .custom)
button.titleLabel?.font = UIFont(name: "DINAlternate-Bold", size: 18)
button.setTitle("+86", for: .normal)
button.setTitleColor( UIColor(hex:0x121a26), for: .normal)
button.setTitleColor(UIColor.mainTextColor, for: .normal)
button.addTarget(self, action: #selector(messageClick), for: .touchUpInside)
button.titleLabel?.textAlignment = .left
return button
......@@ -46,7 +46,7 @@ class YHPhoneMessageView: UIView {
let text = UITextField()
text.placeholder = "请输入您的手机号"
text.font = UIFont(name: "DINAlternate-Bold", size: 18)
text.textColor = UIColor(hex:0x121a26)
text.textColor = UIColor.mainTextColor
text.textAlignment = .left
text.keyboardType = .phonePad
text.clearButtonMode = .always
......
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift
View file @ 6976ddbc
......@@ -285,7 +285,9 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
switch item.type {
case .myMessage://我的消息
printLog("我的消息")
let vc = YHMessageListVC()
// let vc = YHMessageListVC()
// self.navigationController?.pushViewController(vc)
let vc = YHUserInfoSettingViewController()
self.navigationController?.pushViewController(vc)
case .scoreCenter:////积分中心
printLog("积分中心")
......
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHVideoPlaySettingVC.swift
View file @ 6976ddbc
......@@ -26,7 +26,7 @@ class YHVideoPlaySettingVC: YHBaseViewController {
lazy var titleLabel:UILabel = {
let label = UILabel()
label.textColor = UIColor(hexString:"#121A26")
label.textColor = UIColor.mainTextColor
label.textAlignment = NSTextAlignment.left
label.font = UIFont.PFSC_R(ofSize:15)
label.text = "播放视频时默认静音"
......
galaxy/galaxy/Classes/Modules/Mine（我的）/V/YHUserInfoHeaderView.swift
View file @ 6976ddbc
......@@ -57,7 +57,7 @@ class YHUserInfoHeaderView: UIView {
private lazy var likeLabel:UILabel = {
let label = UILabel()
label.text = "点赞 0".local
label.textColor = UIColor(hex: 0x121A26, transparency: 0.5)
label.textColor = UIColor.mainTextColor50
label.textAlignment = NSTextAlignment.left
label.font = UIFont.PFSC_R(ofSize: 13)
label.isUserInteractionEnabled = true
......@@ -70,7 +70,7 @@ class YHUserInfoHeaderView: UIView {
private lazy var collectLabel:UILabel = {
let label = UILabel()
label.text = "收藏 0".local
label.textColor = UIColor(hex: 0x121A26, transparency: 0.5)
label.textColor = UIColor.mainTextColor50
label.textAlignment = NSTextAlignment.left
label.font = UIFont.PFSC_R(ofSize: 13)
label.isUserInteractionEnabled = true
......@@ -83,7 +83,7 @@ class YHUserInfoHeaderView: UIView {
private lazy var scanLabel:UILabel = {
let label = UILabel()
label.text = "最近浏览 0".local
label.textColor = UIColor(hex: 0x121A26, transparency: 0.5)
label.textColor = UIColor.mainTextColor50
label.textAlignment = NSTextAlignment.left
label.font = UIFont.PFSC_R(ofSize: 13)
label.isUserInteractionEnabled = true
......
galaxy/galaxy/Classes/Tools/Extention/UIColor+Extension.swift
View file @ 6976ddbc
......@@ -80,6 +80,14 @@ extension UIColor {
// alertView 底部蒙层颜色
static let alertMaskColor: UIColor = UIColor.init(hex: 0x0F1214, alpha: 0.5)
//94a3b8
static let yhGreyColor: UIColor = UIColor(hexString: "#94A3B8")!
static let yhGreyColor50: UIColor = UIColor(hexString: "#94A3B8",transparency: 0.5)!
public convenience init(r : CGFloat, g : CGFloat, b : CGFloat,alpha:CGFloat = 1.0) {
self.init(red: r / 255.0, green: g / 255.0, blue: b / 255.0, alpha: alpha)
}
......
galaxy/galaxy/Res/Assets.xcassets/MyCard/Contents.json 0 → 100644
View file @ 6976ddbc
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
galaxy/galaxy/Res/Assets.xcassets/MyCard/user_change_photo.imageset/Contents.json 0 → 100644
View file @ 6976ddbc
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "user_change_photo@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "user_change_photo@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
galaxy/galaxy/Res/Assets.xcassets/MyCard/user_photo_default.imageset/Contents.json 0 → 100644
View file @ 6976ddbc
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "user_photo_default@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "user_photo_default@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
galaxy/galaxy/Res/Assets.xcassets/MyCard/user_take_photo.imageset/Contents.json 0 → 100644
View file @ 6976ddbc
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "user_take_photo@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "user_take_photo@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
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