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(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/C/YHResignCertificateDetailHkViewController.swift

@@ -246,9 +246,9 @@ extension YHResignCertificateDetailHkViewController: UITableViewDelegate, UITabl
         cell.lastImageName = "service_adopter_card_travel_back"
         cell.firstLabelName = "港澳通行证正面"
         cell.lastLabelName = "港澳通行证倍面"
+        cell.dataModel = dataModel
         cell.failString = failString
         cell.data = data
-        cell.dataModel = dataModel
         cell.urls = urls
         cell.urlBlock = { [weak self] url, index in
             guard let self = self else { return }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/M/YHResignCertificateModel.swift

@@ -36,6 +36,7 @@ class YHResignCertificateModel: SmartCodable {
     var user_id: Int = 0
     var user_type: String = ""
     var valid_date: String = ""
+    var sign_valid_date: String = "" // 签注有效期
     var cert_info: YHResignCertificateInfoModel = YHResignCertificateInfoModel()
     
     required init() {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/V/YHResignCertificateHKTableViewCell.swift

@@ -136,7 +136,7 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
                     if self.compareDates(dateString1: item.message ?? "", dateString2: self.dataModel.valid_date) {
                         failString = ""
                     } else {
-                        failString = "有效期不足，需要为\(self.dataModel.valid_date)或以后"
+                        failString = "卡片有效期不足，需要为\(self.dataModel.valid_date)或以后"
                     }
                 }
                 if item.id == .id3 {
@@ -163,9 +163,15 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
                         }
                     }
                     if self.compareDates(dateString1: item.message ?? "", dateString2: self.dataModel.valid_date) {
-                        failString = ""
+                        if failString == "签注有效期不足，需要为\(self.dataModel.sign_valid_date)或以后" {
+                            failString = ""
+                        }
                     } else {
-                        failString = "有效期不足，需要为\(self.dataModel.valid_date)或以后"
+                        if failString == "卡片有效期不足，需要为\(self.dataModel.valid_date)或以后" {
+                            
+                        } else {
+                            failString = "签注有效期不足，需要为\(self.dataModel.sign_valid_date)或以后"
+                        }
                     }
                 }
             }
@@ -429,9 +435,11 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
             if let block = self.block {
                 block(model)
                 if self.compareDates(dateString1: model.message ?? "", dateString2: self.dataModel.valid_date) {
-                    failString = ""
+                    if failString == "卡片有效期不足，需要为\(self.dataModel.valid_date)或以后" {
+                        failString = ""
+                    }
                 } else {
-                    failString = "有效期不足，需要为\(self.dataModel.valid_date)或以后"
+                    failString = "卡片有效期不足，需要为\(self.dataModel.valid_date)或以后"
                 }
             }
         }
@@ -484,6 +492,13 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
             guard let self = self else { return }
             if let block = self.block {
                 block(model)
+                if self.compareDates(dateString1: model.message ?? "", dateString2: self.dataModel.sign_valid_date) {
+                    if failString == "签注有效期不足，需要为\(self.dataModel.sign_valid_date)或以后" {
+                        failString = ""
+                    }
+                } else {
+                    failString = "签注有效期不足，需要为\(self.dataModel.sign_valid_date)或以后"
+                }
             }
         }
         centerView.addSubview(signEndView)

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

@@ -170,13 +170,26 @@ extension YHResignDocumentDetailViewController {
         var config = YHResignDocumentStatusCell.ButtonsConfig()
         var actions: [(() -> Void)] = []
         editEvent = { [weak self] in
-            guard model.link.count > 0, let url = URL(string: model.link) else {
+            guard let self = self else {
                 return
             }
-            let safariViewController = SFSafariViewController(url: url)
-            safariViewController.dismissButtonStyle = .close
-            safariViewController.modalPresentationStyle = .fullScreen
-            self?.present(safariViewController, animated: true, completion: nil)
+            YHHUD.show(.progress(message: "加载中..."))
+            self.viewModel.getResginDocumentUrl(docId: model.docId, isEditable: true) { [weak self] model, error in
+                guard let self = self else {
+                    return
+                }
+                YHHUD.hide()
+                if let urlString = model?.url, let url = URL(string: urlString) {
+                    let safariViewController = SFSafariViewController(url: url)
+                    safariViewController.dismissButtonStyle = .close
+                    safariViewController.modalPresentationStyle = .fullScreen
+                    self.present(safariViewController, animated: true, completion: nil)
+                } else if let error = error {
+                    let errorMsg = error.errorMsg
+                    YHHUD.show(.error(message: errorMsg))
+                    YHHUD.hide(afterDelay: 1)
+                }
+            }
             printLog("###editEvent")
         }
         
@@ -234,7 +247,7 @@ extension YHResignDocumentDetailViewController {
                 return
             }
             YHHUD.show(.progress(message: "加载中..."))
-            self.viewModel.previewResginDocument(docId: model.docId) { [weak self] model, error in
+            self.viewModel.getResginDocumentUrl(docId: model.docId, isEditable: false) { [weak self] model, error in
                 guard let self = self else {
                     return
                 }

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

@@ -131,4 +131,29 @@ class YHResignDocumentViewModel: YHBaseViewModel {
         }
     }
     
+    func getResginDocumentUrl(docId: Int, isEditable: Bool, callback: @escaping (_ documentModel: YHResignDocumentPreviewModel?, _ error: YHErrorModel?) -> ()) {
+        let params: [String : Any] = ["id": docId, "type": isEditable ? 1 : 0]
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.ResignDocument.getResginDocumentUrl
+        let _ = YHNetRequest.getRequest(url: strUrl, params: params) { json, code in
+            //1. json字符串 转 对象
+            printLog("model 是 ==> \(json)")
+            
+            if json.code == 200 {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHResignDocumentPreviewModel.deserialize(from: dic) else {
+                    let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
+                    callback(nil, err)
+                    return
+                }
+                callback(resultModel, nil)
+                
+            } else {
+                let err = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.isEmpty ? "" : json.msg)
+                callback(nil, err)
+            }
+            
+        } failBlock: { err in
+            callback(nil, err)
+        }
+    }
+    
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceCenterStepThreeTableHeadView.swift

@@ -149,7 +149,7 @@ extension YHServiceCenterStepThreeTableHeadView: UICollectionViewDelegate, UICol
         selectIndex = indexPath.row
         if dataSource.count > selectIndex {
             let model = dataSource[selectIndex]
-            explainLabel.text = model.personStr
+            explainLabel.text = "本期人员：" + model.personStr
             if model.personStr.count > 20 {
                 moreButton.isHidden = false
             } else {

galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift

@@ -544,6 +544,8 @@ class YHAllApiName {
         static let resginDocumentSignature = "super-app/renewal/signature"
         // 预览签字文档
         static let previewResginDocument = "super-app/renewal/views"
+        // 获取临时链接
+        static let getResginDocumentUrl = "super-app/renewal/doc/url"
     }
     
     // 在港记录