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

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  //  续签

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

@@ -191,7 +191,7 @@ class YHServiceOrderListView: YHBaseViewController {
             //续签资料管理
             let vc = YHResinMaterialManageContainerVC()
             vc.orderId = orderId
-            vc.id = stepId
+            vc.batchId = stepId
             UIViewController.current?.navigationController?.pushViewController(vc)
 
         } else if type == 32 {
@@ -398,6 +398,131 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
             } else if model.type == 4 { // 方案
                 //我的方案
                 handleRedPointFor(key: kMyPlanRedPointInfoKey, model: model)
+                let vc = YHMineSchemeViewController()
+                UIViewController.current?.navigationController?.pushViewController(vc)
+                
+            } else if model.type == 5 {
+                //我的签字
+                let vc = YHMySignatureListViewController()
+                vc.orderId = orderID
+                UIViewController.current?.navigationController?.pushViewController(vc)
+                
+            } else if model.type == 6 {
+                //我的文书
+                let vc = YHMyDocumentsListViewController()
+                vc.orderId = orderID
+                UIViewController.current?.navigationController?.pushViewController(vc)
+                
+            } else if model.type == 11 || model.type == 12 || model.type == 14  {
+                
+                // 11 原则批等待结果
+                // 12 原则批待补件
+                // 14 原则批未获批准
+                
+                let vc = YHPrincipleWaitResultViewController()
+                vc.status = model.type
+                vc.orderId = orderID
+                UIViewController.current?.navigationController?.pushViewController(vc)
+                
+            } else if model.type == 13 { 
+                //原则批已获批~
+                let vc = YHPrincipleApprovedResultVC()
+                vc.orderId = orderID
+                UIViewController.current?.navigationController?.pushViewController(vc)
+                
+            } else if model.type == 15 {
+                //正式批已获批~
+                let vc = YHOfficialApprovalResultVC()
+                UIViewController.current?.navigationController?.pushViewController(vc)
+            } else if model.type == 21 {
+                //新增受养人
+                let vc = YHAddAdoptersViewController()
+                vc.orderId = orderID
+                UIViewController.current?.navigationController?.pushViewController(vc)
+            } else if model.type == 22 {
+                //家庭信息确认
+                let vc = YHFamilyInfoConfirmViewController()
+                vc.orderId = orderID
+                UIViewController.current?.navigationController?.pushViewController(vc)
+            } else if model.type == 23 {
+                //电子签字缴费
+                let vc = YHVisaPaymentVC()
+                vc.orderID = orderID
+                UIViewController.current?.navigationController?.pushViewController(vc)
+            } else if model.type == 24 {
+                //赴港时间预约
+                let vc = YHCertificateAppointViewController()
+                vc.orderId = orderID
+                UIViewController.current?.navigationController?.pushViewController(vc)
+                
+            } else if model.type == 25 {
+                // 赴港行程指引
+                YHHUD.show(.progress(message: "加载中..."))
+                appointViewModel.getIsNeedGoToHK(orderId: orderID) {
+                    // needGoHK 1需要赴港 0不需要 2没有选择
+                    // reservationToHK 0 没有预约 1 已经预約
+                    [weak self] needGoHK, reservationToHK in
+                    YHHUD.hide()
+                    guard let self = self else { return }
+            
+                    var isNeedAppoint = true
+                    if needGoHK == 1, reservationToHK == 1 { // 选择赴港且已预约
+                        isNeedAppoint = false
+                    } else if needGoHK == 0  { // 赴港选择否
+                        isNeedAppoint = false
+                    }
+                    
+                    if isNeedAppoint {
+                        //预约弹窗
+                        let alert = YHDisappointHKAlertView.alertView()
+                        alert.confirmBlock = {
+                            let vc = YHCertificateAppointViewController()
+                            vc.orderId = self.orderID
+                            UIViewController.current?.navigationController?.pushViewController(vc)
+                        }
+                        alert.show()
+                        
+                    } else { // 已预约过直接进入赴港行程指引
+                        if var token = YHLoginManager.shared.userModel?.token {
+                            var url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/tohkList"
+                        
+                            let addtionString = String.randomAlphaNumericStringT(6)//随机6个字母或者数字
+                            let indexToInsert = token.index(token.startIndex, offsetBy: 6) //插入位置，这里以第六个字符后面为例
+                            token.insert(contentsOf: addtionString, at: indexToInsert)
+                            url = url + "?paramO=\(self.orderID)" + "&param=" + token
+                            url = url + "&app_platform=ios" + "&app_version=" + UIDevice.appVersion()
+                            printLog("UURL: \(url)")
+                            let vc = YHH5WebViewVC()
+                            vc.url = url
+                            vc.isFullScreenFlag = false
+                            vc.navTitle = "赴港行程指引"
+                            vc.isNeedRefreshDataFlag = true
+                            UIViewController.current?.navigationController?.pushViewController(vc)
+                        }
+                    }
+                }
+                
+            } else if model.type == 26 {
+                //旅行证件准备
+                let vc = YHTravelDocsPreparationListViewController()
+                vc.orderId = orderID
+                UIViewController.current?.navigationController?.pushViewController(vc)
+            } else if model.type == 27 {
+                //上传过关证件
+                let vc = YHUploadCertificateVC()
+                vc.orderId = orderID
+                UIViewController.current?.navigationController?.pushViewController(vc)
+            } else if model.type == 31 {
+                //续签资料管理
+                let vc = YHResinMaterialManageContainerVC()
+                vc.orderId = orderID
+                vc.batchId = stepID
+                UIViewController.current?.navigationController?.pushViewController(vc)
+
+            } else if model.type == 32 {
+                //续签文书管理
+                let vc = YHResignDocumentManagementVC(orderId: orderID, id: stepID)
+                UIViewController.current?.navigationController?.pushViewController(vc)
             }
         }
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignDocumentManagement(续签文书管理)/M/YHRealNameHelper.swift

