Skip to content

G
galaxy-iOS
Commit ffc0428c authored by Alex朱枝文's avatar Alex朱枝文
Browse files
Options

续期文书增加提交以及预览点击事件

parent db763fa8
Hide whitespace changes
Inline Side-by-side
Showing with 116 additions and 5 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ ffc0428c
......@@ -593,6 +593,7 @@
04F2436A2C9D7D6D00DF2C74 /* YHResignDocumentStage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F243692C9D7D6D00DF2C74 /* YHResignDocumentStage.swift */; };
04F2436C2C9D9A3A00DF2C74 /* YHResignDocumentCompleteModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F2436B2C9D9A3A00DF2C74 /* YHResignDocumentCompleteModel.swift */; };
04F2436E2C9E5D8D00DF2C74 /* YHResignDocumentSignatureModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F2436D2C9E5D8D00DF2C74 /* YHResignDocumentSignatureModel.swift */; };
04F243702C9E788200DF2C74 /* YHResignDocumentPreviewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F2436F2C9E788200DF2C74 /* YHResignDocumentPreviewModel.swift */; };
04F316442C3568F000024164 /* YHAboutGalaxyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F316432C3568F000024164 /* YHAboutGalaxyViewController.swift */; };
04F4B76B2BAA7E1E00D13284 /* YHCertificateTemplateSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F4B76A2BAA7E1E00D13284 /* YHCertificateTemplateSheetView.swift */; };
04F5F86A2C1A95BB004A463C /* YHOtherServiceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F5F8692C1A95BB004A463C /* YHOtherServiceViewController.swift */; };
......@@ -1438,6 +1439,7 @@
04F243692C9D7D6D00DF2C74 /* YHResignDocumentStage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignDocumentStage.swift; sourceTree = "<group>"; };
04F2436B2C9D9A3A00DF2C74 /* YHResignDocumentCompleteModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignDocumentCompleteModel.swift; sourceTree = "<group>"; };
04F2436D2C9E5D8D00DF2C74 /* YHResignDocumentSignatureModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignDocumentSignatureModel.swift; sourceTree = "<group>"; };
04F2436F2C9E788200DF2C74 /* YHResignDocumentPreviewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignDocumentPreviewModel.swift; sourceTree = "<group>"; };
04F316432C3568F000024164 /* YHAboutGalaxyViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAboutGalaxyViewController.swift; sourceTree = "<group>"; };
04F4B76A2BAA7E1E00D13284 /* YHCertificateTemplateSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateTemplateSheetView.swift; sourceTree = "<group>"; };
04F5F8692C1A95BB004A463C /* YHOtherServiceViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOtherServiceViewController.swift; sourceTree = "<group>"; };
......@@ -1796,6 +1798,7 @@
04F243672C9D670E00DF2C74 /* YHResignDocumentListModel.swift */,
04F2436B2C9D9A3A00DF2C74 /* YHResignDocumentCompleteModel.swift */,
04F2436D2C9E5D8D00DF2C74 /* YHResignDocumentSignatureModel.swift */,
04F2436F2C9E788200DF2C74 /* YHResignDocumentPreviewModel.swift */,
);
path = M;
sourceTree = "<group>";
......@@ -5137,6 +5140,7 @@
045EEEBA2B9F171A0022A143 /* YHWorkResponsibilitiesTableViewCell.swift in Sources */,
047AA3ED2C4A70F6009C4554 /* YHHeadView.swift in Sources */,
04AD317F2C295C0300DF5655 /* YHChangeHeadModel.swift in Sources */,
04F243702C9E788200DF2C74 /* YHResignDocumentPreviewModel.swift in Sources */,
04B360F12C635A33001EB053 /* YHPrincipleWaitResultModel.swift in Sources */,
A5ACE9552B4564F7002C94D2 /* YHTabBarViewController.swift in Sources */,
045EEF0A2B9F171A0022A143 /* YHBasicInfoSessionModel.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomePageViewController.swift
View file @ ffc0428c
......@@ -92,7 +92,7 @@ class YHHomePageViewController: YHBaseViewController {
if YHButlerServiceManager.shared.isUatAllowed(), YHLoginManager.shared.isLogin() {
self.gotoMgrVC()
} else {
goTabBarBy(tabType: .community)
goToMessagePage()
}
}
view.galaxyManagerItemClickEvent = { [weak self] in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignDocumentManagement(续签文书管理)/C/YHResignDocumentDetailViewController.swift
View file @ ffc0428c
......@@ -85,8 +85,14 @@ extension YHResignDocumentDetailViewController {
}
}
private func requestData() {
private func requestData(isNeedLoading: Bool = false) {
if isNeedLoading {
YHHUD.show(.progress(message: "加载中..."))
}
viewModel.getDocumentDetail(docId: docId) { [weak self] documentModel, error in
if isNeedLoading {
YHHUD.hide()
}
guard let documentModel = documentModel else {
printLog("YHResignDocumentDetailViewController: 请求失败")
return
......@@ -170,7 +176,23 @@ extension YHResignDocumentDetailViewController {
printLog("###editEvent")
}
submitEvent = {
submitEvent = { [weak self] in
guard let self = self else {
return
}
YHHUD.show(.progress(message: "加载中..."))
self.viewModel.submitResginDocument(model.docId, nil) { success, error in
YHHUD.hide()
if success {
YHHUD.show(.success(message: "提交成功"))
YHHUD.hide(afterDelay: 1)
self.requestData(isNeedLoading: true)
} else if let error = error {
let errorMsg = error.errorMsg
YHHUD.show(.error(message: errorMsg))
YHHUD.hide(afterDelay: 1)
}
}
printLog("###submitEvent")
}
......@@ -184,10 +206,13 @@ extension YHResignDocumentDetailViewController {
guard let self = self else {
return
}
YHHUD.hide()
guard let signatureModel = signatureModel else {
if let error = error {
printLog("###续期文书签字: \(error.errorMsg)")
let errorMsg = error.errorMsg
YHHUD.show(.error(message: errorMsg))
YHHUD.hide(afterDelay: 1)
}
return
}
......@@ -199,7 +224,27 @@ extension YHResignDocumentDetailViewController {
}
}
previewEvent = {
previewEvent = { [weak self] in
guard let self = self else {
return
}
YHHUD.show(.progress(message: "加载中..."))
self.viewModel.previewResginDocument(docId: model.docId) { [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("###previewEvent")
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignDocumentManagement(续签文书管理)/M/YHResignDocumentPreviewModel.swift 0 → 100644
View file @ ffc0428c
//
// YHResignDocumentPreviewModel.swift
// galaxy
//
// Created by alexzzw on 2024/9/21.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import Foundation
import SmartCodable
class YHResignDocumentPreviewModel: SmartCodable {
var url: String = ""
required init() {
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignDocumentManagement(续签文书管理)/VM/YHResignDocumentViewModel.swift
View file @ ffc0428c
......@@ -87,4 +87,48 @@ class YHResignDocumentViewModel: YHBaseViewModel {
}
}
func submitResginDocument(_ docId: Int, _ userMobile: String?, callBackBlock: @escaping (_ success: Bool, _ error:YHErrorModel?) -> () ) {
var params: [String : Any] = ["docId": docId]
if let userMobile = userMobile {
params["userMobile"] = userMobile
}
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.ResignDocument.submitResginDocument
let _ = YHNetRequest.postRequest(url: strUrl, params: params) { json, code in
//1. json字符串 转 对象
printLog("model 是 ==> \(json)")
if json.code == 200 {
callBackBlock(true, nil)
} else {
let err = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.isEmpty ? "" : json.msg)
callBackBlock(false, err)
}
} failBlock: { err in
callBackBlock(false, err)
}
}
func previewResginDocument(docId: Int, callback: @escaping (_ documentModel: YHResignDocumentPreviewModel?, _ error: YHErrorModel?) -> ()) {
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.ResignDocument.previewResginDocument + "/\(docId)"
let _ = YHNetRequest.getRequest(url: strUrl, 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)
}
}
}
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