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

galaxy/galaxy/Classes/Base/C/YHBaseViewController.swift

@@ -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

@@ -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

+//
+//  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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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/Login(登录)/C/YHAllowUseMyInfoViewController.swift

+//
+//  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

+//
+//  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

+//
+//  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

@@ -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

+//
+//  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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/MyCard/user_change_photo.imageset/Contents.json

+{
+  "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

+{
+  "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

+{
+  "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
+  }
+}