@@ -29,12 +29,17 @@ protocol YHRealNameDelegate: AnyObject {
 
 class YHRealNameHelper {
     
+    // 实名回调地址
     static let callbackScheme = "esign://demo"
+    // 实名的回调跟 生成实名H5链接的入参redirectUrl相关
     static let realnameCallback = "esign://demo/realBack"
+    // 签署的appScheme 入参
     static let signCallback = "esign://demo/signBack"
     
     static let jumpToAlipay = "alipays://platformapi/startapp?appId=20000067&url="
+    // 签署H5回调的结果 会根据redirectUrl入参变化，需要同步
     static let signResultWebCloseJSFunction = "jsbridge://signCallback"
+    // // 实名H5回调的结果 会根据redirectUrl入参变化，需要同步
     static let realResultWebCloseJSFunction = "esign://demo/realBack"
     
     @discardableResult

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignMaterialManage(续期资料管理)/C/YHResignMaterialListVC.swift

@@ -13,7 +13,7 @@ class YHResignMaterialListVC: YHBaseViewController {
     // 订单id
     var orderId: Int = 0
     // 批次id
-    var id: Int = 0
+    var batchId: Int = 0
     var viewModel: YHResignMaterialViewModel = YHResignMaterialViewModel()
     
     var items:[YHResignMaterialInfo] = [] {
@@ -146,7 +146,7 @@ extension YHResignMaterialListVC: UITableViewDelegate, UITableViewDataSource {
                         let vc = YHResignMaterialUploadVC()
                         vc.materialId = item.id
                         vc.orderId = self.orderId
-                        vc.id = self.id
+                        vc.batchId = self.batchId
                         self.navigationController?.pushViewController(vc)
                     }
                     return
@@ -155,7 +155,7 @@ extension YHResignMaterialListVC: UITableViewDelegate, UITableViewDataSource {
                 let vc = YHResignMaterialUploadVC()
                 vc.materialId = item.id
                 vc.orderId = self.orderId
-                vc.id = self.id
+                vc.batchId = self.batchId
                 self.navigationController?.pushViewController(vc)
             }
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignMaterialManage(续期资料管理)/C/YHResignMaterialUploadVC.swift

@@ -16,7 +16,7 @@ class YHResignMaterialUploadVC: YHBaseViewController {
     // 订单id
     var orderId: Int = 0
     // 批次id
-    var id: Int = 0
+    var batchId: Int = 0
     var materialId : Int = 0
     
     var materialModel: YHMaterialModel = YHMaterialModel() {
@@ -592,7 +592,7 @@ extension YHResignMaterialUploadVC {
     func requestMaterialDetail() {
     
         YHHUD.show(.progress(message: "加载中..."))
-        viewModel.getMaterialDeal(orderId: orderId, id: id, materialId: materialId) {
+        viewModel.getMaterialDeal(orderId: orderId, id: batchId, materialId: materialId) {
             [weak self] success, error  in
             YHHUD.hide()
             guard let self = self else { return }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignMaterialManage(续期资料管理)/C/YHResinMaterialManageContainerVC.swift

@@ -16,7 +16,7 @@ class YHResinMaterialManageContainerVC: YHBaseViewController {
     // 订单id
     var orderId: Int = 0
     // 批次id
-    var id: Int = 0
+    var batchId: Int = 0
     
     var titles = ["全部", "待上传(0)", "已驳回(0)", "审核中(0)", "已完成(0)"]
     
@@ -32,7 +32,7 @@ class YHResinMaterialManageContainerVC: YHBaseViewController {
     func createListVC() -> YHResignMaterialListVC {
         let vc0 = YHResignMaterialListVC()
         vc0.orderId = self.orderId
-        vc0.id = self.id
+        vc0.batchId = self.batchId
         return vc0
     }
 
@@ -121,7 +121,7 @@ class YHResinMaterialManageContainerVC: YHBaseViewController {
     func requestData() {
         
         let params: [String : Any] = ["order_id" : orderId,
-                                      "id" : id]
+                                      "id" : batchId]
         viewModel.getMaterialList(param: params) { success, error in
             for (index, vc) in self.itemVCs.enumerated() {
                 if index == 0 {

galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMessageDetailListVC.swift

@@ -561,7 +561,7 @@ extension YHMessageDetailListVC: UITableViewDelegate, UITableViewDataSource {
                  if let orderId = Int(msg.orderId) {
                      let vc = YHResinMaterialManageContainerVC()
                      vc.orderId = orderId
-                     vc.id = self.serviceCenterViewModel.mainModel.master_id
+                     vc.batchId = self.serviceCenterViewModel.mainModel.master_id
                      navigationController?.pushViewController(vc)
                  }