学历/专业资格 完成

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHInformationPerfectListVC.swift

@@ -147,7 +147,7 @@ extension YHInformationPerfectListVC {
     
     @objc func goInfoListVC() {
         //个人信息表
-        let vc = YHPersonInformMainViewController()
+        let vc = YHPreviewMainViewController()
         vc.orderId = orderId
         navigationController?.pushViewController(vc)
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/C/YHPreviewAcademicAndProfessionalQualificationViewController.swift

+//
+//  YHPreviewAcademicAndProfessionalQualificationViewController.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/2/29.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+/*
+ *学历/专业资格 预览
+ */
+class YHPreviewAcademicAndProfessionalQualificationViewController: YHPreviewBaseViewController {
+    var arrData : [YHPreviewInfoSessionModel] = []
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        setupUI()
+    }
+    
+    
+}
+
+private extension YHPreviewAcademicAndProfessionalQualificationViewController {
+    func installData() {
+      
+        do {
+            //主申请人学历1
+            let tmp0 = YHPreviewQuestionAndAnswerModel(question: "主申请人学历：", answer: "主申请人学历主申请人学历")
+            let tmp1 = YHPreviewQuestionAndAnswerModel(question: "授课形式：", answer: "授课形式")
+            let tmp2 = YHPreviewQuestionAndAnswerModel(question: "入学年月：", answer: "入学年月")
+            
+            let tmp3 = YHPreviewQuestionAndAnswerModel(question: "毕业年月：", answer: "1990年8月18日")
+            let tmp4 = YHPreviewQuestionAndAnswerModel(question: "专业：", answer: "专业")
+            let tmp5 = YHPreviewQuestionAndAnswerModel(question: "学位：", answer: "学位")
+            let tmp6 = YHPreviewQuestionAndAnswerModel(question: "学位类型：", answer: "学位类型")
+            let tmp7 = YHPreviewQuestionAndAnswerModel(question: "上课地点：", answer: "上课地点上课地点")
+            
+            let arr = [tmp0,tmp1,tmp2,tmp3,tmp4,tmp5,tmp6,tmp7]
+            let model2 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "主申请人学历1", cellData0: arr)
+            arrData.append(model2)
+        }
+        
+        
+        do {
+            //主申请人学历2
+            let tmp0 = YHPreviewQuestionAndAnswerModel(question: "主申请人学历：", answer: "主申请人学历主申请人学历")
+            let tmp1 = YHPreviewQuestionAndAnswerModel(question: "授课形式：", answer: "授课形式")
+            let tmp2 = YHPreviewQuestionAndAnswerModel(question: "入学年月：", answer: "入学年月")
+            
+            let tmp3 = YHPreviewQuestionAndAnswerModel(question: "毕业年月：", answer: "1990年8月18日")
+            let tmp4 = YHPreviewQuestionAndAnswerModel(question: "专业：", answer: "专业")
+            let tmp5 = YHPreviewQuestionAndAnswerModel(question: "学位：", answer: "学位")
+            let tmp6 = YHPreviewQuestionAndAnswerModel(question: "学位类型：", answer: "学位类型")
+            let tmp7 = YHPreviewQuestionAndAnswerModel(question: "上课地点：", answer: "上课地点上课地点")
+            
+            let arr = [tmp0,tmp1,tmp2,tmp3,tmp4,tmp5,tmp6,tmp7]
+            let model2 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "主申请人学历2", cellData0: arr)
+            arrData.append(model2)
+        }
+        
+        
+        
+        do {
+            //主申请人专业资格及会员资格1
+            let tmp0 = YHPreviewQuestionAndAnswerModel(question: "资格证书名称：", answer: "资格证书名称")
+            let tmp1 = YHPreviewQuestionAndAnswerModel(question: "颁授机构全称：", answer: "颁授机构全称：")
+            let tmp2 = YHPreviewQuestionAndAnswerModel(question: "颁授年份：", answer: "颁授年份：")
+            
+            let tmp3 = YHPreviewQuestionAndAnswerModel(question: "颁授城市：", answer: "颁授城市：颁授城市：")
+            
+            let arr = [tmp0,tmp1,tmp2,tmp3]
+            let model2 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "主申请人专业资格及会员资格1", cellData0: arr)
+            arrData.append(model2)
+        }
+        
+        
+        do {
+            //主申请人专业资格及会员资格2
+            let tmp0 = YHPreviewQuestionAndAnswerModel(question: "资格证书名称：", answer: "资格证书名称")
+            let tmp1 = YHPreviewQuestionAndAnswerModel(question: "颁授机构全称：", answer: "颁授机构全称：")
+            let tmp2 = YHPreviewQuestionAndAnswerModel(question: "颁授年份：", answer: "颁授年份：")
+            
+            let tmp3 = YHPreviewQuestionAndAnswerModel(question: "颁授城市：", answer: "颁授城市：颁授城市：")
+            
+            let arr = [tmp0,tmp1,tmp2,tmp3]
+            let model2 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "主申请人专业资格及会员资格2", cellData0: arr)
+            arrData.append(model2)
+        }
+        
+        
+        
+        do {
+            //主申请人
+            let tmp0 = YHPreviewQuestionAndAnswerModel(question: "1、您的所有学历及资格证书的姓名及出生日期，是否与身份证完全一致？（例如：身份证上是【张四】，学位证上是【张三】，则为不同", answer: "是")
+            
+            let tmp1 = YHPreviewQuestionAndAnswerModel(question: "2、您配偶的大学毕业证和学位证上的姓名及出生日期，是否与身份证完全一致？", answer: "否")
+            let arr = [tmp0,tmp1]
+            let model1 = YHPreviewInfoSessionModel(cellType: .questionAndAnswer, cellTitle: "学历证书姓名及出生日期正确性", cellData0: arr)
+            arrData.append(model1)
+        }
+        
+        
+        
+    }
+    
+    func setupUI() {
+        installData()
+        
+        self.homeTableView.register(YHPreviewInfoCell.self,forCellReuseIdentifier: YHPreviewInfoCell.cellReuseIdentifier)
+        self.homeTableView.reloadData()
+    }
+}
+
+
+
+// MARK: - UITableViewDelegate 和 UITableViewDataSource
+extension YHPreviewAcademicAndProfessionalQualificationViewController {
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return arrData.count
+    }
+    
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withClass: YHPreviewInfoCell.self)
+        cell.selectionStyle = .none
+        cell.model = arrData[indexPath.row]
+        return cell
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/C/YHPersonInfoBaseViewController.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/C/YHPreviewBaseViewController.swift

