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

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -10,6 +10,7 @@
 		041B52872B5657B3007EBCEB /* IMAppKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B52862B5657B3007EBCEB /* IMAppKey.swift */; };
 		0435FA7F2BA178C100024EAE /* YHCommonAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0435FA7E2BA178C100024EAE /* YHCommonAlertView.swift */; };
 		0435FA812BA186D600024EAE /* YHMyFileMethodTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0435FA802BA186D600024EAE /* YHMyFileMethodTableViewCell.swift */; };
+		0435FA832BA2DEB100024EAE /* YHCardButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0435FA822BA2DEB100024EAE /* YHCardButton.swift */; };
 		044867B42BA1953B00DFAD4A /* YHCertificateFilterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044867B32BA1953B00DFAD4A /* YHCertificateFilterView.swift */; };
 		044867B62BA1A03800DFAD4A /* YHCertificateFilterItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044867B52BA1A03800DFAD4A /* YHCertificateFilterItemCell.swift */; };
 		044867B82BA1C75700DFAD4A /* YHCertificateUploadFailTipsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044867B72BA1C75700DFAD4A /* YHCertificateUploadFailTipsView.swift */; };
@@ -307,6 +308,7 @@
 		A5C5B32D2B57D66000A7C5D1 /* YHBbxCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5C5B32C2B57D66000A7C5D1 /* YHBbxCollectionViewCell.swift */; };
 		A5D6AB1B2B46A1CC001C10A5 /* YHHomeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D6AB1A2B46A1CC001C10A5 /* YHHomeModel.swift */; };
 		A5D6AB1D2B46AAFB001C10A5 /* YHHomePageViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D6AB1C2B46AAFB001C10A5 /* YHHomePageViewModel.swift */; };
+		A5E69D512BA304D400411932 /* DIN Alternate Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */; };
 		A5F8AC082B9F414000A21EFA /* YHCustomTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5F8AC072B9F414000A21EFA /* YHCustomTextView.swift */; };
 		A5FD63BD2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63BC2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift */; };
 		A5FD63BF2B6250BC00D1D9DA /* YHInformationPerfectCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63BE2B6250BC00D1D9DA /* YHInformationPerfectCell.swift */; };
@@ -353,6 +355,7 @@
 		041B52862B5657B3007EBCEB /* IMAppKey.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IMAppKey.swift; sourceTree = "<group>"; };
 		0435FA7E2BA178C100024EAE /* YHCommonAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCommonAlertView.swift; sourceTree = "<group>"; };
 		0435FA802BA186D600024EAE /* YHMyFileMethodTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyFileMethodTableViewCell.swift; sourceTree = "<group>"; };
+		0435FA822BA2DEB100024EAE /* YHCardButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCardButton.swift; sourceTree = "<group>"; };
 		044867B32BA1953B00DFAD4A /* YHCertificateFilterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateFilterView.swift; sourceTree = "<group>"; };
 		044867B52BA1A03800DFAD4A /* YHCertificateFilterItemCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateFilterItemCell.swift; sourceTree = "<group>"; };
 		044867B72BA1C75700DFAD4A /* YHCertificateUploadFailTipsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateUploadFailTipsView.swift; sourceTree = "<group>"; };
@@ -655,6 +658,7 @@
 		A5C5B32C2B57D66000A7C5D1 /* YHBbxCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBbxCollectionViewCell.swift; sourceTree = "<group>"; };
 		A5D6AB1A2B46A1CC001C10A5 /* YHHomeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeModel.swift; sourceTree = "<group>"; };
 		A5D6AB1C2B46AAFB001C10A5 /* YHHomePageViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomePageViewModel.swift; sourceTree = "<group>"; };
+		A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "DIN Alternate Bold.ttf"; sourceTree = "<group>"; };
 		A5F8AC072B9F414000A21EFA /* YHCustomTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHCustomTextView.swift; sourceTree = "<group>"; };
 		A5FD63BC2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInformationPerfectListVC.swift; sourceTree = "<group>"; };
 		A5FD63BE2B6250BC00D1D9DA /* YHInformationPerfectCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInformationPerfectCell.swift; sourceTree = "<group>"; };
@@ -1267,6 +1271,7 @@
 				045EEE762B9F171A0022A143 /* YHItemView.swift */,
 				045EEE772B9F171A0022A143 /* YHStepView.swift */,
 				045EEE782B9F171A0022A143 /* YHMainInformationCardTableViewCell.swift */,
