Skip to content

G
galaxy-iOS
Commit 0a877c4b authored by David黄金龙's avatar David黄金龙
Browse files
Options

修改 几处体验

parent 5f525461
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 25 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHMyDocumentsDetailViewController.swift
View file @ 0a877c4b
...@@ -341,6 +341,7 @@ class YHMyDocumentsDetailViewController: YHBaseViewController { ...@@ -341,6 +341,7 @@ class YHMyDocumentsDetailViewController: YHBaseViewController {
guard let self = self else { return } guard let self = self else { return }
self.getData() self.getData()
} }
callBack?(true)
return return
} }
callBack?(false) callBack?(false)
...@@ -372,7 +373,9 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -372,7 +373,9 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
if self.viewModel.mainModel?.prospectus.id != 0 { if self.viewModel.mainModel?.prospectus.id != 0 {
// 跳转赴港计划书编辑页面 // 跳转赴港计划书编辑页面
} else { } else {
YHHUD.show(.progress(message: ""))
self.viewModel.requestDocumentsTemporaryUrl("\(id)", callBackBlock: {[weak self] success, error in self.viewModel.requestDocumentsTemporaryUrl("\(id)", callBackBlock: {[weak self] success, error in
YHHUD.hide()
guard let self = self else { return } guard let self = self else { return }
if success { if success {
self.viewModel.requestDocumentRecord("\(id)", 2) { success, error in self.viewModel.requestDocumentRecord("\(id)", 2) { success, error in
...@@ -397,7 +400,9 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -397,7 +400,9 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
if self.viewModel.mainModel?.prospectus.id != 0 { if self.viewModel.mainModel?.prospectus.id != 0 {
// 跳转赴港计划书查看页面 // 跳转赴港计划书查看页面
} else { } else {
YHHUD.show(.progress(message: ""))
self.viewModel.requestDocumentsTemporaryUrl("\(id)", callBackBlock: {[weak self] success, error in self.viewModel.requestDocumentsTemporaryUrl("\(id)", callBackBlock: {[weak self] success, error in
YHHUD.hide()
guard let self = self else { return } guard let self = self else { return }
if success { if success {
self.viewModel.requestDocumentRecord("\(id)", 1) { success, error in self.viewModel.requestDocumentRecord("\(id)", 1) { success, error in
...@@ -472,7 +477,9 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -472,7 +477,9 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
} }
if type == .look { if type == .look {
YHHUD.show(.progress(message: ""))
self.viewModel.requestSignatureLook("\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)") {[weak self] success, error in self.viewModel.requestSignatureLook("\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)") {[weak self] success, error in
YHHUD.hide()
guard let self = self else { return } guard let self = self else { return }
if success { if success {
let url = URL(string: self.viewModel.pageUrl)! let url = URL(string: self.viewModel.pageUrl)!
...@@ -547,13 +554,14 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -547,13 +554,14 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
// 等待所有任务完成 // 等待所有任务完成
group.notify(queue: .main) { group.notify(queue: .main) {
// 所有任务完成，回到主线程继续执行 // 所有任务完成，回到主线程继续执行
YHHUD.hide()
print("所有任务完成") print("所有任务完成")
if imgArr.count == successArr.count { if imgArr.count == successArr.count {
YHHUD.flash(message: "上传成功") YHHUD.flash(message: "上传成功")
} else { } else {
YHHUD.flash(message: "\(successArr.count)张照片上传成功\n\(failArr.count)张照片上传失败") YHHUD.flash(message: "\(successArr.count)张照片上传成功\n\(failArr.count)张照片上传失败")
} }
YHHUD.hide()
} }
} }
sheetView.show() sheetView.show()
...@@ -594,6 +602,7 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -594,6 +602,7 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
// 等待所有任务完成 // 等待所有任务完成
group.notify(queue: .main) { group.notify(queue: .main) {
YHHUD.hide()
// 所有任务完成，回到主线程继续执行 // 所有任务完成，回到主线程继续执行
print("所有任务完成") print("所有任务完成")
if imgArr.count == successArr.count { if imgArr.count == successArr.count {
...@@ -601,15 +610,16 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -601,15 +610,16 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
} else { } else {
YHHUD.flash(message: "\(successArr.count)张照片上传成功\n\(failArr.count)张照片上传失败") YHHUD.flash(message: "\(successArr.count)张照片上传成功\n\(failArr.count)张照片上传失败")
} }
YHHUD.hide()
} }
} }
sheetView.show() sheetView.show()
} }
if type == .look { if type == .look {
YHHUD.show(.progress(message: ""))
self.oldUrl = self.viewModel.mainModel?.writing_document.doc_sign.doc_return_manual[index] self.oldUrl = self.viewModel.mainModel?.writing_document.doc_sign.doc_return_manual[index]
self.viewModel.getPublicImageUrl(self.oldUrl ?? "") { success, error in self.viewModel.getPublicImageUrl(self.oldUrl ?? "") { success, error in
YHHUD.hide()
if let success = success { if let success = success {
self.previewFileTool.openXLSXRemoteFile(urlString: success, fileName: "") self.previewFileTool.openXLSXRemoteFile(urlString: success, fileName: "")
} }
...@@ -617,16 +627,17 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -617,16 +627,17 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
} }
if type == .delete { if type == .delete {
self.oldUrl = self.viewModel.mainModel?.writing_document.doc_sign.doc_return_manual[index] YHHUD.flash(message: "产品确定 后续完善")
self.viewModel.requestFileAction("\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)", 3, [], self.oldUrl ?? "") {[weak self] success, error in // self.oldUrl = self.viewModel.mainModel?.writing_document.doc_sign.doc_return_manual[index]
guard let self = self else { return } // self.viewModel.requestFileAction("\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)", 3, [], self.oldUrl ?? "") {[weak self] success, error in
if success { // guard let self = self else { return }
YHHUD.flash(message: "删除成功") // if success {
} else { // YHHUD.flash(message: "删除成功")
YHHUD.flash(message: error?.errorMsg ?? "") // } else {
} // YHHUD.flash(message: error?.errorMsg ?? "")
self.getData() // }
} // self.getData()
// }
} }
} }
return cell return cell
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/C/YHMySignatureDetailViewController.swift
View file @ 0a877c4b
...@@ -227,8 +227,11 @@ class YHMySignatureDetailViewController: YHBaseViewController { ...@@ -227,8 +227,11 @@ class YHMySignatureDetailViewController: YHBaseViewController {
YHHUD.show(.progress(message: "上传中...")) YHHUD.show(.progress(message: "上传中..."))
self.viewModel.uploadFile(fileUrl.absoluteString) { self.viewModel.uploadFile(fileUrl.absoluteString) {
[weak self] successUrl, error in [weak self] successUrl, error in
guard let self = self else { return }
YHHUD.hide() YHHUD.hide()
guard let self = self else { return }
// 再调用业务接口 // 再调用业务接口
if let successUrl = successUrl, !successUrl.isEmpty { if let successUrl = successUrl, !successUrl.isEmpty {
var fileName = fileUrl.lastPathComponent var fileName = fileUrl.lastPathComponent
...@@ -297,6 +300,7 @@ class YHMySignatureDetailViewController: YHBaseViewController { ...@@ -297,6 +300,7 @@ class YHMySignatureDetailViewController: YHBaseViewController {
guard let self = self else { return } guard let self = self else { return }
self.getData() self.getData()
} }
callBack?(true)
return return
} }
callBack?(false) callBack?(false)
...@@ -328,7 +332,9 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -328,7 +332,9 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
guard let self = self else { return } guard let self = self else { return }
if type == .sign { if type == .sign {
if self.isSign { if self.isSign {
YHHUD.show(.progress(message: ""))
self.viewModel.requestSignatureLook("\(self.id)") {[weak self] success, error in self.viewModel.requestSignatureLook("\(self.id)") {[weak self] success, error in
YHHUD.hide()
guard let self = self else { return } guard let self = self else { return }
if success { if success {
let url = URL(string: self.viewModel.pageUrl)! let url = URL(string: self.viewModel.pageUrl)!
...@@ -341,7 +347,9 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -341,7 +347,9 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
} }
} }
} else { } else {
YHHUD.show(.progress(message: ""))
self.viewModel.requestSignaturePageURL("\(self.id)", callBackBlock: {[weak self] success, error in self.viewModel.requestSignaturePageURL("\(self.id)", callBackBlock: {[weak self] success, error in
YHHUD.hide()
guard let self = self else { return } guard let self = self else { return }
if error?.errorCode == 1008611 { if error?.errorCode == 1008611 {
YHCommonAlertView.show("实名认证", "为保证签署有效，请先实名认证", "取消", "去认证") { YHCommonAlertView.show("实名认证", "为保证签署有效，请先实名认证", "取消", "去认证") {
...@@ -370,7 +378,9 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -370,7 +378,9 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
} }
if type == .look { if type == .look {
YHHUD.show(.progress(message: ""))
self.viewModel.requestSignatureLook("\(self.id)") {[weak self] success, error in self.viewModel.requestSignatureLook("\(self.id)") {[weak self] success, error in
YHHUD.hide()
guard let self = self else { return } guard let self = self else { return }
if success { if success {
let url = URL(string: self.viewModel.pageUrl)! let url = URL(string: self.viewModel.pageUrl)!
...@@ -444,6 +454,7 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -444,6 +454,7 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
// 等待所有任务完成 // 等待所有任务完成
group.notify(queue: .main) { group.notify(queue: .main) {
YHHUD.hide()
// 所有任务完成，回到主线程继续执行 // 所有任务完成，回到主线程继续执行
print("所有任务完成") print("所有任务完成")
if imgArr.count == successArr.count { if imgArr.count == successArr.count {
...@@ -451,7 +462,7 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -451,7 +462,7 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
} else { } else {
YHHUD.flash(message: "\(successArr.count)张照片上传成功\n\(failArr.count)张照片上传失败") YHHUD.flash(message: "\(successArr.count)张照片上传成功\n\(failArr.count)张照片上传失败")
} }
YHHUD.hide()
} }
} }
sheetView.show() sheetView.show()
...@@ -492,6 +503,7 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -492,6 +503,7 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
// 等待所有任务完成 // 等待所有任务完成
group.notify(queue: .main) { group.notify(queue: .main) {
YHHUD.hide()
// 所有任务完成，回到主线程继续执行 // 所有任务完成，回到主线程继续执行
print("所有任务完成") print("所有任务完成")
if imgArr.count == successArr.count { if imgArr.count == successArr.count {
...@@ -499,15 +511,17 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -499,15 +511,17 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
} else { } else {
YHHUD.flash(message: "\(successArr.count)张照片上传成功\n\(failArr.count)张照片上传失败") YHHUD.flash(message: "\(successArr.count)张照片上传成功\n\(failArr.count)张照片上传失败")
} }
YHHUD.hide()
} }
} }
sheetView.show() sheetView.show()
} }
if type == .look { if type == .look {
YHHUD.show(.progress(message: ""))
self.oldUrl = self.viewModel.mainModel?.doc_return_manual[index] self.oldUrl = self.viewModel.mainModel?.doc_return_manual[index]
self.viewModel.getPublicImageUrl(self.oldUrl ?? "") { success, error in self.viewModel.getPublicImageUrl(self.oldUrl ?? "") { success, error in
YHHUD.hide()
if let success = success { if let success = success {
self.previewFileTool.openXLSXRemoteFile(urlString: success, fileName: "") self.previewFileTool.openXLSXRemoteFile(urlString: success, fileName: "")
} }
...@@ -515,16 +529,17 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -515,16 +529,17 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
} }
if type == .delete { if type == .delete {
self.oldUrl = self.viewModel.mainModel?.doc_return_manual[index] YHHUD.flash(message: "产品确定 后续完善")
self.viewModel.requestFileAction("\(self.id)", 3, [], self.oldUrl ?? "") {[weak self] success, error in // self.oldUrl = self.viewModel.mainModel?.doc_return_manual[index]
guard let self = self else { return } // self.viewModel.requestFileAction("\(self.id)", 3, [], self.oldUrl ?? "") {[weak self] success, error in
if success { // guard let self = self else { return }
YHHUD.flash(message: "删除成功") // if success {
} else { // YHHUD.flash(message: "删除成功")
YHHUD.flash(message: error?.errorMsg ?? "") // } else {
} // YHHUD.flash(message: error?.errorMsg ?? "")
self.getData() // }
} // self.getData()
// }
} }
} }
return cell return cell
......
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