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

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

parent 1ce34384
...@@ -613,6 +613,9 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -613,6 +613,9 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
print("所有任务完成") print("所有任务完成")
if imgArr.count == successArr.count { if imgArr.count == successArr.count {
YHHUD.flash(message: "上传成功") YHHUD.flash(message: "上传成功")
} else {
YHHUD.flash(message: "\(successArr.count)张照片上传成功\n\(failArr.count)张照片上传失败")
}
var action = 1 var action = 1
if self.oldUrl?.count != 0 { if self.oldUrl?.count != 0 {
action = 2 action = 2
...@@ -621,10 +624,6 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -621,10 +624,6 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
guard let self = self else { return } guard let self = self else { return }
self.getData() self.getData()
} }
} else {
YHHUD.flash(message: "\(successArr.count)张照片上传成功\n\(failArr.count)张照片上传失败")
}
} }
} }
sheetView.show() sheetView.show()
......
...@@ -578,6 +578,9 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -578,6 +578,9 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
print("所有任务完成") print("所有任务完成")
if imgArr.count == successArr.count { if imgArr.count == successArr.count {
YHHUD.flash(message: "上传成功") YHHUD.flash(message: "上传成功")
} else {
YHHUD.flash(message: "\(successArr.count)张照片上传成功\n\(failArr.count)张照片上传失败")
}
var action = 1 var action = 1
if self.oldUrl?.count != 0 { if self.oldUrl?.count != 0 {
action = 2 action = 2
...@@ -586,10 +589,6 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -586,10 +589,6 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
guard let self = self else { return } guard let self = self else { return }
self.getData() self.getData()
} }
} else {
YHHUD.flash(message: "\(successArr.count)张照片上传成功\n\(failArr.count)张照片上传失败")
}
} }
} }
sheetView.show() sheetView.show()
......
...@@ -74,9 +74,6 @@ class YHOSSManager: NSObject, URLSessionDelegate { ...@@ -74,9 +74,6 @@ class YHOSSManager: NSObject, URLSessionDelegate {
return return
} }
self.publicModel = resultModel self.publicModel = resultModel
if let block = completionHandler {
block()
}
} failBlock: { err in } failBlock: { err in
} }
} }
...@@ -127,6 +124,7 @@ class YHOSSManager: NSObject, URLSessionDelegate { ...@@ -127,6 +124,7 @@ class YHOSSManager: NSObject, URLSessionDelegate {
let result = t let result = t
if (result.error != nil) { if (result.error != nil) {
callBackBlock(nil, YHErrorModel()) callBackBlock(nil, YHErrorModel())
self.fileName.removeFirst()
} else { } else {
let dateFormatter = DateFormatter() let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "yyyyMMdd" dateFormatter.dateFormat = "yyyyMMdd"
...@@ -137,8 +135,8 @@ class YHOSSManager: NSObject, URLSessionDelegate { ...@@ -137,8 +135,8 @@ class YHOSSManager: NSObject, URLSessionDelegate {
} else { } else {
string = "https://" + self.model.bucket + "." + "oss-cn-shenzhen.aliyuncs.com/" + "4001001" + "/" + currentDateMMdd + "/" + "\(self.fileName.first ?? "")" string = "https://" + self.model.bucket + "." + "oss-cn-shenzhen.aliyuncs.com/" + "4001001" + "/" + currentDateMMdd + "/" + "\(self.fileName.first ?? "")"
} }
self.fileName.removeFirst()
callBackBlock(string, YHErrorModel()) callBackBlock(string, YHErrorModel())
self.fileName.removeFirst()
} }
return return
}) })
...@@ -189,8 +187,9 @@ class YHOSSManager: NSObject, URLSessionDelegate { ...@@ -189,8 +187,9 @@ class YHOSSManager: NSObject, URLSessionDelegate {
let result = t let result = t
if (result.error != nil) { if (result.error != nil) {
let error: NSError = (task.error)! as NSError let error: NSError = (task.error)! as NSError
let result = error.description _ = error.description
callBackBlock(nil, YHErrorModel()) callBackBlock(nil, YHErrorModel())
self.fileName.removeFirst()
} else { } else {
let dateFormatter = DateFormatter() let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "yyyyMMdd" dateFormatter.dateFormat = "yyyyMMdd"
...@@ -201,8 +200,8 @@ class YHOSSManager: NSObject, URLSessionDelegate { ...@@ -201,8 +200,8 @@ class YHOSSManager: NSObject, URLSessionDelegate {
} else { } else {
string = "https://" + self.model.bucket + "." + "oss-cn-shenzhen.aliyuncs.com/" + "4001001" + "/" + currentDateMMdd + "/" + "\(self.fileName.first ?? "")" string = "https://" + self.model.bucket + "." + "oss-cn-shenzhen.aliyuncs.com/" + "4001001" + "/" + currentDateMMdd + "/" + "\(self.fileName.first ?? "")"
} }
self.fileName.removeFirst()
callBackBlock(string, YHErrorModel()) callBackBlock(string, YHErrorModel())
self.fileName.removeFirst()
} }
return 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