Commit e2d0d878 authored by pete谢兆麟's avatar pete谢兆麟

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

parent 1ce34384
......@@ -613,18 +613,17 @@ 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)张照片上传失败")
}
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()
}
}
}
sheetView.show()
......
......@@ -578,18 +578,17 @@ 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)张照片上传失败")
}
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()
}
}
}
sheetView.show()
......
......@@ -74,9 +74,6 @@ class YHOSSManager: NSObject, URLSessionDelegate {
return
}
self.publicModel = resultModel
if let block = completionHandler {
block()
}
} failBlock: { err in
}
}
......@@ -127,6 +124,7 @@ class YHOSSManager: NSObject, URLSessionDelegate {
let result = t
if (result.error != nil) {
callBackBlock(nil, YHErrorModel())
self.fileName.removeFirst()
} else {
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "yyyyMMdd"
......@@ -137,8 +135,8 @@ class YHOSSManager: NSObject, URLSessionDelegate {
} else {
string = "https://" + self.model.bucket + "." + "oss-cn-shenzhen.aliyuncs.com/" + "4001001" + "/" + currentDateMMdd + "/" + "\(self.fileName.first ?? "")"
}
self.fileName.removeFirst()
callBackBlock(string, YHErrorModel())
self.fileName.removeFirst()
}
return
})
......@@ -189,8 +187,9 @@ class YHOSSManager: NSObject, URLSessionDelegate {
let result = t
if (result.error != nil) {
let error: NSError = (task.error)! as NSError
let result = error.description
_ = error.description
callBackBlock(nil, YHErrorModel())
self.fileName.removeFirst()
} else {
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "yyyyMMdd"
......@@ -201,8 +200,8 @@ class YHOSSManager: NSObject, URLSessionDelegate {
} else {
string = "https://" + self.model.bucket + "." + "oss-cn-shenzhen.aliyuncs.com/" + "4001001" + "/" + currentDateMMdd + "/" + "\(self.fileName.first ?? "")"
}
self.fileName.removeFirst()
callBackBlock(string, YHErrorModel())
self.fileName.removeFirst()
}
return
})
......
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