update: 高专留续签

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/C/YHServiceCenterViewController.swift

@@ -31,7 +31,7 @@ class YHServiceCenterViewController: YHBaseViewController {
     var state: Int = 0
     var isCanSelectStep: Bool = false
     var stepID: Int = 0
-    var headIndex = 0
+    var headIndex = 0 // 批次
     private weak var tipsView: YHServiceOrderTipsView?
     private var needShowYHManagerGuideView = false
     
@@ -493,6 +493,34 @@ extension YHServiceCenterViewController {
                     self.titleLabel.setImage(UIImage(named: ""), for: .normal)
                 }
             }
+            
+            if self.state == 5 {
+                if self.serviceCenterMainReqVM.mainModel.renewalNewSection.list.count > headIndex {
+                    self.arrDataForSeviceCenterProgress = self.serviceCenterMainReqVM.mainModel.renewalNewSection.list[headIndex].list
+                    self.stepID = self.serviceCenterMainReqVM.mainModel.renewalNewSection.list[headIndex].id
+                    self.homeTableView.tableHeaderView = headView
+                    self.headView.block = {[weak self] stepIndex, id, array in
+                        guard let self = self else { return }
+                        self.headIndex = stepIndex
+                        self.stepID = id
+                        self.arrDataForSeviceCenterProgress = array
+                        self.homeTableView.reloadData()
+                    }
+                    self.headView.selectIndex = self.headIndex
+                    self.headView.dataSource = self.serviceCenterMainReqVM.mainModel.renewalNewSection.list
+                    
+                    if self.model.product_type == 1 {
+                        self.titleLabel.setTitle("优才续签阶段", for: .normal)
+                    } else if self.model.product_type == 2 {
+                        self.titleLabel.setTitle("高才续签阶段", for: .normal)
+                    } else if self.model.product_type == 4 {
+                        self.titleLabel.setTitle("专才续签阶段", for: .normal)
+                    } else if self.model.product_type == 5 {
+                        self.titleLabel.setTitle("留学续签阶段", for: .normal)
+                    }
+                }
+            }
+            
             self.homeTableView.reloadData()
             // 首次显示指引
             if UserDefaults.standard.string(forKey: "service_tip_show") != nil {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/C/YHServiceOrderListViewController.swift

@@ -63,6 +63,15 @@ class YHServiceOrderListViewController: YHBaseViewController {
         NotificationCenter.default.addObserver(self, selector: #selector(endDragging), name: Notification.Name(rawValue: "scrollViewDidEndDragging0"), object: nil)
     }
     
+    static func enterWebPage(_ partUrl: String, _ orderId: Int, _ batchId: Int) {
+        var url = YHBaseUrlManager.shared.renewalURL() + partUrl
+        url = url + "?param=" + YHLoginManager.shared.h5Token + "&batchId=\(batchId)" + "&orderId=\(orderId)"
+        let vc = YHH5WebViewVC()
+        vc.url = url
+        vc.isSupportWebviewInterBackFlag = true
+        UIViewController.current?.navigationController?.pushViewController(vc)
+    }
+    
     // swiftlint:disable function_body_length
     // swiftlint:disable cyclomatic_complexity
     class func jumpToMessageController(type: Int, orderId: Int, _ stepId: Int = 0, productType: Int = 0) {
@@ -594,6 +603,38 @@ class YHServiceOrderListViewController: YHBaseViewController {
             vc.orderId = orderId
             vc.batchId = stepId
             UIViewController.current?.navigationController?.pushViewController(vc)
+        } else if type == 51 {
+            // 续签资料管理
+            self.enterWebPage("pages/renewal-information-management", orderId, stepId)
+
+        } else if type == 52 {
+            // 续签文书管理
+            self.enterWebPage("pages/renewal-document-management/index", orderId, stepId)
+            
+        } else if type == 53 {
+            // 续签信息确认
+            self.enterWebPage("pages/renewal-confirm/index", orderId, stepId)
+            
+        } else if type == 54 {
+            // 在港递交预约
+            self.enterWebPage("pages/send-reserve/index", orderId, stepId)
+        
+        } else if type == 55 {
+            // 查看续签结果
+            self.enterWebPage("pages/xu-qian/result", orderId, stepId)
+
+        } else if type == 56 {
+            // 续签补件
+            self.enterWebPage("pages/travel-certificate/index", orderId, stepId)
+            
+        } else if type == 57 {
+            // 在港签证缴费
+            self.enterWebPage("pages/xu-qian/visa-payment", orderId, stepId)
+            
+        } else if type == 58 {
+            // 上传旅行证件
+            self.enterWebPage("pages/travel-certificate/index", orderId, stepId)
+            
         } else if type == 101 {
             // 身份续签指引
             gotoResignGuideVC()
@@ -666,7 +707,7 @@ extension YHServiceOrderListViewController {
             if self.arrDataForSeviceCenterProgress.count == 0 {
                 self.homeTableView.tableFooterView = footView
                 self.homeTableView.reloadData()
-                if (state == 3 || state == 4) && (type == 0 || type == 2) {
+                if (state == 3 || state == 4 || state == 5) && (type == 0 || type == 2) {
                     self.homeTableView.tableFooterView = UIView()
                     self.homeTableView.reloadData()
                 }
@@ -799,7 +840,7 @@ extension YHServiceOrderListViewController: UITableViewDelegate, UITableViewData
         if orderType == 3 {
             return 42.fix + 20
         }
-        if (state == 3 || state == 4)  && (type == 0 || type == 2) {
+        if (state == 3 || state == 4 || state == 5)  && (type == 0 || type == 2) {
             return 104
         } else {
             return kMargin
@@ -817,25 +858,48 @@ extension YHServiceOrderListViewController: UITableViewDelegate, UITableViewData
             }
             return view
         }
-        if (state == 3 || state == 4)  && (type == 0 || type == 2) {
+        if (state == 3 || state == 4 || state == 5)  && (type == 0 || type == 2) {
             let view = YHServiceStepThreeSectionView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 104))
             view.block = { [weak self] tag in
                 guard let self = self else { return }
-                if tag == 1 {
-                    // 身份续签指引
-                    printLog("身份续签指引")
-                    YHServiceOrderListViewController.gotoResignGuideVC()
+                if state == 5 { // 高专留续签
+                    if tag == 1 {
+                        // 身份续签指引
+                        printLog("身份续签指引")
+                        YHServiceOrderListViewController.gotoResignGuideVC()
+                        
+                    } else if tag == 2 {
+                        // 我的续签方案
+                        printLog("续签方案")
+                        YHServiceOrderListViewController.gotoResignMethod(orderID: orderID, stepID: stepID)
+                        
+                    } else if tag == 3 {
+                        // 添加在港记录
+                        
+                        Self.enterWebPage("pages/hk-record/index", orderID, stepID)
+                        
+                    } else if tag == 4 {
+                        // 续签证件管理
+                        Self.enterWebPage("pages/renewal-certificate-management", orderID, stepID)
+                    }
                     
-                } else if tag == 2 {
-                    // 我的续签方案
-                    printLog("续签方案")
-                    YHServiceOrderListViewController.gotoResignMethod(orderID: orderID, stepID: stepID)
-                } else if tag == 3 {
-                    // 添加在港记录
-                    YHServiceOrderListViewController.gotoHKImmigrationRecordsVC(orderID: orderID)
-                } else if tag == 4 {
-                    // 续签证件管理
-                    YHServiceOrderListViewController.gotoResignCertificateListVC(orderID: orderID)
+                } else {
+                    if tag == 1 {
+                        // 身份续签指引
+                        printLog("身份续签指引")
+                        YHServiceOrderListViewController.gotoResignGuideVC()
+                        
+                    } else if tag == 2 {
+                        // 我的续签方案
+                        printLog("续签方案")
+                        YHServiceOrderListViewController.gotoResignMethod(orderID: orderID, stepID: stepID)
+                    } else if tag == 3 {
+                        // 添加在港记录
+                        YHServiceOrderListViewController.gotoHKImmigrationRecordsVC(orderID: orderID)
+                    } else if tag == 4 {
+                        // 续签证件管理
+                        YHServiceOrderListViewController.gotoResignCertificateListVC(orderID: orderID)
+                    }
                 }
             }
             return view
@@ -857,7 +921,7 @@ extension YHServiceOrderListViewController: UITableViewDelegate, UITableViewData
         let arr = self.arrDataForSeviceCenterProgress
         if  0 <= indexPath.row, indexPath.row < arr.count {
             let model = arr[indexPath.row]
-            if model.type == 27 || model.type == 227 || model.type == 327 || model.type == 427 || model.type == 32 || model.type == 31 || model.type == 34 || model.type == 42 || model.type == 41 || model.type == 44 {
+            if model.type == 27 || model.type == 227 || model.type == 327 || model.type == 427 || model.type == 32 || model.type == 31 || model.type == 34 || model.type == 42 || model.type == 41 || model.type == 44 || model.type == 52 || model.type == 51 || model.type == 54 {
                 return 162
             }
             return 144

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/M/YHServiceCenterProgressModel.swift

@@ -49,12 +49,13 @@ struct YHServiceStepProgressThreeModel: SmartCodable {
 }
 
 struct YHServiceCenterMainModel: SmartCodable {
-    var applySection: YHServiceProgressModel = YHServiceProgressModel()
-    var certificateSection: YHServiceProgressModel = YHServiceProgressModel()
-    var renewalSection: YHServiceStepProgressModel = YHServiceStepProgressModel()
-    var permanentSection: YHServiceStepProgressModel = YHServiceStepProgressModel()
-    var stage: Int = 0 // 1 申请阶段 2办证阶段 3续期阶段 4永居
+    var applySection: YHServiceProgressModel = YHServiceProgressModel() // 申请阶段
+    var certificateSection: YHServiceProgressModel = YHServiceProgressModel() // 办证阶段
+    var renewalSection: YHServiceStepProgressModel = YHServiceStepProgressModel() // 优才续签阶段
+    var permanentSection: YHServiceStepProgressModel = YHServiceStepProgressModel() // 永居
+    var renewalNewSection: YHServiceStepProgressModel = YHServiceStepProgressModel() // 高专留续签段
+    var stage: Int = 0 // 1 申请阶段 2办证阶段 3优才续签阶段 4永居 5高专留续签段
     var master_id: Int = 0 // 批次
     var status: Int = 0
-    var category_type: Int = 0 // 1.优才 2.高才 3永居
+    var category_type: Int = 0 // 1.优才 2.高才 3永居 4专才 5留学
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/V/YHServiceOrderProgressTableViewCell.swift

@@ -377,6 +377,46 @@ extension YHServiceOrderProgressTableViewCell {
                 messageLabel.text = "请上传&核对续签旅行证件~"
             }
             
+            if model.type == 51 {
+                titleLabel.text = "续签资料管理"
+                messageLabel.text = "请根据资料清单上传您的续签证明文件~"
+            }
+            
+            if model.type == 52 {
+                titleLabel.text = "续签文书管理"
+                messageLabel.text = "请确认您的续签文书内容并完成签字~"
+            }
+            
+            if model.type == 53 {
+                titleLabel.text = "续签信息确认"
+                messageLabel.text = "请确认家庭续签信息是否有变更~"
+            }
+            
+            if model.type == 54 {
+                titleLabel.text = "在港递交预约"
+                messageLabel.text = "请预约在港递交续签时间&确认在港时间~"
+            }
+            
+            if model.type == 55 {
+                titleLabel.text = "查看续签结果"
+                messageLabel.text = "请查看递交凭证&续签结果~"
+            }
+            
+            if model.type == 56 {
+                titleLabel.text = "续签补件"
+                messageLabel.text = "请尽快补件~"
+            }
+            
+            if model.type == 57 {
+                titleLabel.text = "续签签证缴费"
+                messageLabel.text = "请根据指引缴费并领取新电子签证~"
+            }
+            
+            if model.type == 58 {
+                titleLabel.text = "上传旅行证件"
+                messageLabel.text = "请上传&核对续签旅行证件~"
+            }
+            
             if model.type == 201 {
                 titleLabel.text = "我的信息"
             }
@@ -1118,6 +1158,62 @@ extension YHServiceOrderProgressTableViewCell {
                 messageLabel.textColor = UIColor.mainTextColor50
             }
             
+            if model.type == 51 {
+                titleLabel.text = "续签资料管理"
+                messageLabel.text = "请根据资料清单上传您的续签证明文件~"
+                buttonLabel.text = "去上传"
+                messageLabel.textColor = UIColor.mainTextColor50
+            }
+            
+            if model.type == 52 {
+                titleLabel.text = "续签文书管理"
+                messageLabel.text = "请确认您的续签文书内容并完成签字~"
+                buttonLabel.text = "去确认"
+                messageLabel.textColor = UIColor.mainTextColor50
+            }
+            
+            if model.type == 53 {
+                titleLabel.text = "续签信息确认"
+                messageLabel.text = "请确认家庭续签信息是否有变更~"
+                buttonLabel.text = "去查看"
+                messageLabel.textColor = UIColor.mainTextColor50
+            }
+            
+            if model.type == 54 {
+                titleLabel.text = "在港递交预约"
+                messageLabel.text = "请预约在港递交续签时间&确认在港时间~"
+                buttonLabel.text = "去查看"
+                messageLabel.textColor = UIColor.mainTextColor50
+            }
+            
+            if model.type == 55 {
+                titleLabel.text = "查看续签结果"
+                messageLabel.text = "请查看递交凭证&续签结果~"
+                buttonLabel.text = "去查看"
+                messageLabel.textColor = UIColor.mainTextColor50
+            }
+            
+            if model.type == 56 {
+                titleLabel.text = "续签补件"
+                messageLabel.text = "请尽快补件~"
+                buttonLabel.text = "去查看"
+                messageLabel.textColor = UIColor.mainTextColor50
+            }
+            
+            if model.type == 57 {
+                titleLabel.text = "续签签证缴费"
+                messageLabel.text = "请根据指引缴费并领取新电子签证~"
+                buttonLabel.text = "去查看"
+                messageLabel.textColor = UIColor.mainTextColor50
+            }
+            
+            if model.type == 58 {
+                titleLabel.text = "上传旅行证件"
+                messageLabel.text = "请上传&核对续签旅行证件~"
+                buttonLabel.text = "去查看"
+                messageLabel.textColor = UIColor.mainTextColor50
+            }
+            
             if model.type == 201 {
                 titleLabel.text = "我的信息"
                 buttonLabel.text = "去填写"
@@ -1432,6 +1528,54 @@ extension YHServiceOrderProgressTableViewCell {
                 buttonLabel.text = "去查看"
             }
             
+            if model.type == 51 {
+                titleLabel.text = "续签资料管理"
+                messageLabel.text = "请根据资料清单上传您的续签证明文件~"
+                buttonLabel.text = "已完成"
+            }
+            
+            if model.type == 52 {
+                titleLabel.text = "续签文书管理"
+                messageLabel.text = "请确认您的续签文书内容并完成签字~"
+                buttonLabel.text = "已完成"
+            }
+            
+            if model.type == 53 {
+                titleLabel.text = "续签信息确认"
+                messageLabel.text = "请确认家庭续签信息是否有变更~"
+                buttonLabel.text = "去查看"
+            }
+            
+            if model.type == 54 {
+                titleLabel.text = "在港递交预约"
+                messageLabel.text = "请预约在港递交续签时间&确认在港时间~"
+                buttonLabel.text = "去查看"
+            }
+            
+            if model.type == 55 {
+                titleLabel.text = "查看续签结果"
+                messageLabel.text = "请查看递交凭证&续签结果~"
+                buttonLabel.text = "去查看"
+            }
+            
+            if model.type == 56 {
+                titleLabel.text = "续签补件"
+                messageLabel.text = "恭喜您，已完成补件~"
+                buttonLabel.text = "已完成"
+            }
+            
+            if model.type == 57 {
+                titleLabel.text = "续签签证缴费"
+                messageLabel.text = "请根据指引缴费并领取新电子签证~"
+                buttonLabel.text = "去查看"
+            }
+            
+            if model.type == 58 {
+                titleLabel.text = "上传旅行证件"
+                messageLabel.text = "请上传&核对续签旅行证件~"
+                buttonLabel.text = "去查看"
+            }
+            
             if model.type == 201 {
                 titleLabel.text = "我的信息"
                 messageLabel.text = "恭喜您，信息已全部填写完~"

galaxy/galaxy/Classes/Tools/NetWork/YHBaseUrlManager.swift

@@ -30,6 +30,19 @@ class YHBaseUrlManager {
 #endif
     }
     
+    // 高专留续签
+    func renewalURL() -> String {
+#if DEBUG
+        return "https://test-unih5.galaxy-immi.com" + "/"
+#elseif TESTENV
+        return "https://test-unih5.galaxy-immi.com" + "/"
+#elseif UATENV
+        return "https://unih5.galaxy-immi.com" + "/"
+#else
+        return "https://unih5.galaxy-immi.com" + "/"
+#endif
+    }
+    
     // ossUrl
     func curOssURL() -> String {
         return YHConfigManager.shared.ossUrl