+				0435FA822BA2DEB100024EAE /* YHCardButton.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -1630,6 +1635,7 @@
 		A5ACE9142B4564F7002C94D2 /* Res */ = {
 			isa = PBXGroup;
 			children = (
+				A5E69D4F2BA304D400411932 /* Font */,
 				A5C5B2ED2B4F9B8800A7C5D1 /* Localizable.xcstrings */,
 				04808C022B4686510056D53C /* Frameworks */,
 				A5573EDA2B317C0000D98EC0 /* Assets.xcassets */,
@@ -1802,6 +1808,14 @@
 			path = VM;
 			sourceTree = "<group>";
 		};
+		A5E69D4F2BA304D400411932 /* Font */ = {
+			isa = PBXGroup;
+			children = (
+				A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */,
+			);
+			path = Font;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -1920,6 +1934,7 @@
 				045EEF182B9F171A0022A143 /* area.plist in Resources */,
 				A51044182B493675006B60BB /* README.md in Resources */,
 				A5573EDB2B317C0000D98EC0 /* Assets.xcassets in Resources */,
+				A5E69D512BA304D400411932 /* DIN Alternate Bold.ttf in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2259,6 +2274,7 @@
 				A5C5B32B2B57D17600A7C5D1 /* YHDavidCell5.swift in Sources */,
 				045EEEB82B9F171A0022A143 /* YHWorkExampleMessageView.swift in Sources */,
 				045EEEA22B9F171A0022A143 /* YHWorkExperienceProjectModel.swift in Sources */,
+				0435FA832BA2DEB100024EAE /* YHCardButton.swift in Sources */,
 				045EEECA2B9F171A0022A143 /* YHMyDocumentsListViewController.swift in Sources */,
 				04E86E0B2B70C13300A35F4B /* YHCodeSueecssViewController.swift in Sources */,
 				045EEF052B9F171A0022A143 /* YHFormItemExpireDateCell.swift in Sources */,

galaxy/galaxy/AppDelegate.swift

@@ -44,7 +44,17 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         YHLoginManager.shared.loadLocalUserInfoData()
         
         //        YHAnalytics.analyticsStart(launchOptions: launchOptions)
-
+        
+        
+//        var i = 0
+//        for family: String in UIFont.familyNames {
+//            print("\(i)---项目字体---\(family)")
+//            for names: String in UIFont.fontNames(forFamilyName: family) {
+//                print("== \(names)")
+//            }
+//            i += 1
+//        }
+        
         return true
     }
     
@@ -71,7 +81,7 @@ extension AppDelegate {
             
             //1.数据解析
 #if DEBUG
-//            SmartConfig.debugMode = .verbose
+            //            SmartConfig.debugMode = .verbose
             SmartConfig.debugMode = .none //for test hjl
 #else
             SmartConfig.debugMode = .none
@@ -124,7 +134,7 @@ extension AppDelegate {
         let tabBarController = YHTabBarViewController()
         let v0 = YHNavigationController(rootVC:YHHomeViewController())
         
-//        let v0 = YHNavigationController(rootVC:YHPersonInformMainViewController())//for test hjl
+        //        let v0 = YHNavigationController(rootVC:YHPersonInformMainViewController())//for test hjl
         
         let v1 = YHNavigationController(rootVC:YHServiceCenterMainViewController())
         let v2 = YHNavigationController(rootVC:YHMyViewController())
@@ -133,7 +143,7 @@ extension AppDelegate {
         v1.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "服务中心", image: UIImage(named: "home"), selectedImage: UIImage(named: "home_1"))
         v2.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "我的", image: UIImage(named: "find"), selectedImage: UIImage(named: "find_1"))
         tabBarController.viewControllers = [v0,v1,v2]
-//        tabBarController.viewControllers = [v1,v2] for test hjl  配合测试同学做自动化测试 Moon 2023.03.12
+        //        tabBarController.viewControllers = [v1,v2] for test hjl  配合测试同学做自动化测试 Moon 2023.03.12
         tabBarController.tabBar.backgroundColor = .white
         
         window = UIWindow(frame: UIScreen.main.bounds)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/C/YHMainApplicantInformationViewController.swift

@@ -21,6 +21,8 @@ class YHMainApplicantInformationViewController: YHBaseViewController {
         super.viewDidLoad()
         viewModel = YHMainApplicantInformationViewModel()
         gk_navTitle = "主申请人信息填写"
+        gk_navBackgroundColor = .white
+        gk_navBarAlpha = 1
         setView()
         getData()
         // Do any additional setup after loading the view.
@@ -68,7 +70,7 @@ class YHMainApplicantInformationViewController: YHBaseViewController {
         }
         
         tableView = {
-            let tableView = UITableView(frame:.zero, style:.plain)
+            let tableView = UITableView(frame:.zero, style:.grouped)
             if #available(iOS 11.0, *) {
                 tableView.contentInsetAdjustmentBehavior = .never
             }
@@ -194,4 +196,21 @@ extension YHMainApplicantInformationViewController: UITableViewDelegate, UITable
             return CGFloat(h + 52 + 14)
         }
     }
+    
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        let view = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 7))
+        return view
+    }
+    
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return 7
+    }
+    
+    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/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHAddressPicker/YHAddressPickViewTableViewCell.swift

