Skip to content

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

优化按钮闪烁问题

parent 79c1067e
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 79 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHMyDocumentsDetailViewController.swift
View file @ e9298c1b
......@@ -84,50 +84,7 @@ class YHMyDocumentsDetailViewController: YHBaseViewController {
let state = self.viewModel.mainModel?.writing_document.doc_sign.status ?? 0
// 0-待上传，1-未发送, 2-发送中，3-已发送，4-已签收，5-审核通过，6-驳回
self.type = state
if state < 3 {
//没有doc_sign
self.stepView.currentIndex = 0
self.bottomView.isHidden = true
}
else if state == 3 {
self.promptView.isHidden = true
self.bottomButton.isEnabled = true
self.bottomView.isHidden = false
self.bottomButton.alpha = 1
self.bottomButton.setTitle("确定已签章，提交", for: .normal)
self.stepView.currentIndex = 1
} else if state == 4 {
self.promptView.isHidden = true
self.bottomButton.isEnabled = false
self.bottomButton.alpha = 0.4
self.bottomView.isHidden = false
self.bottomButton.setTitle("提交成功", for: .normal)
self.stepView.currentIndex = 1
} else if state == 5 {
self.promptView.isHidden = true
self.bottomView.isHidden = true
self.bottomButton.isEnabled = true
self.bottomButton.alpha = 1
self.bottomButton.setTitle("确定已签章，提交", for: .normal)
self.stepView.currentIndex = 1
} else {
self.promptView.isHidden = false
self.promptView.setPrompt(self.viewModel.mainModel?.writing_document.doc_sign.audit_opinion ?? "")
self.bottomButton.isEnabled = true
self.bottomView.isHidden = false
self.bottomButton.alpha = 1
self.bottomButton.setTitle("确定已签章，提交", for: .normal)
let height = self.getPromptHeight(self.viewModel.mainModel?.writing_document.doc_sign.audit_opinion ?? "")
self.promptView.snp.remakeConstraints { make in
make.height.equalTo(height)
make.bottom.equalTo(-k_Height_safeAreaInsetsBottom() - 64)
make.left.right.equalTo(self.view)
}
self.stepView.currentIndex = 1
}
}
self.tableView.reloadData()
} else {
YHHUD.flash(message: error?.errorMsg ?? "")
}
......@@ -138,11 +95,53 @@ class YHMyDocumentsDetailViewController: YHBaseViewController {
func checkSign() {
viewModel?.requestSignCallBack("\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)", callBackBlock: {[weak self] success, error in
guard let self = self else { return }
self.isSign = success
if self.type == 3 && self.viewModel.mainModel?.writing_document.doc_sign.doc_return_manual.count == 0 && !success {
let state = self.type
if state < 3 {
//没有doc_sign
self.stepView.currentIndex = 0
self.bottomView.isHidden = true
}
else if state == 3 {
self.promptView.isHidden = true
self.bottomButton.isEnabled = true
self.bottomView.isHidden = false
self.bottomButton.alpha = 1
self.bottomButton.setTitle("确定已签章，提交", for: .normal)
self.stepView.currentIndex = 1
if self.viewModel.mainModel?.writing_document.doc_sign.doc_return_manual.count == 0 && !success {
self.bottomButton.isEnabled = false
self.bottomButton.alpha = 0.4
}
} else if state == 4 {
self.promptView.isHidden = true
self.bottomButton.isEnabled = false
self.bottomButton.alpha = 0.4
self.bottomView.isHidden = false
self.bottomButton.setTitle("提交成功", for: .normal)
self.stepView.currentIndex = 1
} else if state == 5 {
self.promptView.isHidden = true
self.bottomView.isHidden = true
self.bottomButton.isEnabled = true
self.bottomButton.alpha = 1
self.bottomButton.setTitle("确定已签章，提交", for: .normal)
self.stepView.currentIndex = 1
} else {
self.promptView.isHidden = false
self.promptView.setPrompt(self.viewModel.mainModel?.writing_document.doc_sign.audit_opinion ?? "")
self.bottomButton.isEnabled = true
self.bottomView.isHidden = false
self.bottomButton.alpha = 1
self.bottomButton.setTitle("确定已签章，提交", for: .normal)
let height = self.getPromptHeight(self.viewModel.mainModel?.writing_document.doc_sign.audit_opinion ?? "")
self.promptView.snp.remakeConstraints { make in
make.height.equalTo(height)
make.bottom.equalTo(-k_Height_safeAreaInsetsBottom() - 64)
make.left.right.equalTo(self.view)
}
self.stepView.currentIndex = 1
}
self.isSign = success
self.tableView.reloadData()
})
}
......@@ -234,6 +233,7 @@ class YHMyDocumentsDetailViewController: YHBaseViewController {
button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
button.layer.cornerRadius = kCornerRadius3
button.clipsToBounds = true
button.alpha = 0
button.addTarget(self, action: #selector(submit), for: .touchUpInside)
return button
}()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/C/YHMySignatureDetailViewController.swift
View file @ e9298c1b
......@@ -68,39 +68,6 @@ class YHMySignatureDetailViewController: YHBaseViewController {
let state = self.viewModel.mainModel?.status ?? 0
// 0-待上传，1-未发送, 2-发送中，3-已发送，4-已签收，5-审核通过，6-驳回
self.type = state
if state == 0 || state == 1 || state == 2 || state == 3 {
self.promptView.isHidden = true
self.bottomButton.isEnabled = true
self.bottomView.isHidden = false
self.bottomButton.alpha = 1
self.bottomButton.setTitle("确定已签章，提交", for: .normal)
} else if state == 4 {
self.promptView.isHidden = true
self.bottomButton.isEnabled = false
self.bottomView.isHidden = false
self.bottomButton.alpha = 0.4
self.bottomButton.setTitle("提交成功", for: .normal)
} else if state == 5 {
self.promptView.isHidden = true
self.bottomView.isHidden = true
self.bottomButton.isEnabled = true
self.bottomButton.alpha = 1
self.bottomButton.setTitle("确定已签章，提交", for: .normal)
} else {
self.promptView.isHidden = false
self.promptView.setPrompt(self.viewModel.mainModel?.audit_opinion ?? "")
self.bottomButton.isEnabled = true
self.bottomView.isHidden = false
self.bottomButton.alpha = 1
self.bottomButton.setTitle("确定已签章，提交", for: .normal)
let height = self.getPromptHeight(self.viewModel.mainModel?.audit_opinion ?? "")
self.promptView.snp.remakeConstraints { make in
make.height.equalTo(height)
make.bottom.equalTo(-k_Height_safeAreaInsetsBottom() - 64)
make.left.right.equalTo(self.view)
}
}
self.tableView.reloadData()
} else {
YHHUD.flash(message: error?.errorMsg ?? "")
}
......@@ -112,9 +79,42 @@ class YHMySignatureDetailViewController: YHBaseViewController {
viewModel?.requestSignCallBack("\(self.id)", callBackBlock: {[weak self] success, error in
guard let self = self else { return }
self.isSign = success
if self.type == 3 && self.viewModel.mainModel?.doc_return_manual.count == 0 && !success {
let state = self.type
if state == 0 || state == 1 || state == 2 || state == 3 {
self.promptView.isHidden = true
self.bottomButton.isEnabled = true
self.bottomView.isHidden = false
self.bottomButton.alpha = 1
self.bottomButton.setTitle("确定已签章，提交", for: .normal)
if self.type == 3 && self.viewModel.mainModel?.doc_return_manual.count == 0 && !success {
self.bottomButton.isEnabled = false
self.bottomButton.alpha = 0.4
}
} else if state == 4 {
self.promptView.isHidden = true
self.bottomButton.isEnabled = false
self.bottomView.isHidden = false
self.bottomButton.alpha = 0.4
self.bottomButton.setTitle("提交成功", for: .normal)
} else if state == 5 {
self.promptView.isHidden = true
self.bottomView.isHidden = true
self.bottomButton.isEnabled = true
self.bottomButton.alpha = 1
self.bottomButton.setTitle("确定已签章，提交", for: .normal)
} else {
self.promptView.isHidden = false
self.promptView.setPrompt(self.viewModel.mainModel?.audit_opinion ?? "")
self.bottomButton.isEnabled = true
self.bottomView.isHidden = false
self.bottomButton.alpha = 1
self.bottomButton.setTitle("确定已签章，提交", for: .normal)
let height = self.getPromptHeight(self.viewModel.mainModel?.audit_opinion ?? "")
self.promptView.snp.remakeConstraints { make in
make.height.equalTo(height)
make.bottom.equalTo(-k_Height_safeAreaInsetsBottom() - 64)
make.left.right.equalTo(self.view)
}
}
self.tableView.reloadData()
})
......@@ -195,6 +195,7 @@ class YHMySignatureDetailViewController: YHBaseViewController {
button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
button.layer.cornerRadius = kCornerRadius3
button.clipsToBounds = true
button.alpha = 0
button.addTarget(self, action: #selector(submit), for: .touchUpInside)
return button
}()
......
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