Commit 45f488be authored by David黄金龙's avatar David黄金龙

Merge branch '630-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into 630-dev

* '630-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  //  头像
  我的文书和我的签字上传逻辑
parents b3785e7f dab1eaa2
...@@ -14,7 +14,7 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell { ...@@ -14,7 +14,7 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
var editBlock: EditBlock? var editBlock: EditBlock?
static let cellReuseIdentifier = "YHMyNameCardAvatarInfoCell" static let cellReuseIdentifier = "YHMyNameCardAvatarInfoCell"
let headWidth = 74.0 let headWidth = 80.0
var userModel:YHUserNameCardInfo = YHUserNameCardInfo() { var userModel:YHUserNameCardInfo = YHUserNameCardInfo() {
didSet { didSet {
...@@ -96,6 +96,7 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell { ...@@ -96,6 +96,7 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
let view = UIImageView() let view = UIImageView()
view.image = UIImage(named: "people_head_default") view.image = UIImage(named: "people_head_default")
view.layer.cornerRadius = headWidth/2.0 view.layer.cornerRadius = headWidth/2.0
view.contentMode = .scaleAspectFill
view.clipsToBounds = true view.clipsToBounds = true
return view return view
}() }()
...@@ -103,6 +104,7 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell { ...@@ -103,6 +104,7 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
lazy var headBgImgV:UIImageView = { lazy var headBgImgV:UIImageView = {
let view = UIImageView() let view = UIImageView()
view.image = UIImage(named: "people_user_head_bg") view.image = UIImage(named: "people_user_head_bg")
view.contentMode = .scaleToFill
return view return view
}() }()
...@@ -207,9 +209,9 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell { ...@@ -207,9 +209,9 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
self.contentView.backgroundColor = .clear self.contentView.backgroundColor = .clear
self.contentView.addSubview(self.cardView) self.contentView.addSubview(self.cardView)
self.contentView.addSubview(self.headImgV)
self.contentView.addSubview(self.headBackImgV) self.contentView.addSubview(self.headBackImgV)
self.contentView.addSubview(self.headBgImgV) self.contentView.addSubview(self.headBgImgV)
self.contentView.addSubview(self.headImgV)
self.contentView.addSubview(self.signImgV) self.contentView.addSubview(self.signImgV)
cardView.addSubview(self.bgImgV) cardView.addSubview(self.bgImgV)
...@@ -235,12 +237,12 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell { ...@@ -235,12 +237,12 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
} }
self.headBackImgV.snp.makeConstraints { make in self.headBackImgV.snp.makeConstraints { make in
make.width.height.equalTo(headWidth+10) make.width.height.equalTo(headWidth+4)
make.center.equalTo(self.headImgV) make.center.equalTo(self.headImgV)
} }
self.headBgImgV.snp.makeConstraints { make in self.headBgImgV.snp.makeConstraints { make in
make.width.height.equalTo(headWidth+6) make.width.height.equalTo(headWidth)
make.center.equalTo(self.headImgV) make.center.equalTo(self.headImgV)
} }
self.headImgV.snp.makeConstraints { make in self.headImgV.snp.makeConstraints { make in
......
...@@ -13,6 +13,7 @@ class YHNameCardInfoView: DragCardView { ...@@ -13,6 +13,7 @@ class YHNameCardInfoView: DragCardView {
static let height = 456.0 static let height = 456.0
static let width = KScreenWidth-36.0*2 static let width = KScreenWidth-36.0*2
let headWidth = 104.0
var sendBlock:((String?)->())? var sendBlock:((String?)->())?
var userModel:YHMatchUserInfo = YHMatchUserInfo() { var userModel:YHMatchUserInfo = YHMatchUserInfo() {
...@@ -84,7 +85,7 @@ class YHNameCardInfoView: DragCardView { ...@@ -84,7 +85,7 @@ class YHNameCardInfoView: DragCardView {
lazy var headImgV:UIImageView = { lazy var headImgV:UIImageView = {
let view = UIImageView() let view = UIImageView()
view.image = UIImage(named: "people_head_default") view.image = UIImage(named: "people_head_default")
view.layer.cornerRadius = 98.0/2.0 view.layer.cornerRadius = self.headWidth/2.0
view.contentMode = .scaleAspectFill view.contentMode = .scaleAspectFill
view.clipsToBounds = true view.clipsToBounds = true
return view return view
...@@ -99,6 +100,7 @@ class YHNameCardInfoView: DragCardView { ...@@ -99,6 +100,7 @@ class YHNameCardInfoView: DragCardView {
lazy var headBgImgV:UIImageView = { lazy var headBgImgV:UIImageView = {
let view = UIImageView() let view = UIImageView()
view.image = UIImage(named: "people_user_head_bg") view.image = UIImage(named: "people_user_head_bg")
view.contentMode = .scaleToFill
return view return view
}() }()
...@@ -194,9 +196,9 @@ class YHNameCardInfoView: DragCardView { ...@@ -194,9 +196,9 @@ class YHNameCardInfoView: DragCardView {
self.contentView.addSubview(self.bgImgV) self.contentView.addSubview(self.bgImgV)
self.contentView.addSubview(self.headImgV)
self.contentView.addSubview(self.headBackImgV) self.contentView.addSubview(self.headBackImgV)
self.contentView.addSubview(self.headBgImgV) self.contentView.addSubview(self.headBgImgV)
self.contentView.addSubview(self.headImgV)
self.contentView.addSubview(self.signImgV) self.contentView.addSubview(self.signImgV)
self.contentView.addSubview(self.nameLabel) self.contentView.addSubview(self.nameLabel)
self.contentView.addSubview(self.professionalLabel) self.contentView.addSubview(self.professionalLabel)
...@@ -210,16 +212,16 @@ class YHNameCardInfoView: DragCardView { ...@@ -210,16 +212,16 @@ class YHNameCardInfoView: DragCardView {
} }
self.headImgV.snp.makeConstraints { make in self.headImgV.snp.makeConstraints { make in
make.width.height.equalTo(98) make.width.height.equalTo(self.headWidth)
make.centerX.equalToSuperview() make.centerX.equalToSuperview()
make.bottom.equalTo(self.bgImgV).offset(20) make.bottom.equalTo(self.bgImgV).offset(20)
} }
self.headBgImgV.snp.makeConstraints { make in self.headBgImgV.snp.makeConstraints { make in
make.width.height.equalTo(98+6) make.width.height.equalTo(self.headWidth)
make.center.equalTo(self.headImgV) make.center.equalTo(self.headImgV)
} }
self.headBackImgV.snp.makeConstraints { make in self.headBackImgV.snp.makeConstraints { make in
make.width.height.equalTo(98+10) make.width.height.equalTo(self.headWidth+4)
make.center.equalTo(self.headImgV) make.center.equalTo(self.headImgV)
} }
self.signImgV.snp.makeConstraints { make in self.signImgV.snp.makeConstraints { make in
......
...@@ -613,18 +613,17 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -613,18 +613,17 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
print("所有任务完成") print("所有任务完成")
if imgArr.count == successArr.count { if imgArr.count == successArr.count {
YHHUD.flash(message: "上传成功") 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 { } else {
YHHUD.flash(message: "\(successArr.count)张照片上传成功\n\(failArr.count)张照片上传失败") 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() sheetView.show()
......
...@@ -578,18 +578,17 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -578,18 +578,17 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
print("所有任务完成") print("所有任务完成")
if imgArr.count == successArr.count { if imgArr.count == successArr.count {
YHHUD.flash(message: "上传成功") 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 { } else {
YHHUD.flash(message: "\(successArr.count)张照片上传成功\n\(failArr.count)张照片上传失败") 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() 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