Skip to content

G
galaxy-iOS
Commit fd07c51e authored by David黄金龙's avatar David黄金龙
Browse files
Options

Merge commit 'b4c497a3' into davidhuang 

* commit 'b4c497a3':
  我的签字bug修复
  我的文书我的签字bug
parents 593195a4 b4c497a3
Hide whitespace changes
Inline Side-by-side
Showing with 148 additions and 9 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ fd07c51e
......@@ -2804,7 +2804,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
......@@ -3005,7 +3005,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
......@@ -3047,7 +3047,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateNameCell.swift
View file @ fd07c51e
......@@ -57,6 +57,10 @@ class YHCertificateNameCell: UITableViewCell {
} else if suffix == "ppt" || suffix == "pptx" {
iconImgName = "my_cer_type_ppt"
} else if suffix == "bmp" {
iconImgName = "my_cer_type_bmp"
} else if suffix == "tiff" {
iconImgName = "my_cer_type_tiff"
}
iconImgV.image = UIImage(named: iconImgName)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHMyDocumentsDetailViewController.swift
View file @ fd07c51e
......@@ -103,6 +103,12 @@ class YHMyDocumentsDetailViewController: YHBaseViewController {
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
}
......@@ -119,6 +125,20 @@ class YHMyDocumentsDetailViewController: YHBaseViewController {
})
}
func getPromptHeight(_ value: String) -> CGFloat {
let text = value // 要显示的文本内容
let font = UIFont.PFSC_R(ofSize: 12) // 字体大小
let maxWidth = KScreenWidth - 74 // 最大宽度限制
// 创建NSAttributedString对象并设置属性
let attributes = [NSAttributedString.Key.font : font] as [NSAttributedString.Key : Any]
_ = NSMutableAttributedString(string: text, attributes: attributes)
// 根据指定的最大宽度和字体大小计算文本的高度
let size = (text as NSString).boundingRect(with: CGSize(width: maxWidth, height: .greatestFiniteMagnitude), options: .usesLineFragmentOrigin, attributes: attributes, context: nil).size
return size.height + 15
}
func updateDataSource() {
self.tableView.reloadData()
......@@ -534,7 +554,7 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
self.oldUrl = ""
let count = self.viewModel.mainModel?.writing_document.doc_sign.doc_return_manual.count ?? 0
if count >= 10 {
YHHUD.flash(message: "最多上传10个文件")
YHHUD.flash(message: "最多上传10个图片或文件")
return
}
var maxCount = 10 - count
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHDocumentFileItemView.swift
View file @ fd07c51e
......@@ -130,9 +130,14 @@ class YHDocumentFileItemView: UIView {
iconImgName = "my_cer_type_word"
} else if suffix == "ppt" || suffix == "pptx" {
iconImgName = "my_cer_type_ppt"
} else if suffix == "bmp" {
iconImgName = "my_cer_type_bmp"
} else if suffix == "tiff" {
iconImgName = "my_cer_type_tiff"
}
fileImageView.image = UIImage(named: iconImgName)
fileNameLabel.text = name + "(已签章)"
fileNameLabel.text = name + "\(index + 1)(已签章)"
}
@objc func centerClick() {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHDocumentMessageTableViewCell.swift
View file @ fd07c51e
......@@ -270,6 +270,10 @@ class YHDocumentMessageTableViewCell: UITableViewCell {
iconImgName = "my_cer_type_word"
} else if suffix == "ppt" || suffix == "pptx" {
iconImgName = "my_cer_type_ppt"
} else if suffix == "bmp" {
iconImgName = "my_cer_type_bmp"
} else if suffix == "tiff" {
iconImgName = "my_cer_type_tiff"
}
fileImageView.image = UIImage(named: iconImgName)
} else {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHDocumentToActionTableViewCell.swift
View file @ fd07c51e
......@@ -226,6 +226,10 @@ class YHDocumentToActionTableViewCell: UITableViewCell {
iconImgName = "my_cer_type_word"
} else if suffix == "ppt" || suffix == "pptx" {
iconImgName = "my_cer_type_ppt"
} else if suffix == "bmp" {
iconImgName = "my_cer_type_bmp"
} else if suffix == "tiff" {
iconImgName = "my_cer_type_tiff"
}
fileImageView.image = UIImage(named: iconImgName)
fileNameLabel.text = dataSource.writing_document.name
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHDocumentUploadTableViewCell.swift
View file @ fd07c51e
......@@ -100,6 +100,7 @@ class YHDocumentUploadTableViewCell: UITableViewCell {
bottomView = {
let view = YHWorkItemAddView()
view.addBtn.setTitle("上传已签章件".local, for: .normal)
view.addBtn.setImage(UIImage(named: "document_upload"), for: .normal)
view.clickBlock = {[weak self] in
guard let self = self else { return }
if let block = self.block {
......@@ -133,6 +134,11 @@ class YHDocumentUploadTableViewCell: UITableViewCell {
func updateAllViews() {
guard let dataSource = dataSource else { return }
mainItemView.removeSubviews()
if dataSource.writing_document.doc_sign.doc_return_manual.count != 0 {
bottomView.addBtn.setTitle("继续上传".local, for: .normal)
} else {
bottomView.addBtn.setTitle("上传已签章件".local, for: .normal)
}
var y = 0
for i in 0 ..< (dataSource.writing_document.doc_sign.doc_return_manual.count) {
let line = UIView()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHFailPromptView.swift
View file @ fd07c51e
......@@ -33,7 +33,7 @@ class YHFailPromptView: UIView {
}()
func setPrompt(_ prompt: String) {
titleLable.text = prompt
titleLable.text = "驳回原因：" + prompt
}
}
......@@ -42,7 +42,7 @@ private extension YHFailPromptView {
backgroundColor = UIColor(hex: 0xfeeded)
addSubview(alertImageView)
alertImageView.snp.makeConstraints { make in
make.centerY.equalToSuperview()
make.top.equalTo(10)
make.left.equalTo(18)
make.width.height.equalTo(16)
}
......@@ -51,7 +51,7 @@ private extension YHFailPromptView {
titleLable.snp.makeConstraints { make in
make.left.equalTo(38)
make.right.equalTo(-18)
make.top.bottom.equalToSuperview()
make.top.equalTo(8)
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/C/YHMySignatureDetailViewController.swift
View file @ fd07c51e
......@@ -88,6 +88,12 @@ class YHMySignatureDetailViewController: YHBaseViewController {
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 {
......@@ -102,6 +108,20 @@ class YHMySignatureDetailViewController: YHBaseViewController {
})
}
func getPromptHeight(_ value: String) -> CGFloat {
let text = value // 要显示的文本内容
let font = UIFont.PFSC_R(ofSize: 12) // 字体大小
let maxWidth = KScreenWidth - 74 // 最大宽度限制
// 创建NSAttributedString对象并设置属性
let attributes = [NSAttributedString.Key.font : font] as [NSAttributedString.Key : Any]
_ = NSMutableAttributedString(string: text, attributes: attributes)
// 根据指定的最大宽度和字体大小计算文本的高度
let size = (text as NSString).boundingRect(with: CGSize(width: maxWidth, height: .greatestFiniteMagnitude), options: .usesLineFragmentOrigin, attributes: attributes, context: nil).size
return size.height + 15
}
func updateDataSource() {
self.tableView.reloadData()
}
......@@ -434,7 +454,7 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
self.oldUrl = ""
let count = self.viewModel.mainModel?.doc_return_manual.count ?? 0
if count >= 10 {
YHHUD.flash(message: "最多上传10个文件")
YHHUD.flash(message: "最多上传10个图片或文件")
return
}
var maxCount = 10 - count
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/V/YHMyFileMethodTableViewCell.swift
View file @ fd07c51e
......@@ -238,6 +238,10 @@ class YHSignatureToActionTableViewCell: UITableViewCell {
iconImgName = "my_cer_type_word"
} else if suffix == "ppt" || suffix == "pptx" {
iconImgName = "my_cer_type_ppt"
} else if suffix == "bmp" {
iconImgName = "my_cer_type_bmp"
} else if suffix == "tiff" {
iconImgName = "my_cer_type_tiff"
}
fileImageView.image = UIImage(named: iconImgName)
fileNameLabel.text = dataSource.doc_type_name
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/V/YHSignatureUploadTableViewCell.swift
View file @ fd07c51e
......@@ -100,6 +100,7 @@ class YHSignatureUploadTableViewCell: UITableViewCell {
bottomView = {
let view = YHWorkItemAddView()
view.addBtn.setTitle("上传已签章件".local, for: .normal)
view.addBtn.setImage(UIImage(named: "document_upload"), for: .normal)
view.clickBlock = {[weak self] in
guard let self = self else { return }
if let block = self.block {
......@@ -133,6 +134,11 @@ class YHSignatureUploadTableViewCell: UITableViewCell {
func updateAllViews() {
guard let dataSource = dataSource else { return }
mainItemView.removeSubviews()
if dataSource.doc_return_manual.count != 0 {
bottomView.addBtn.setTitle("继续上传".local, for: .normal)
} else {
bottomView.addBtn.setTitle("上传已签章件".local, for: .normal)
}
var y = 0
for i in 0 ..< (dataSource.doc_return_manual.count) {
let line = UIView()
......
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/我的文书和签字/document_upload.imageset/Contents.json 0 → 100644
View file @ fd07c51e
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "document_upload@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "document_upload@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/我的证书/my_cer_type_bmp.imageset/Contents.json 0 → 100644
View file @ fd07c51e
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "my_cer_type_bmp@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "my_cer_type_bmp@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/我的证书/my_cer_type_tiff.imageset/Contents.json 0 → 100644
View file @ fd07c51e
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "my_cer_type_tiff@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "my_cer_type_tiff@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
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