@@ -13,9 +13,9 @@ class YHAddressPickViewTableViewCell: UITableViewCell {
     static let identifier = "YHAddressPickViewTableViewCell"
 
     let label: UILabel = {
-        let label = UILabel(frame: CGRect(x: 42, y: 8, width: 200, height: 24))
-        label.font = UIFont.systemFont(ofSize: 14)
-        label.textColor = UIColor(red: 51/255, green: 51/255, blue: 51/255, alpha: 1)
+        let label = UILabel(frame: CGRect(x: 20, y: 8, width: 200, height: 24))
+        label.font = UIFont.PFSC_R(ofSize: 14)
+        label.textColor = UIColor.mainTextColor
         return label
     }()
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
@@ -36,9 +36,9 @@ class YHAddressPickViewFirstTableViewCell: UITableViewCell {
     static let identifier = "YHAddressPickViewFirstTableViewCell"
 
     let label: UILabel = {
-        let label = UILabel(frame: CGRect(x: 24, y: 11.5, width: 100, height: 17))
-        label.font = UIFont.systemFont(ofSize: 12)
-        label.textColor = UIColor(red: 102/255, green: 102/255, blue: 102/255, alpha: 1)
+        let label = UILabel(frame: CGRect(x: 20, y: 11.5, width: 100, height: 17))
+        label.font = UIFont.PFSC_M(ofSize: 14)
+        label.textColor = UIColor.mainTextColor
         return label
     }()
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHAddressPicker/YHAddressViewController.swift

@@ -32,7 +32,7 @@ class YHAddressViewController: UIViewController {
     public var selectCity: String?
 
     public lazy var containV: YHAddressPickView = {
-        let view = YHAddressPickView(frame: CGRect(x: 0, y: UIScreen.main.bounds.height - 550, width: UIScreen.main.bounds.width, height: 550),selectColor: selectColor,selectedProvince: selectProvince,selectedCity: selectCity)
+        let view = YHAddressPickView(frame: CGRect(x: 0, y: UIScreen.main.bounds.height - 628, width: UIScreen.main.bounds.width, height: 628),selectColor: selectColor,selectedProvince: selectProvince,selectedCity: selectCity)
         view.backOnClickCancel = {
             [weak self] in
             self?.onClickCancel()
@@ -44,6 +44,7 @@ class YHAddressViewController: UIViewController {
                 self?.onClickCancel()
             }
         }
+        view.layer.cornerRadius = kCornerRadius8
         return view
     }()
     public var backgroundView:UIView = {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHCardButton.swift

+//
+//  YHCardButton.swift
+//  galaxy
+//
+//  Created by EDY on 2024/3/14.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHCardButton: UIButton {
+
+    var topImageView: UIImageView!
+    var bottomTitleLabel: UILabel!
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        setView()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func setView() {
+        topImageView = {
+            let view = UIImageView()
+            return view
+        }()
+        addSubview(topImageView)
+        topImageView.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.top.equalTo(22)
+            make.width.height.equalTo(24)
+        }
+        
+        bottomTitleLabel = {
+            let label = UILabel()
+            label.font = UIFont.PFSC_M(ofSize: 12)
+            label.textAlignment = .center
+            label.textColor = UIColor.brandMainColor
+            return label
+        }()
+        addSubview(bottomTitleLabel)
+        bottomTitleLabel.snp.makeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.height.equalTo(20)
+            make.bottom.equalTo(-15)
+        }
+    }
+    
+    func setContent(_ image: String, _ title: String) {
+        topImageView.removeFromSuperview()
+        topImageView = nil
+        topImageView = {
+            let view = UIImageView()
+            return view
+        }()
+        addSubview(topImageView)
+        topImageView.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.top.equalTo(22)
+            make.width.height.equalTo(24)
+        }
+        bottomTitleLabel.text = title
+        topImageView.image = UIImage(named: image)
+    }
+    
+    // 开始旋转动画的函数
+    func startRotationAnimation() {
+        let rotationAnimation = CAKeyframeAnimation(keyPath: "transform.rotation")
+        rotationAnimation.values = [0, Double.pi / 2, Double.pi, 3 * Double.pi / 2, 2 * Double.pi]
+        rotationAnimation.duration = 1
+        rotationAnimation.repeatCount = Float.infinity
+        topImageView.layer.add(rotationAnimation, forKey: "rotationAnimation")
+    }
+ 
+    // 停止旋转动画的函数
+    func stopRotationAnimation() {
+        topImageView.removeFromSuperview()
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHCardExampleView.swift

@@ -74,7 +74,7 @@ class YHCardExampleView: UIView {
             label.text = "身份证示例模板"
             label.font = UIFont.PFSC_M(ofSize: 17)
             label.textColor = UIColor.mainTextColor
-            label.textAlignment = .left
+            label.textAlignment = .center
             return label
         }()
         centerView.addSubview(titleLabel)
@@ -130,6 +130,8 @@ class YHCardExampleView: UIView {
         topImageView = {
             let imageView = UIImageView()
             imageView.image = UIImage(named: "service_card_id_back")
+            imageView.layer.cornerRadius = kCornerRadius6
+            imageView.clipsToBounds = true
             return imageView
         }()
         centerView.addSubview(topImageView)
@@ -143,6 +145,8 @@ class YHCardExampleView: UIView {
         bottomImageView = {
             let imageView = UIImageView()
             imageView.image = UIImage(named: "service_card_passport_back")
+            imageView.layer.cornerRadius = kCornerRadius6
+            imageView.clipsToBounds = true
             return imageView
         }()
         centerView.addSubview(bottomImageView)
@@ -161,6 +165,7 @@ class YHCardExampleView: UIView {
             button.setTitle("知道了", for: .normal)
             button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
             button.layer.cornerRadius = kCornerRadius6
+            button.clipsToBounds = true
             button.addTarget(self, action: #selector(dismiss), for: .touchUpInside)
             return button
         }()
@@ -171,6 +176,9 @@ class YHCardExampleView: UIView {
             make.bottom.equalTo(-42)
             make.height.equalTo(48)
         }
+        bottomButton.layoutIfNeeded()
+        
+        bottomButton.addYinHeGradualLayer()
         
         let array = ["四角完整", "照片清晰", "亮度均匀"]
         for i in 0 ..< array.count {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHImagePickerView.swift

@@ -228,7 +228,7 @@ extension YHImagePickerView: UIGestureRecognizerDelegate {
 extension YHImagePickerView: UINavigationControllerDelegate, UIImagePickerControllerDelegate {
     func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey : Any]) {
         if let image = info[UIImagePickerController.InfoKey.originalImage] as? UIImage {
-            uploadImage(image: image)
+//            uploadImage(image: image)
             if let block = backImage {
                 block(image)
                 self.dismiss()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHItemView.swift

@@ -273,6 +273,14 @@ class YHItemView: UIView {
         if dataSource.isShowPrompts ?? false {
             if dataSource.message?.count != 0 {
                 showPromptLabel.isHidden = true
+                
+                //特殊处理身份证
+                if dataSource.id == .id8 {
+                    if let message = dataSource.message,message.count == 18 {
+                    } else {
+                        showPromptLabel.isHidden = false
+                    }
+                }
             } else {
                 showPromptLabel.isHidden = false
             }
@@ -280,6 +288,7 @@ class YHItemView: UIView {
             showPromptLabel.isHidden = true
         }
         
+        
         if dataSource.id == .id11 || dataSource.id == .id15 || dataSource.id == .id20 {
             longTimeButton.isHidden = false
             nextStepImageView.isHidden = true
@@ -489,7 +498,7 @@ extension YHItemView: UITextFieldDelegate {
             return false
         }
         
-        if (dataSource?.id == .id8) && newText.count > 20 {
+        if (dataSource?.id == .id8) && newText.count > 18 {
             return false
         }
             
@@ -498,7 +507,9 @@ extension YHItemView: UITextFieldDelegate {
         }
         
         if dataSource?.id == .id23 {
-            newText = newText.uppercased()
+            let regex = "[^A-Za-z]+"
+            textField.limitInputWithPattern(pattern:regex, 30)
+            newText = textField.text!.uppercased()
         }
         
         var data = dataSource ?? YHItemModel()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHStepView.swift

@@ -27,14 +27,22 @@ class YHStepView: UIScrollView {
     var stepSpace: CGFloat = 6
     var lineWidth: CGFloat {
         guard let dataSource = dataSource else { return 0 }
+        let lineCount = dataSource.count - 1
         if dataSource.count <= 2 {
-            return 157
+            let contentWidth = 89 * 2 + Int(stepSpace) * 2 * lineCount + 14 * dataSource.count
+            let width = (KScreenWidth - CGFloat(contentWidth)) / lineCount.cgFloat
+            return width
         } else if dataSource.count <= 4 {
-            return 75
+            let contentWidth = 43 * 2 + Int(stepSpace) * 2 * lineCount + 14 * dataSource.count
+            let width = (KScreenWidth - CGFloat(contentWidth)) / lineCount.cgFloat
+            return width
         } else {
-            return 55
+            let contentWidth = 43 * 2 + Int(stepSpace) * 2 * 3 + 14 * 4
+            let width = (KScreenWidth - CGFloat(contentWidth)) / lineCount.cgFloat
+            return width
         }
     }
+    
     var spaceWidth: CGFloat {
         guard let dataSource = dataSource else { return 0 }
         if dataSource.count <= 2 {
@@ -63,9 +71,10 @@ class YHStepView: UIScrollView {
             button.tag = 1000 + i
             button.addTarget(self, action: #selector(buttonClick(_:)), for: .touchUpInside)
             addSubview(button)
+            printLog("\(lineWidth)")
             button.snp.makeConstraints { make in
                 make.top.equalTo(28)
-                make.left.equalTo(spaceWidth + i.cgFloat * (lineWidth + stepSpace * 2 + 14))
+                make.left.equalTo(spaceWidth + i.cgFloat * (lineWidth + stepSpace * 2) + 14 * i.cgFloat)
                 make.width.height.equalTo(14)
             }
             button.YH_clickEdgeInsets = UIEdgeInsets(top: 50, left: 50, bottom: 50, right: 50)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/VM/YHMainApplicantInformationViewModel.swift

@@ -38,7 +38,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
         let item22 = YHItemModel(id: .id33, isNeed: true, title: "是否在海外居住一年及以上", isUserKeyBoard: false, prompts: "", message: "\(mainModel.is_live_oversea_year)", leftButtonString: "是", rightButtonString: "否", isShowPrompts: isShowPrompt, alertMessage:"请选择是否在海外居住满1年及以上")
         let section1 = YHSectionItemModel(title: "现居住地址", models: [item4, item1, item2])
         let section11 = YHSectionItemModel(title: "现居住地址", models: [item4, item11, item22])
-        let item3 = YHItemModel(id: .id5, isNeed: true, title: "是否办理", isUserKeyBoard: false, prompts: "", message: "\(mainModel.is_handled)", leftButtonString: "是", rightButtonString: "否", isShowPrompts: isShowPrompt, alertMessage:"请选择是否办理过港澳通行证")
+        let item3 = YHItemModel(id: .id5, isNeed: true, title: "是否办理过", isUserKeyBoard: false, prompts: "", message: "\(mainModel.is_handled)", leftButtonString: "是", rightButtonString: "否", isShowPrompts: isShowPrompt, alertMessage:"请选择是否办理过港澳通行证")
         let section2 = YHSectionItemModel(title: "港澳通行证", models: [item3])
         let addressCountry = mainModel.address.country
         if addressCountry.contains("中国") {
@@ -472,6 +472,8 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
             let passport_issue_date_start_at = mainModel.certificates.passport.issue_date_start_at
             let passport_issue_date_end_at = mainModel.certificates.passport.issue_date_end_at
             let nationality = mainModel.nationality
+            
+            
             if self.mainModel.is_handled == 1 {
                 guard hk_macao_pass_number.count > 0 else { return false }
                 guard hk_macao_pass_issue_at.count > 0 else { return false }
@@ -479,7 +481,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
                 guard hk_macao_pass_issue_date_end_at.count > 0 else { return false }
             }
             if nationality.contains("中国") {
-                guard cn_identity_card_number.count > 0 else { return false }
+                guard cn_identity_card_number.count == 18 else { return false }
                 guard cn_identity_card_issue_at.count > 0 else { return false }
                 guard cn_identity_card_issue_date_start_at.count > 0 else { return false }
                 guard cn_identity_card_issue_date_end_at.count > 0 else { return false }
@@ -498,7 +500,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
             let birth_place_area = mainModel.birth_place.area
             let birth_place_foreign = mainModel.birth_place.foreign
             let sex = mainModel.sex 
-            let married = mainModel.married 
+            _ = mainModel.married 
             let mobile = mainModel.mobile 
             let email = mainModel.email 
             let has_hk_id = mainModel.has_hk_id 

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主申请人/service_card_back.imageset/Contents.json → galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主申请人/address_close.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "service_card_back@2x.png",
+      "filename" : "address_close@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "service_card_back@3x.png",
+      "filename" : "address_close@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主申请人/service_card_front.imageset/Contents.json → galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主申请人/card_loading.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "service_card_front@2x.png",
+      "filename" : "card_loading@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "service_card_front@3x.png",
+      "filename" : "card_loading@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主申请人/card_upload.imageset/Contents.json

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

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主申请人/service_cn_card_back.imageset/Contents.json

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

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主申请人/service_cn_card_front.imageset/Contents.json

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

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主申请人/service_hk_card_back.imageset/Contents.json

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

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主申请人/service_hk_card_front.imageset/Contents.json

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

galaxy/galaxy/Res/Info.plist

@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>UIAppFonts</key>
+	<array>
+		<string>DIN Alternate Bold</string>
+	</array>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>