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

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

@@ -49,6 +49,12 @@ enum YHRedirectPage: String {
     case renewalMaterial = "renewal_material" // 续签资料管理
     case renewalDocument = "renewal_document" // 续签文书管理
     
+    case renewalInfoConfirm = "renewal_info_confirm" // 续签信息确认
+    case renewalSubmitInHkAppointment = "renewal_submit_in_hk_appointment" // 在港递交预约
+    case renewalResult = "renewal_result" // 查看续签结果
+    case renewalSupplement = "renewal_supplement" // 续签补件
+    case renewalVisaPay = "renewal_visa_pay" // 在港签证缴费
+    case renewalVisaUpload = "renewal_visa_upload" // 上传旅行证件
 }
 
 
@@ -111,7 +117,13 @@ class YHMessageDetailListVC: YHBaseViewController {
                     .stayInHKRecord,
                     .renewalCertificate,
                     .renewalMaterial,
-                    .renewalDocument,]
+                    .renewalDocument,
+                    .renewalInfoConfirm,
+                    .renewalSubmitInHkAppointment,
+                    .renewalResult,
+                    .renewalSupplement,
+                    .renewalVisaPay,
+                    .renewalVisaUpload]
             
         }
         return []
@@ -588,6 +600,46 @@ extension YHMessageDetailListVC: UITableViewDelegate, UITableViewDataSource {
                   let vc = YHResignDocumentManagementVC(orderId: orderId, id: self.serviceCenterViewModel.mainModel.master_id)
                   navigationController?.pushViewController(vc)
               }
+          } else if msg.redirectPage == YHRedirectPage.renewalInfoConfirm.rawValue { // 续签信息确认
+              if let orderId = Int(msg.orderId) {
+                  let vc = YHResignConfirmInfoListViewController()
+                  vc.orderId = orderId
+                  vc.stepId = self.serviceCenterViewModel.mainModel.master_id
+                  navigationController?.pushViewController(vc)
+              }
+          } else if msg.redirectPage == YHRedirectPage.renewalSubmitInHkAppointment.rawValue { // 在港递交预约
+              if let orderId = Int(msg.orderId) {
+                  let vc = YHResignAppointContainerViewController()
+                  vc.orderId = orderId
+                  vc.renewalId = self.serviceCenterViewModel.mainModel.master_id
+                  navigationController?.pushViewController(vc)
+              }
+          } else if msg.redirectPage == YHRedirectPage.renewalResult.rawValue { // 查看续签结果
+              if let orderId = Int(msg.orderId) {
+                  let vc = YHLookResignResultViewController()
+                  vc.orderId = orderId
+                  vc.batchId = self.serviceCenterViewModel.mainModel.master_id
+                  navigationController?.pushViewController(vc)
+              }
+          } else if msg.redirectPage == YHRedirectPage.renewalSupplement.rawValue { // 续签补件
+              if let orderId = Int(msg.orderId) {
+                  let vc = YHResignUploadDocListViewController()
+                  vc.orderId = orderId
+                  vc.batchId = self.serviceCenterViewModel.mainModel.master_id
+                  navigationController?.pushViewController(vc)
+              }
+          } else if msg.redirectPage == YHRedirectPage.renewalVisaPay.rawValue { // 在港签证缴费
+              if let orderId = Int(msg.orderId) {
+                  let vc = YHHKVisaRenewalPaymentVC(orderId: orderId, renewalId: self.serviceCenterViewModel.mainModel.master_id)
+                  navigationController?.pushViewController(vc)
+              }
+          } else if msg.redirectPage == YHRedirectPage.renewalVisaUpload.rawValue { // 上传旅行证件
+              if let orderId = Int(msg.orderId) {
+                  let vc = YHResignUploadTravelCardListViewController()
+                  vc.orderId = orderId
+                  vc.batchId = self.serviceCenterViewModel.mainModel.master_id
+                  navigationController?.pushViewController(vc)
+              }
           }
     }