Merge commit 'd95ddf73' into davidhuang

* commit 'd95ddf73':
  // 我的tab

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -72,6 +72,7 @@
 		04A7BC8F2B6B2BC2000E8D47 /* YHFamilyRequestViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A7BC8E2B6B2BC2000E8D47 /* YHFamilyRequestViewModel.swift */; };
 		04A7BC912B6B7B89000E8D47 /* YHTwoOptionAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A7BC902B6B7B89000E8D47 /* YHTwoOptionAlertView.swift */; };
 		04AF58C42B4FC51C0066011A /* YHLocalizable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AF58C32B4FC51C0066011A /* YHLocalizable.swift */; };
+		04C8F4832B7216D800ADF59B /* YHUserInfoHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C8F4822B7216D800ADF59B /* YHUserInfoHeaderView.swift */; };
 		04E86E092B707ACE00A35F4B /* YHPhoneLoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E86E082B707ACE00A35F4B /* YHPhoneLoginViewController.swift */; };
 		04E86E0B2B70C13300A35F4B /* YHCodeSueecssViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E86E0A2B70C13300A35F4B /* YHCodeSueecssViewController.swift */; };
 		04E86E0D2B70D51D00A35F4B /* YHWebViewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E86E0C2B70D51D00A35F4B /* YHWebViewViewController.swift */; };
@@ -301,6 +302,7 @@
 		04A7BC8E2B6B2BC2000E8D47 /* YHFamilyRequestViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFamilyRequestViewModel.swift; sourceTree = "<group>"; };
 		04A7BC902B6B7B89000E8D47 /* YHTwoOptionAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHTwoOptionAlertView.swift; sourceTree = "<group>"; };
 		04AF58C32B4FC51C0066011A /* YHLocalizable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHLocalizable.swift; sourceTree = "<group>"; };
+		04C8F4822B7216D800ADF59B /* YHUserInfoHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHUserInfoHeaderView.swift; sourceTree = "<group>"; };
 		04E86E082B707ACE00A35F4B /* YHPhoneLoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPhoneLoginViewController.swift; sourceTree = "<group>"; };
 		04E86E0A2B70C13300A35F4B /* YHCodeSueecssViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCodeSueecssViewController.swift; sourceTree = "<group>"; };
 		04E86E0C2B70D51D00A35F4B /* YHWebViewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHWebViewViewController.swift; sourceTree = "<group>"; };
@@ -1013,6 +1015,7 @@
 			isa = PBXGroup;
 			children = (
 				A5ACE8EC2B4564F7002C94D2 /* Algorithm.swift */,
+				04C8F4822B7216D800ADF59B /* YHUserInfoHeaderView.swift */,
 				A5ACE8ED2B4564F7002C94D2 /* YHPersonalCenterCell.swift */,
 				049A48A92B49536000D0C641 /* YHAboutUsAdvantageCell.swift */,
 			);
@@ -1593,6 +1596,7 @@
 				A5C5B3252B57C74900A7C5D1 /* YHDavidCell3.swift in Sources */,
 				A5C382CC2B5EA11800C5E65C /* YHContractCell.swift in Sources */,
 				042FBBC12B63B21700F9DE23 /* YHFormItemDegreeInfoCell.swift in Sources */,
+				04C8F4832B7216D800ADF59B /* YHUserInfoHeaderView.swift in Sources */,
 				A5ACE9492B4564F7002C94D2 /* YHHUDSuccessView.swift in Sources */,
 				A58556BA2B6BCF1A003746B2 /* YHPersonInfoFillStepModel.swift in Sources */,
 				A5FD63D42B65F99500D1D9DA /* YHScoreItemCell.swift in Sources */,

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -18,6 +18,9 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
     
     lazy var tableView: UITableView = {
         let tableView = UITableView(frame: CGRect.zero, style:.plain)
+        if #available(iOS 11.0, *) {
+            tableView.contentInsetAdjustmentBehavior = .never
+        }
         tableView.tableHeaderView = headerView
         tableView.backgroundColor = .clear
         tableView.separatorStyle = .none
@@ -28,54 +31,22 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
     }()
     
     lazy var items: [PersonalModuleItem] = {
-        return [PersonalModuleItem(icon: "mine_manager", title: "我的管家"),
-                PersonalModuleItem(icon: "mine_manager", title: "我的订单"),
-                PersonalModuleItem(icon: "mine_manager", title: "我的合同"),
-                PersonalModuleItem(icon: "mine_manager", title: "我的进度"),
-                PersonalModuleItem(icon: "mine_manager", title: "我的积分"),
-                PersonalModuleItem(icon: "mine_manager", title: "我的设置"),
-                PersonalModuleItem(icon: "mine_manager", title: "关于我们"),]
+        return [PersonalModuleItem(icon: "mine_item_msg", title: "我的消息".local),
+                PersonalModuleItem(icon: "mine_item_progress", title: "我的进度".local),
+                PersonalModuleItem(icon: "mine_manager", title: "积分中心".local),
+                PersonalModuleItem(icon: "mine_manager", title: "推荐有礼".local),
+                PersonalModuleItem(icon: "mine_manager", title: "我的海报".local),
+                PersonalModuleItem(icon: "mine_manager", title: "我的测评码".local),
+                PersonalModuleItem(icon: "mine_manager", title: "预约银河湾".local),]
     }()
     