@@ -9,7 +9,7 @@
 import UIKit
 import JXSegmentedView
 
-class YHPersonInfoBaseViewController: YHBaseViewController {
+class YHPreviewBaseViewController: YHBaseViewController {
 
     public var homeTableView: YHGestureTableView = {
         let tableView = YHGestureTableView(frame: .zero, style: .grouped)
@@ -53,7 +53,7 @@ class YHPersonInfoBaseViewController: YHBaseViewController {
 
 
 // MARK: - 滑动使用
-extension YHPersonInfoBaseViewController: UIScrollViewDelegate {
+extension YHPreviewBaseViewController: UIScrollViewDelegate {
     //控制滑动交互
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
         let scrollViewSet: CGFloat = scrollView.contentOffset.y
@@ -72,7 +72,7 @@ extension YHPersonInfoBaseViewController: UIScrollViewDelegate {
 }
 
 // MARK: - JXSegmentedListContainerViewListDelegate
-extension YHPersonInfoBaseViewController: JXSegmentedListContainerViewListDelegate {
+extension YHPreviewBaseViewController: JXSegmentedListContainerViewListDelegate {
     func listView() -> UIView {
         return view
     }
@@ -81,7 +81,7 @@ extension YHPersonInfoBaseViewController: JXSegmentedListContainerViewListDelega
 
 
 // MARK: - UITableViewDelegate 和 UITableViewDataSource
-extension YHPersonInfoBaseViewController : UITableViewDelegate,UITableViewDataSource {
+extension YHPreviewBaseViewController : UITableViewDelegate,UITableViewDataSource {
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return 0
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/C/YHPreviewBasiceInformationViewController.swift

@@ -10,7 +10,7 @@ import UIKit
 /*
  *基本资料信息 预览
  */
-class YHPreviewBasiceInformationViewController: YHPersonInfoBaseViewController {
+class YHPreviewBasiceInformationViewController: YHPreviewBaseViewController {
     var arrData : [YHPreviewInfoSessionModel] = []
     override func viewDidLoad() {
         super.viewDidLoad()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/C/YHPersonInfoControllerHoldViewController.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/C/YHPreviewControllerHoldViewController.swift

@@ -9,7 +9,7 @@
 import UIKit
 import JXSegmentedView
 
-class YHPersonInfoControllerHoldViewController: UIViewController {
+class YHPreviewControllerHoldViewController: UIViewController {
     
     var canScroll : Bool = false {
         didSet {
@@ -20,7 +20,7 @@ class YHPersonInfoControllerHoldViewController: UIViewController {
     }
     
     let arrItemTitles = ["主申请人信息","家庭成员信息","基本资料","学历/专业资格","工作经验","其他信息"]
-    var arrItemVCs : [YHPersonInfoBaseViewController] = []
+    var arrItemVCs : [YHPreviewBaseViewController] = []
     var segmentedView : JXSegmentedView = JXSegmentedView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 55))
     lazy var segmentedDataSource: JXSegmentedBaseDataSource = {
         let dataSource = JXSegmentedTitleDataSource()
@@ -50,11 +50,11 @@ class YHPersonInfoControllerHoldViewController: UIViewController {
         
         do {
             //主申请人
-            let vc = YHMainApplicantInfoPreviewViewController()
+            let vc = YHPreviewMainApplicantInfoViewController()
             arrItemVCs.append(vc)
         }
         do {
-            
+            //家庭成员信息
             let vc = YHPreviewFamilyMemberViewController()
             arrItemVCs.append(vc)
         }
@@ -64,7 +64,8 @@ class YHPersonInfoControllerHoldViewController: UIViewController {
             arrItemVCs.append(vc)
         }
         do {
-            let vc = YHPreviewFamilyMemberViewController()
+            //学历/专业资格
+            let vc = YHPreviewAcademicAndProfessionalQualificationViewController()
             arrItemVCs.append(vc)
         }
         do {
@@ -133,7 +134,7 @@ class YHPersonInfoControllerHoldViewController: UIViewController {
     }
 }
 
-extension YHPersonInfoControllerHoldViewController: JXSegmentedViewDelegate {
+extension YHPreviewControllerHoldViewController: JXSegmentedViewDelegate {
     func segmentedView(_ segmentedView: JXSegmentedView, didSelectedItemAt index: Int) {
         NotificationCenter.default.post(name:  Notification.Name(rawValue: "scrollViewDidEndDragging0"), object: nil)
     }
@@ -150,7 +151,7 @@ extension YHPersonInfoControllerHoldViewController: JXSegmentedViewDelegate {
     }
 }
 
-extension YHPersonInfoControllerHoldViewController: JXSegmentedListContainerViewDataSource {
+extension YHPreviewControllerHoldViewController: JXSegmentedListContainerViewDataSource {
     func numberOfLists(in listContainerView: JXSegmentedListContainerView) -> Int {
         if let titleDataSource = segmentedView.dataSource as? JXSegmentedBaseDataSource {
             return titleDataSource.dataSource.count

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/C/YHPreviewFamilyMemberViewController.swift

@@ -10,7 +10,7 @@ import UIKit
 /*
  *家庭成员信息 预览
  */
-class YHPreviewFamilyMemberViewController: YHPersonInfoBaseViewController {
+class YHPreviewFamilyMemberViewController: YHPreviewBaseViewController {
     var arrData : [YHPreviewInfoSessionModel] = [] //用于数据展示
     
     var arrDataForParents : [YHPreviewInfoSessionModel] = []

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/C/YHMainApplicantInfoPreviewViewController.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/C/YHPreviewMainApplicantInfoViewController.swift

@@ -10,7 +10,7 @@ import UIKit
 /*
  *主申请人信息 预览
  */
-class YHMainApplicantInfoPreviewViewController: YHPersonInfoBaseViewController {
+class YHPreviewMainApplicantInfoViewController: YHPreviewBaseViewController {
     var arrData : [YHPreviewInfoSessionModel] = []
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -20,7 +20,7 @@ class YHMainApplicantInfoPreviewViewController: YHPersonInfoBaseViewController {
     
 }
 
-private extension YHMainApplicantInfoPreviewViewController {
+private extension YHPreviewMainApplicantInfoViewController {
     func installData() {
         do {
             //国家信息
@@ -106,7 +106,7 @@ private extension YHMainApplicantInfoPreviewViewController {
 
 
 // MARK: - UITableViewDelegate 和 UITableViewDataSource
-extension YHMainApplicantInfoPreviewViewController {
+extension YHPreviewMainApplicantInfoViewController {
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return arrData.count
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/C/YHPersonInformMainViewController.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/C/YHPreviewMainViewController.swift

 //
-//  YHPersonInformationViewController.swift
+//  YHPreviewMainViewController.swift
 //  galaxy
 //
 //  Created by davidhuangA on 2024/1/29.
@@ -9,7 +9,7 @@
 import UIKit
 import GKNavigationBarSwift
 
-class YHPersonInformMainViewController: YHBaseViewController {
+class YHPreviewMainViewController: YHBaseViewController {
     var orderId : Int?
     
     var canScroll : Bool = true
@@ -19,7 +19,7 @@ class YHPersonInformMainViewController: YHBaseViewController {
         }
     }
     
-    let cellView: YHPersonInfoControllerHoldViewController = YHPersonInfoControllerHoldViewController()
+    let cellView: YHPreviewControllerHoldViewController = YHPreviewControllerHoldViewController()
     
     var homeTableView: YHGestureTableView = {
         let tableView = YHGestureTableView(frame: .zero, style: .grouped)
@@ -97,7 +97,7 @@ class YHPersonInformMainViewController: YHBaseViewController {
 }
 
 // MARK: - 私有方法
-extension YHPersonInformMainViewController {
+extension YHPreviewMainViewController {
     
     @objc func leaveTopOp() {
         canScroll = true
@@ -212,7 +212,7 @@ extension YHPersonInformMainViewController {
 }
 
 // MARK: - UITableViewDelegate 和 UITableViewDataSource
-extension YHPersonInformMainViewController : UITableViewDelegate,UITableViewDataSource {
+extension YHPreviewMainViewController : UITableViewDelegate,UITableViewDataSource {
     
     func numberOfSections(in tableView: UITableView) -> Int {
         return 1
@@ -258,7 +258,7 @@ extension YHPersonInformMainViewController : UITableViewDelegate,UITableViewData
     }
 }
 
-extension YHPersonInformMainViewController: UIScrollViewDelegate {
+extension YHPreviewMainViewController: UIScrollViewDelegate {
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
         let bottomCellOffset: CGFloat = homeTableView.rect(forSection: 0).origin.y
         if (scrollView.contentOffset.y >= bottomCellOffset) {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/C/YHPreviewOtherInformationViewController.swift

@@ -10,7 +10,7 @@ import UIKit
 /*
  *其他信息 预览
  */
-class YHPreviewOtherInformationViewController: YHPersonInfoBaseViewController {
+class YHPreviewOtherInformationViewController: YHPreviewBaseViewController {
     var arrData : [YHPreviewInfoSessionModel] = []
     override func viewDidLoad() {
         super.viewDidLoad()

galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift

@@ -95,7 +95,7 @@ class YHNetRequest: NSObject {
         
         requestHeader.add(name:"sign",value:sign)
         requestHeader.add(name: "token", value: YHLoginManager.shared.userModel?.token ?? "-")
-//        testToken(&requestHeader) //for test hjl  使用固定token
+        testToken(&requestHeader) //for test hjl  使用固定token
         headers = requestHeader
     }