Skip to content

G
galaxy-iOS
Commit a4bdef80 authored by pete谢兆麟's avatar pete谢兆麟
Browse files
Options

我的文书和我的签字多图上传逻辑

parent 2d5b9849
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 68 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHMyDocumentsDetailViewController.swift
View file @ a4bdef80
......@@ -333,23 +333,12 @@ class YHMyDocumentsDetailViewController: YHBaseViewController {
YHHUD.hide()
// 再调用业务接口
if let successUrl = successUrl, !successUrl.isEmpty {
var fileName = fileUrl.lastPathComponent
if fileName.isEmpty {
fileName = successUrl.lastPathComponent
}
let suffixName = successUrl.pathExtension.lowercased()
let model = YHContentUrl()
model.name = fileName
model.url = successUrl
model.suffix = suffixName
// YHHUD.show(.progress(message: "上传中..."))
var action = 1
if self.oldUrl?.count != 0 {
action = 2
}
self.viewModel.requestFileAction("\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)", action, [successUrl], self.oldUrl ?? "") {[weak self] success, error in
guard let self = self else { return }
// YHHUD.hide()
if success {
YHHUD.flash(message: "上传成功")
} else {
......@@ -374,35 +363,16 @@ class YHMyDocumentsDetailViewController: YHBaseViewController {
}
}
func uploadImage(_ img: UIImage, imageName:String, callBack:((Bool)->())?) {
func uploadImage(_ img: UIImage, imageName:String, callBack:((Bool, String)->())?) {
// 先OSS上传得到URL
self.viewModel.uploadImage(img) {
[weak self] url, error in
guard let self = self else { return }
if let url = url, !url.isEmpty {
var suffix = "jpg"
let suffixName = url.pathExtension.lowercased()
if !suffixName.isEmpty {
suffix = suffixName
}
// 再调用业务接口
let model = YHContentUrl()
model.name = imageName
model.url = url
model.suffix = suffix
var action = 1
if self.oldUrl?.count != 0 {
action = 2
}
self.viewModel.requestFileAction("\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)", action, [url], self.oldUrl ?? "") {[weak self] success, error in
guard let self = self else { return }
self.getData()
}
callBack?(true)
callBack?(true, url)
return
}
callBack?(false)
callBack?(false, "")
}
}
......@@ -602,7 +572,7 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
[weak self] imgArr in
guard let self = self else { return }
let group = DispatchGroup()
var successArr:[YHSelectImageItem] = []
var successArr:[String] = []
var failArr:[YHSelectImageItem] = []
YHHUD.show(.progress(message: "上传中..."))
......@@ -610,9 +580,9 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
if let image = item.data {
group.enter()
uploadImage(image, imageName:item.name) {
success in
success, url in
if success {
successArr.append(item)
successArr.append(url)
} else {
failArr.append(item)
}
......@@ -628,6 +598,14 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
print("所有任务完成")
if imgArr.count == successArr.count {
YHHUD.flash(message: "上传成功")
var action = 1
if self.oldUrl?.count != 0 {
action = 2
}
self.viewModel.requestFileAction("\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)", action, successArr, self.oldUrl ?? "") {[weak self] success, error in
guard let self = self else { return }
self.getData()
}
} else {
YHHUD.flash(message: "\(successArr.count)张照片上传成功\n\(failArr.count)张照片上传失败")
}
......@@ -656,7 +634,7 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
[weak self] imgArr in
guard let self = self else { return }
let group = DispatchGroup()
var successArr:[YHSelectImageItem] = []
var successArr: [String] = []
var failArr:[YHSelectImageItem] = []
YHHUD.show(.progress(message: "上传中..."))
......@@ -664,9 +642,9 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
if let image = item.data {
group.enter()
uploadImage(image, imageName:item.name) {
success in
success, url in
if success {
successArr.append(item)
successArr.append(url)
} else {
failArr.append(item)
}
......@@ -682,6 +660,14 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
print("所有任务完成")
if imgArr.count == successArr.count {
YHHUD.flash(message: "上传成功")
var action = 1
if self.oldUrl?.count != 0 {
action = 2
}
self.viewModel.requestFileAction("\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)", action, successArr, self.oldUrl ?? "") {[weak self] success, error in
guard let self = self else { return }
self.getData()
}
} else {
YHHUD.flash(message: "\(successArr.count)张照片上传成功\n\(failArr.count)张照片上传失败")
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/C/YHMySignatureDetailViewController.swift
View file @ a4bdef80
......@@ -318,35 +318,16 @@ class YHMySignatureDetailViewController: YHBaseViewController {
}
}
func uploadImage(_ img: UIImage, imageName:String, callBack:((Bool)->())?) {
func uploadImage(_ img: UIImage, imageName:String, callBack:((Bool, String)->())?) {
// 先OSS上传得到URL
self.viewModel.uploadImage(img) {
[weak self] url, error in
guard let self = self else { return }
guard self != nil else { return }
if let url = url, !url.isEmpty {
var suffix = "jpg"
let suffixName = url.pathExtension.lowercased()
if !suffixName.isEmpty {
suffix = suffixName
}
// 再调用业务接口
let model = YHContentUrl()
model.name = imageName
model.url = url
model.suffix = suffix
var action = 1
if self.oldUrl?.count != 0 {
action = 2
}
self.viewModel.requestFileAction("\(self.id)", action, [url], self.oldUrl ?? "") {[weak self] success, error in
guard let self = self else { return }
self.getData()
}
callBack?(true)
callBack?(true, url)
return
}
callBack?(false)
callBack?(false, "")
}
}
......@@ -494,7 +475,7 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
[weak self] imgArr in
guard let self = self else { return }
let group = DispatchGroup()
var successArr:[YHSelectImageItem] = []
var successArr:[String] = []
var failArr:[YHSelectImageItem] = []
YHHUD.show(.progress(message: "上传中..."))
......@@ -502,9 +483,9 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
if let image = item.data {
group.enter()
uploadImage(image, imageName:item.name) {
success in
success, url in
if success {
successArr.append(item)
successArr.append(url)
} else {
failArr.append(item)
}
......@@ -520,6 +501,15 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
print("所有任务完成")
if imgArr.count == successArr.count {
YHHUD.flash(message: "上传成功")
var action = 1
if self.oldUrl?.count != 0 {
action = 2
}
//sleep(1) 后端性能问题 不能并发调用接口
self.viewModel.requestFileAction("\(self.id)", action, successArr, self.oldUrl ?? "") {[weak self] success, error in
guard let self = self else { return }
self.getData()
}
} else {
YHHUD.flash(message: "\(successArr.count)张照片上传成功\n\(failArr.count)张照片上传失败")
}
......@@ -548,7 +538,7 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
[weak self] imgArr in
guard let self = self else { return }
let group = DispatchGroup()
var successArr:[YHSelectImageItem] = []
var successArr:[String] = []
var failArr:[YHSelectImageItem] = []
YHHUD.show(.progress(message: "上传中..."))
......@@ -556,9 +546,9 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
if let image = item.data {
group.enter()
uploadImage(image, imageName:item.name) {
success in
success, url in
if success {
successArr.append(item)
successArr.append(url)
} else {
failArr.append(item)
}
......@@ -574,6 +564,14 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
print("所有任务完成")
if imgArr.count == successArr.count {
YHHUD.flash(message: "上传成功")
var action = 1
if self.oldUrl?.count != 0 {
action = 2
}
self.viewModel.requestFileAction("\(self.id)", action, successArr, self.oldUrl ?? "") {[weak self] success, error in
guard let self = self else { return }
self.getData()
}
} else {
YHHUD.flash(message: "\(successArr.count)张照片上传成功\n\(failArr.count)张照片上传失败")
}
......
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