Commit 1f3665e3 authored by David黄金龙's avatar David黄金龙

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:
  续签文书管理注释提醒优化
  优化续签文书刷新接口逻辑,避免在上传时更新接口,但是也不影响先前跳转
parents a5a1a6d8 983b3bdc
......@@ -43,9 +43,9 @@ class YHResignDocumentDetailViewController: YHBaseViewController {
private let docId: Int
private var name: String
private let uploadMaxCount = 10
private var isEditUploadFiles: Bool = false // 跟踪编辑状态 上传 预览 删除等
private var isEditUploadFilesDidDisappear: Bool = false // 跟踪编辑状态 上传 预览 删除等时是否页面消失
// 进签字、QMAS信息确认等再出来就要刷新接口,而上传文件预览文件就不能刷新接口,
// 因此增加这个字段判断,后续如果有跳其他页面且退回该页面需要刷新状态设置为true
private var isNeedUpdateData: Bool = true
init(_ docId: Int, _ name: String = "") {
self.docId = docId
......@@ -123,29 +123,18 @@ class YHResignDocumentDetailViewController: YHBaseViewController {
super.viewDidLoad()
setupUI()
addKeyBoardNotify()
tableView.reloadData()
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
let needLoading = isNeedShowLoading
isNeedShowLoading = false
if isEditUploadFilesDidDisappear {
isEditUploadFiles = false
isEditUploadFilesDidDisappear = false
} else {
isEditUploadFiles = false
if isNeedUpdateData {
isNeedUpdateData = false
requestData(isNeedLoading: needLoading)
}
}
override func viewWillDisappear(_ animated: Bool) {
super.viewWillDisappear(animated)
if isEditUploadFiles {
isEditUploadFilesDidDisappear = true
}
}
deinit {
removeNotify()
}
......@@ -312,7 +301,6 @@ extension YHResignDocumentDetailViewController: UITableViewDelegate, UITableView
cell.setupCellInfo(title, cellType: cellType)
cell.editButtonClickEvent = { [weak self] in
guard let self = self else { return }
self.isEditUploadFiles = true
let items: [YHCertificateEditItem] = editTypes.map {
YHCertificateEditItem(type: $0, title: $0.editName())
}
......@@ -355,7 +343,6 @@ extension YHResignDocumentDetailViewController: UITableViewDelegate, UITableView
guard let detailModel = self.detailModel else {
return
}
self.isEditUploadFiles = true
let count = detailModel.signedDocument.count
if count >= 10 {
YHHUD.flash(message: "最多上传10个图片或文件")
......@@ -477,6 +464,7 @@ extension YHResignDocumentDetailViewController {
return
}
self.isNeedShowLoading = true
self.isNeedUpdateData = true
let url = signatureModel.url
// 跳签字
let vc = YHSignatureWebViewController()
......@@ -526,6 +514,7 @@ extension YHResignDocumentDetailViewController {
printLog("跳转QMAS")
if let param = YHLoginManager.shared.userModel?.token, param.count > 5 {
self.isNeedUpdateData = true
printLog(param)
var url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/guide/qmas"
//https://test-hkdiy-h5.galaxy-immi.com/superAppBridge.html#/guide/qmas?token=xx&doc_id=xx
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment