Merge branch 'develop' into duyu

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHScoreDetailViewController.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MyScore/C/YHScoreDetailViewController.swift

@@ -27,24 +27,14 @@ class YHScoreDetailViewController: YHBaseViewController {
     
     
     var homeTableView: YHGestureTableView = {
-        let tableView = YHGestureTableView(frame: .zero, style:.plain)
+        let tableView = YHGestureTableView(frame: .zero, style:.grouped)
         tableView.backgroundColor = .clear
         tableView.separatorStyle = .none
         tableView.showsHorizontalScrollIndicator = false
         tableView.showsVerticalScrollIndicator = false
         tableView.rowHeight = UITableView.automaticDimension
         tableView.register(YHScorePersonInfoCell.self,forCellReuseIdentifier: YHScorePersonInfoCell.cellReuseIdentifier)
-        
         tableView.register(YHScoreItemCell.self,forCellReuseIdentifier: YHScoreItemCell.cellReuseIdentifier)
-        tableView.register(YHScoreItemCellForAge.self,forCellReuseIdentifier: YHScoreItemCellForAge.cellReuseIdentifier)
-        
-        
-        
-        //        tableView.register(YHDavidCell1.self,forCellReuseIdentifier: YHDavidCell1.cellReuseIdentifier)
-        //        tableView.register(YHDavidCell3.self,forCellReuseIdentifier: YHDavidCell3.cellReuseIdentifier)
-        //        tableView.register(YHDavidCell2.self,forCellReuseIdentifier: YHDavidCell2.cellReuseIdentifier)
-        //        tableView.register(YHDavidCell4.self,forCellReuseIdentifier: YHDavidCell4.cellReuseIdentifier)
-        //        tableView.register(YHDavidCell5.self,forCellReuseIdentifier: YHDavidCell5.cellReuseIdentifier)
         return tableView
     }()
     
@@ -102,10 +92,13 @@ extension YHScoreDetailViewController {
 extension YHScoreDetailViewController : UITableViewDelegate,UITableViewDataSource {
     
     func numberOfSections(in tableView: UITableView) -> Int {
-        return 1
+        return 2
     }
     
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if section == 0 {
+            return 1
+        }
         return 6
     }
     
@@ -132,17 +125,12 @@ extension YHScoreDetailViewController : UITableViewDelegate,UITableViewDataSourc
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
-        if indexPath.row == 0 {
+        if indexPath.section == 0 {
             let cell = tableView.dequeueReusableCell(withClass: YHScorePersonInfoCell.self)
             return cell
-        } else if indexPath.row == 1 {
-            let cell = tableView.dequeueReusableCell(withClass: YHScoreItemCellForAge.self)
-            cell.optionData = self.serviceCenterMainReqVM.localScoreData?[indexPath.row]
-            return cell
         }
-        
         let cell = tableView.dequeueReusableCell(withClass: YHScoreItemCell.self)
-        cell.optionData = self.serviceCenterMainReqVM.localScoreData?[indexPath.row]
+        cell.optionData = self.serviceCenterMainReqVM.localScoreData?[indexPath.row + 1]
         return cell
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/M/我的评分/YHScoreDataModel.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MyScore/M/YHScoreDataModel.swift

@@ -25,15 +25,15 @@ class YHScoreDataModel: SmartCodable {
         if index == 1 {
             return age_score
         }  else if index == 2 {
-            return language_score
+            return education_score
         } else if index == 3 {
-            return background_score
-        } else if index == 4 {
             return work_experience_score
+        } else if index == 4 {
+            return talent_list_score
         } else if index == 5 {
-            return education_score
+            return language_score
         } else if index == 6 {
-            return talent_list_score
+            return background_score
         }
         return nil
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/我的评分/YHScoreItemCell.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MyScore/V/YHScoreItemCell.swift

@@ -11,12 +11,6 @@ import AttributedString
 
 class YHScoreItemCell: UITableViewCell {
     static let cellReuseIdentifier = "YHScoreItemCell"
-    
-//    var dataModel : YHContactItemModel? {
-//        didSet {
-////            updateUI()
-//        }
-//    }
     var optionData : YHScoreSessionModel? {
         didSet {
             updateUI()
@@ -33,13 +27,10 @@ class YHScoreItemCell: UITableViewCell {
     
     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
     }
     
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
@@ -64,6 +55,17 @@ extension YHScoreItemCell {
     func setupUI() {
         backgroundColor = .clear
         contentView.backgroundColor = .clear
+    }
+    
+    func updateUI() {
+        guard let arrData = optionData?.options else {
+            return
+        }
+        
+        for view in holdView.subviews {
+            view.removeFromSuperview()
+        }
+        holdView.removeFromSuperview()
         
         
         contentView.addSubview(holdView)
@@ -72,12 +74,6 @@ extension YHScoreItemCell {
             make.bottom.equalToSuperview().offset(-14)
         }
         
-        //
-        let view1 = UIView()
-        holdView.addSubview(view1)
-        view1.snp.makeConstraints { make in
-            make.top.left.right.equalToSuperview()
-        }
         
         titleView = YHScoreTitleView()
         holdView.addSubview(titleView)
@@ -87,6 +83,7 @@ extension YHScoreItemCell {
             make.right.equalTo(-18)
             make.height.equalTo(YHScoreTitleView.viewH)
         }
+        titleView.updateWith(optionData?.name, optionData?.score)
         
         
         let resultView = YHScoreResultView()
@@ -98,60 +95,35 @@ extension YHScoreItemCell {
             make.height.equalTo(YHScoreTitleView.viewH)
         }
         
-        scoreOptionsView1 = YHScoreOptionsView()
-        holdView.addSubview(scoreOptionsView1)
-        scoreOptionsView1.snp.makeConstraints { make in
-            make.top.equalTo(resultView.snp.bottom)
-            make.left.equalTo(titleView.snp.left)
-            make.right.equalTo(titleView.snp.right)
-        }
         
-        scoreOptionsView2 = YHScoreOptionsView()
-        holdView.addSubview(scoreOptionsView2)
-        scoreOptionsView2.snp.makeConstraints { make in
-            make.top.equalTo(scoreOptionsView1.snp.bottom)
-            make.left.equalTo(titleView.snp.left)
-            make.right.equalTo(titleView.snp.right)
-        }
         
-        scoreOptionsView3 = YHScoreOptionsView()
-        holdView.addSubview(scoreOptionsView3)
-        scoreOptionsView3.snp.makeConstraints { make in
-            make.top.equalTo(scoreOptionsView2.snp.bottom)
+        
+        var tagView : UIView = resultView
+        for (index,item) in arrData.enumerated() {
+            
+            
+            let optionView = YHScoreOptionsView()
+            optionView.dataModel = item
+            holdView.addSubview(optionView)
+            if index == arrData.count - 1 {
+                optionView.snp.makeConstraints { make in
+                    make.top.equalTo(tagView.snp.bottom)
                     make.left.equalTo(titleView.snp.left)
                     make.right.equalTo(titleView.snp.right)
+                    make.bottom.equalToSuperview()
                 }
+                optionView.bottomLine.isHidden = true
                 
-        scoreOptionsView4 = YHScoreOptionsView()
-        holdView.addSubview(scoreOptionsView4)
-        scoreOptionsView4.snp.makeConstraints { make in
-            make.top.equalTo(scoreOptionsView3.snp.bottom)
+            } else {
+                optionView.snp.makeConstraints { make in
+                    make.top.equalTo(tagView.snp.bottom)
                     make.left.equalTo(titleView.snp.left)
                     make.right.equalTo(titleView.snp.right)
-            
-            make.bottom.equalToSuperview()
                 }
+                optionView.bottomLine.isHidden = false
             }
             
-    
-    
-    func updateUI() {
-        guard let arrData = optionData?.options else {
-            return
-        }
-        
-        titleView.updateWith(optionData?.name, optionData?.score)
-        
-        for (index,item) in arrData.enumerated() {
-            if index == 0 {
-                scoreOptionsView1.dataModel = item
-            } else if index == 1 {
-                scoreOptionsView2.dataModel = item
-            } else if index == 2 {
-                scoreOptionsView3.dataModel = item
-            } else if index == 3 {
-                scoreOptionsView4.dataModel = item
-            }
+            tagView = optionView
         }
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/我的评分/YHScoreOptionsView.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MyScore/V/YHScoreOptionsView.swift

@@ -19,14 +19,6 @@ class YHScoreOptionsView: UIView {
         fatalError("init(coder:) has not been implemented")
     }
     
-//    lazy var nameLable : UILabel = {
-//        let lable0 = UILabel()
-//        lable0.textColor = UIColor(hex: 0x4E4E4E)
-//        lable0.font = UIFont.PingFangScR(ofSize: 14)
-//        lable0.numberOfLines = 0
-//        lable0.lineBreakMode = .byWordWrapping
-//        return lable0
-//    }()
     
     private lazy var nameTextView : UITextView  = {
         let lable0 = UITextView()
@@ -40,7 +32,7 @@ class YHScoreOptionsView: UIView {
     }()
     
     
-    private lazy var bottomLine : UIView = {
+    lazy var bottomLine : UIView = {
         let view = UIView()
         view.backgroundColor = UIColor(hex:0xF0F0F0)
         return view
@@ -74,13 +66,6 @@ private extension YHScoreOptionsView {
             make.height.equalTo(0.5)
         }
         
-//        addSubview(nameLable)
-//        nameLable.snp.makeConstraints { make in
-//            make.top.equalTo(16)
-//            make.left.right.equalToSuperview()
-//            make.bottom.equalTo(bottomLine.snp.top).offset(-16)
-//        }
-        
         addSubview(nameTextView)
         nameTextView.snp.makeConstraints { make in
             make.top.equalTo(16)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/我的评分/YHScorePersonInfoCell.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MyScore/V/YHScorePersonInfoCell.swift

@@ -12,12 +12,6 @@ import AttributedString
 class YHScorePersonInfoCell: UITableViewCell {
     static let cellReuseIdentifier = "YHScorePersonInfoCell"
     
-//    var dataModel : YHContactItemModel? {
-//        didSet {
-////            updateUI()
-//        }
-//    }
-    
     //头像
     private lazy var headImagV : UIImageView = {
         let imageV = UIImageView(image: UIImage(named: "score_header_default"))

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/个人信息表/YHMainApplicantInfoViewController.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息表)/C/YHMainApplicantInfoViewController.swift

@@ -125,7 +125,6 @@ private extension YHMainApplicantInfoViewController {
     }
     
     func setupUI() {
-        
         fakeData()
         
         homeTableView.delegate = self
@@ -136,7 +135,6 @@ private extension YHMainApplicantInfoViewController {
             make.left.equalTo(16)
             make.right.equalTo(-16)
         }
-//        homeTableView.backgroundColor = .red //for test hjl
         homeTableView.reloadData()        
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/我的评分/YHScoreItemCellForAge.swift

-//
-//  YHScoreItemCellForAge.swift
-//  galaxy
-//
-//  Created by davidhuangA on 2024/1/28.
-//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
-//
-
-import UIKit
-import AttributedString
-
-class YHScoreItemCellForAge: UITableViewCell {
-    static let cellReuseIdentifier = "YHScoreItemCellForAge"
-    
-    var optionData : YHScoreSessionModel? {
-        didSet {
-            updateUI()
-        }
-    }
-    
-    private lazy var holdView : UIView = {
-        let view = UIView()
-        view.backgroundColor = .white
-        view.layer.cornerRadius = 12
-        view.clipsToBounds = true
-        return view
-    }()
-    
-    
-    
-    
-    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
-    }
-    
-    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
-        super.init(style: style, reuseIdentifier: reuseIdentifier)
-        setupUI()
-    }
-    
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    var titleView : YHScoreTitleView!
-    private var scoreOptionsView1 : YHScoreOptionsView!
-    private var scoreOptionsView2 : YHScoreOptionsView!
-    private var scoreOptionsView3 : YHScoreOptionsView!
-    private var scoreOptionsView4 : YHScoreOptionsView!
-    
-}
-
-extension YHScoreItemCellForAge {
-    func setupUI() {
-        backgroundColor = .clear
-        contentView.backgroundColor = .clear
-        
-        
-        contentView.addSubview(holdView)
-        holdView.snp.makeConstraints { make in
-            make.top.right.left.equalToSuperview()
-            make.bottom.equalToSuperview().offset(-14)
-        }
-        
-        
-        titleView = YHScoreTitleView()
-        holdView.addSubview(titleView)
-        titleView.snp.makeConstraints { make in
-            make.top.equalToSuperview()
-            make.left.equalTo(18)
-            make.right.equalTo(-18)
-            make.height.equalTo(YHScoreTitleView.viewH)
-        }
-        
-        
-        let resultView = YHScoreResultView()
-        holdView.addSubview(resultView)
-        resultView.snp.makeConstraints { make in
-            make.top.equalTo(titleView.snp.bottom)
-            make.left.equalTo(titleView.snp.left)
-            make.right.equalTo(titleView.snp.right)
-            make.height.equalTo(YHScoreTitleView.viewH)
-        }
-        
-        scoreOptionsView1 = YHScoreOptionsView()
-        holdView.addSubview(scoreOptionsView1)
-        scoreOptionsView1.snp.makeConstraints { make in
-            make.top.equalTo(resultView.snp.bottom)
-            make.left.equalTo(titleView.snp.left)
-            make.right.equalTo(titleView.snp.right)
-        }
-        
-        scoreOptionsView2 = YHScoreOptionsView()
-        holdView.addSubview(scoreOptionsView2)
-        scoreOptionsView2.snp.makeConstraints { make in
-            make.top.equalTo(scoreOptionsView1.snp.bottom)
-            make.left.equalTo(titleView.snp.left)
-            make.right.equalTo(titleView.snp.right)
-        }
-        
-        scoreOptionsView3 = YHScoreOptionsView()
-        holdView.addSubview(scoreOptionsView3)
-        scoreOptionsView3.snp.makeConstraints { make in
-            make.top.equalTo(scoreOptionsView2.snp.bottom)
-            make.left.equalTo(titleView.snp.left)
-            make.right.equalTo(titleView.snp.right)
-        }
-        
-        scoreOptionsView4 = YHScoreOptionsView()
-        holdView.addSubview(scoreOptionsView4)
-        scoreOptionsView4.snp.makeConstraints { make in
-            make.top.equalTo(scoreOptionsView3.snp.bottom)
-            make.left.equalTo(titleView.snp.left)
-            make.right.equalTo(titleView.snp.right)
-            make.bottom.equalToSuperview()
-        }
-    }
-    
-    
-    
-    func updateUI() {
-        guard let arrData = optionData?.options else {
-            return
-        }
-        titleView.updateWith(optionData?.name, optionData?.score)
-        for (index,item) in arrData.enumerated() {
-            if index == 0 {
-                scoreOptionsView1.dataModel = item
-            } else if index == 1 {
-                scoreOptionsView2.dataModel = item
-            } else if index == 2 {
-                scoreOptionsView3.dataModel = item
-            } else if index == 3 {
-                scoreOptionsView4.dataModel = item
-            }
-        }
-    }
-}

galaxy/galaxy/Classes/Tools/Helper/BsHUD/YHHUD.swift → galaxy/galaxy/Classes/Tools/Helper/YHHUD/YHHUD.swift

 //
-//  BsHUD.swift
+//  YHHUD.swift
 //  PKHUD Demo
 //
 //  Created by ahao on 2018/3/20.
@@ -76,17 +76,17 @@ class YHHUD {
         let todoView: UIView
         switch content {
         case let .progress(message):
-            todoView = BsHUDProgressView(title: message)
+            todoView = YHHUDProgressView(title: message)
         case let .success(message):
-            todoView = BsHUDSuccessView(title: message)
+            todoView = YHHUDSuccessView(title: message)
         case let .error(message):
-            todoView = BsHUDErrorView(title: message)
+            todoView = YHHUDErrorView(title: message)
         case let .warning(message):
-            todoView = BsHUDWariningView(title: message)
+            todoView = YHHUDWariningView(title: message)
         case let .rotatingImage(image, message):
-            todoView = BsHUDSquareBaseView(image: image, title: message)
+            todoView = YHHUDSquareBaseView(image: image, title: message)
         case let .image(image, message):
-            todoView = BsHUDSquareBaseView(image: image, title: message)
+            todoView = YHHUDSquareBaseView(image: image, title: message)
         }
         return todoView
     }

galaxy/galaxy/Classes/Tools/Helper/BsHUD/BsHUDContainerView.swift → galaxy/galaxy/Classes/Tools/Helper/YHHUD/YHHUDContainerView.swift

@@ -8,7 +8,7 @@
 
 import UIKit
 
-class BsHUDContainerView: UIView {
+class YHHUDContainerView: UIView {
     
     static let defaultFrame = CGRect(origin: CGPoint.zero, size: CGSize(width: 156.0, height: 156.0))
     
@@ -18,12 +18,12 @@ class BsHUDContainerView: UIView {
     init(contentView:UIView,offSet: CGFloat = 0) {
         self.contentView = contentView
         self.offSet = offSet
-        super.init(frame: BsHUDContainerView.adjustFrame(contentViewFrame: contentView.frame, offSet: offSet))
+        super.init(frame: YHHUDContainerView.adjustFrame(contentViewFrame: contentView.frame, offSet: offSet))
         addSubview(contentView)
     }
     
     func adjustFrame() -> CGRect{
-        return BsHUDContainerView.adjustFrame(contentViewFrame: contentView.frame, offSet: offSet)
+        return YHHUDContainerView.adjustFrame(contentViewFrame: contentView.frame, offSet: offSet)
     }
     
     class func adjustFrame(contentViewFrame: CGRect, offSet: CGFloat) -> CGRect{

galaxy/galaxy/Classes/Tools/Helper/BsHUD/BsHUDErrorView.swift → galaxy/galaxy/Classes/Tools/Helper/YHHUD/YHHUDErrorView.swift

 //
-//  BsHUDErrorView.swift
+//  YHHUDErrorView.swift
 //  PKHUD Demo
 //
 //  Created by ahao on 2018/3/20.
@@ -9,7 +9,7 @@
 import UIKit
 import PKHUD
 
-class BsHUDErrorView: BsHUDSquareBaseView {
+class YHHUDErrorView: YHHUDSquareBaseView {
     
     public init(title: String? = nil) {
         super.init(image: UIImage(named: "float_icon_error"), title: title)

galaxy/galaxy/Classes/Tools/Helper/BsHUD/BsHUDProgressView.swift → galaxy/galaxy/Classes/Tools/Helper/YHHUD/YHHUDProgressView.swift

 //
-//  BsHUDProgressView.swift
+//  YHHUDProgressView.swift
 //  PKHUD Demo
 //
 //  Created by ahao on 2018/4/19.
@@ -9,7 +9,7 @@
 import UIKit
 import PKHUD
 
-class BsHUDProgressView: BsHUDSquareBaseView,PKHUDAnimating {
+class YHHUDProgressView: YHHUDSquareBaseView,PKHUDAnimating {
 
     public init(title: String? = nil) {
         super.init(image:UIImage(named:"float_icon_loading"), title: title)

galaxy/galaxy/Classes/Tools/Helper/BsHUD/BsHUDRotatingImageView.swift → galaxy/galaxy/Classes/Tools/Helper/YHHUD/YHHUDRotatingImageView.swift

 //
-//  BsHUDRotatingImageView.swift
+//  YHHUDRotatingImageView.swift
 //  PKHUD Demo
 //
 //  Created by ahao on 2018/4/19.
@@ -9,7 +9,7 @@
 import UIKit
 import PKHUD
 
-class BsHUDRotatingImageView: BsHUDSquareBaseView,PKHUDAnimating {
+class YHHUDRotatingImageView: YHHUDSquareBaseView,PKHUDAnimating {
 
     public func startAnimation() {
         imageView.layer.add(PKHUDAnimation.discreteRotation, forKey: "progressAnimation")

galaxy/galaxy/Classes/Tools/Helper/BsHUD/BsHUDSquareBaseView.swift → galaxy/galaxy/Classes/Tools/Helper/YHHUD/YHHUDSquareBaseView.swift

 //
-//  BsHUDSquareBaseView.swift
+//  YHHUDSquareBaseView.swift
 //  PKHUD Demo
 //
 //  Created by ahao on 2018/4/19.
@@ -9,7 +9,7 @@
 import UIKit
 import PKHUD
 
-class BsHUDSquareBaseView: UIView {
+class YHHUDSquareBaseView: UIView {
     
     static let defaultSquareBaseViewFrame = CGRect(origin: CGPoint.zero, size: CGSize(width: 120, height: 120))
     
@@ -22,7 +22,7 @@ class BsHUDSquareBaseView: UIView {
     }
     
     init(image: UIImage? = nil, title: String? = nil) {
-        super.init(frame: BsHUDSquareBaseView.defaultSquareBaseViewFrame)
+        super.init(frame: YHHUDSquareBaseView.defaultSquareBaseViewFrame)
         backgroundColor = UIColor.black
         imageView.image = image
         titleLabel.text = title

galaxy/galaxy/Classes/Tools/Helper/BsHUD/BsHUDSuccessView.swift → galaxy/galaxy/Classes/Tools/Helper/YHHUD/YHHUDSuccessView.swift

 //
-//  BsHUDSuccessView.swift
+//  YHHUDSuccessView.swift
 //  PKHUD Demo
 //
 //  Created by ahao on 2018/3/20.
@@ -9,7 +9,7 @@
 import UIKit
 import PKHUD
 
-class BsHUDSuccessView: BsHUDSquareBaseView {
+class YHHUDSuccessView: YHHUDSquareBaseView {
     public init(title: String? = nil) {
         super.init(image: UIImage(named:"float_icon_success"), title: title)
     }

galaxy/galaxy/Classes/Tools/Helper/BsHUD/BsHUDWariningView.swift → galaxy/galaxy/Classes/Tools/Helper/YHHUD/YHHUDWariningView.swift

 //
-//  BsHUDWariningView.swift
+//  YHHUDWariningView.swift
 //  PKHUD Demo
 //
 //  Created by ahao on 2018/4/19.
@@ -8,7 +8,7 @@
 
 import UIKit
 
-class BsHUDWariningView: BsHUDSquareBaseView {
+class YHHUDWariningView: YHHUDSquareBaseView {
 
     public init(title: String? = nil) {
         super.init(image: UIImage(named:"float_icon_caveat"), title: title)