-    lazy var headerView: UIView = {
-        
-        let view = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 110))
-        
-        let iconImgView = UIImageView(image: UIImage(named:"mine_head_default"))
-        view.addSubview(iconImgView)
-        
-        let nameLabel = UILabel()
-        nameLabel.text = "智慧银河"
-        nameLabel.textColor = UIColor(hexString:"#222222")
-        nameLabel.textAlignment = NSTextAlignment.left
-        nameLabel.font = UIFont.systemFont(ofSize: 20)
-        view.addSubview(nameLabel)
-        
-        let mobileLabel = UILabel()
-        mobileLabel.text = "133****0000"
-        mobileLabel.textColor = UIColor(hexString:"#666666")
-        mobileLabel.textAlignment = NSTextAlignment.left
-        mobileLabel.font = UIFont.systemFont(ofSize: 13)
-        view.addSubview(mobileLabel)
-        
-        iconImgView.snp.makeConstraints { make in
-            make.left.equalToSuperview().offset(16)
-            make.centerY.equalToSuperview()
-            make.width.height.equalTo(55)
-        }
-        
-        nameLabel.snp.makeConstraints { make in
-            make.left.equalTo(iconImgView.snp.right).offset(10)
-            make.right.equalToSuperview().offset(-16).priority(.low)
-            make.bottom.equalTo(view.snp.centerY)
-        }
-        
-        mobileLabel.snp.makeConstraints { make in
-            make.left.equalTo(iconImgView.snp.right).offset(10)
-            make.right.equalTo(nameLabel)
-            make.top.equalTo(view.snp.centerY)
-        }
-        return view
+    lazy var headerView: YHUserInfoHeaderView = {
+        return YHUserInfoHeaderView.createView()
+    }()
+    
+    private lazy var bgImgView:UIImageView = {
+        let img = UIImageView(image: UIImage(named: "mine_header_bg"))
+        return img
     }()
     
     override func viewDidLoad() {
@@ -86,23 +57,17 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
     func initView() {
         
         self.title = "个人中心"
-//        gk_navTitle = "个人中心"
-//        gk_navBackgroundColor = .clear
-//        gk_navShadowColor = .clear
         
-        let bgImgView = UIImageView(image: UIImage(named: "mine_header"))
         view.addSubview(bgImgView)
+        view.addSubview(tableView)
+        
         bgImgView.snp.makeConstraints { make in
-            make.left.right.top.equalTo(self.view)
-            make.height.equalTo( 435.0/750.0 * KScreenHeight)
+            make.left.right.top.equalTo(view)
+            make.height.equalTo(bgImgView.snp.width).multipliedBy(YHUserInfoHeaderView.bgRatio)
         }
-        
-        view.addSubview(tableView);
         tableView.snp.makeConstraints { make in
-            make.left.right.top.bottom.equalTo(view)
+            make.edges.equalTo(0)
         }
-        
-        
     }
 }
 

galaxy/galaxy/Classes/Modules/Mine（我的）/V/YHUserInfoHeaderView.swift

+//
+//  YHUserInfoHeaderView.swift
+//  galaxy
+//
+//  Created by edy on 2024/2/6.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHUserInfoHeaderView: UIView {
+
+    static let bgRatio = 312.0/375.0 // 背景图高宽比
+    static let height = (KScreenWidth*bgRatio + 24)
+    private lazy var avarImgView:UIImageView = {
+        let img = UIImageView(image: UIImage(named: "mine_head_default"))
+        return img
+    }()
+    
+    private lazy var bgImgView:UIImageView = {
+        let imgView = UIImageView(image: UIImage(named: "mine_header_bg"))
+        imgView.isHidden = true
+        return imgView
+    }()
+    
+    private lazy var userNameLabel:UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor(hexString:"##242424")
+        label.textAlignment = NSTextAlignment.left
+        label.font = UIFont.PFSC_B(ofSize: 21)
+        return label
+    }()
+    
+    private lazy var infoLabel:UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor(hexString:"#949DB5")
+        label.textAlignment = NSTextAlignment.left
+        label.font = UIFont.PFSC_R(ofSize: 13)
+        return label
+    }()
+    
+    private lazy var evaluateView:UIView = {
+        let view = UIView()
+        return view
+    }()
+    
+    private lazy var evaluateLabel:UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor(hexString:"#242424")
+        label.textAlignment = NSTextAlignment.left
+        label.font = UIFont.PFSC_M(ofSize: 17)
+        return label
+    }()
+    
+    private lazy var evaluateBtn: UIButton = {
+        let btn = UIButton()
+        btn.setTitle("免费测评", for: .normal)
+        btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 12)
+        btn.setTitleColor(.white, for: .normal)
+        btn.backgroundColor = UIColor(hexString:"#242424")
+        btn.layer.cornerRadius = 6.0
+        btn.clipsToBounds = true
+        btn.addTarget(self, action: #selector(didClickEvaluateBtn(btn:)), for: .touchUpInside)
+        return btn
+    }()
+    
+    private lazy var evaluateBgImgView:UIImageView = {
+        // radio:750:623
+        let img = UIImageView(image: UIImage(named: "mine_evaluate_bg"))
+        return img
+    }()
+    
+    private lazy var settingBtn: UIButton = {
+        let btn = UIButton()
+        btn.setImage(UIImage(named: "mine_btn_setting"), for: .normal)
+        btn.addTarget(self, action: #selector(didClickEvaluateBtn(btn:)), for: .touchUpInside)
+        return btn
+    }()
+    
+    private lazy var settingView:UIView = {
+        let view = UIView()
+        return view
+    }()
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        createUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    static func createView() -> YHUserInfoHeaderView {
+       let view = YHUserInfoHeaderView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: Self.height))
+       return view
+    }
+    
+    private func createUI() {
+            
+        self.addSubview(bgImgView)
+        self.addSubview(settingView)
+        settingView.addSubview(settingBtn)
+        
+        self.addSubview(avarImgView)
+        self.addSubview(userNameLabel)
+        self.addSubview(infoLabel)
+        
+        self.addSubview(evaluateView)
+        evaluateView.addSubview(evaluateBgImgView)
+        evaluateView.addSubview(evaluateLabel)
+        evaluateView.addSubview(evaluateBtn)
+        
+        userNameLabel.text = "登录/注册".local
+        infoLabel.text = "点赞 0  收藏 0 最近浏览 0".local
+        evaluateLabel.text = "香港身份20秒极速测评".local
+        
+        bgImgView.snp.makeConstraints { make in
+            make.left.right.top.equalToSuperview()
+            make.height.equalTo(bgImgView.snp.width).multipliedBy(Self.bgRatio)
+        }
+        
+        settingView.snp.makeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.top.equalToSuperview().offset(k_Height_statusBar())
+            make.height.equalTo(44.0)
+        }
+        
+        settingBtn.snp.makeConstraints { make in
+            make.size.equalTo(CGSize(width: 21, height: 21))
+            make.right.equalToSuperview().offset(-21)
+            make.centerY.equalToSuperview()
+        }
+        
+        avarImgView.snp.makeConstraints { make in
+            make.size.equalTo(CGSize(width: 72, height: 72))
+            make.top.equalTo(settingBtn.snp.bottom).offset(12)
+            make.left.equalToSuperview().offset(30)
+        }
+        
+        userNameLabel.snp.makeConstraints { make in
+            make.left.equalTo(avarImgView)
+            make.top.equalTo(avarImgView.snp.bottom).offset(16)
+            make.right.equalToSuperview().offset(-30)
+            make.height.equalTo(30.0)
+        }
+        
+        infoLabel.snp.makeConstraints { make in
+            make.left.equalTo(avarImgView)
+            make.right.equalToSuperview().offset(-30)
+            make.height.equalTo(18.0)
+            make.top.equalTo(userNameLabel.snp.bottom).offset(6)
+        }
+        
+        evaluateView.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(18)
+            make.right.equalToSuperview().offset(-18)
+            make.height.equalTo(evaluateView.snp.width).multipliedBy(98.0/357.0)
+            make.top.equalTo(infoLabel.snp.bottom).offset(9.0)
+        }
+        
+        evaluateBgImgView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+        
+        evaluateLabel.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(20+13)
+            make.centerY.equalToSuperview()
+            make.height.equalTo(24.0)
+        }
+        
+        evaluateBtn.snp.makeConstraints { make in
+            make.right.equalToSuperview().offset(-20)
+            make.centerY.equalToSuperview()
+            make.size.equalTo(CGSize(width: 72, height: 30))
+        }
+    }
+    
+    @objc func didClickEvaluateBtn(btn: UIButton) {
+        
+        
+    }
+
+}

galaxy/galaxy/Res/Assets.xcassets/Mine/mine_btn_setting.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "礼品卡购买@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "礼品卡购买@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/Mine/mine_header.imageset/Contents.json → galaxy/galaxy/Res/Assets.xcassets/Mine/mine_evaluate_bg.imageset/Contents.json

@@ -5,11 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "mine_header@2x.png",
+      "filename" : "测评测评@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "测评测评@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Mine/mine_head_default.imageset/Contents.json

@@ -5,11 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "mine_head_default@2x.png",
+      "filename" : "Group 33334470@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "Group 33334470@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Mine/mine_header_bg.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "头部背景@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "头部背景@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/Mine/mine_item_msg.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "我的个人中心页面内的花瓣采集图片-木初十@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "我的个人中心页面内的花瓣采集图片-木初十@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/Mine/mine_item_progress.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "我的个人中心页面内的花瓣采集图片-木初十.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "我的个人中心页面内的花瓣采集图片-木初十-1.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}