我的签字bug修复

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -2800,7 +2800,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;
@@ -3001,7 +3001,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;
@@ -3043,7 +3043,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

@@ -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

@@ -554,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

@@ -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

@@ -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

@@ -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

@@ -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(服务中心)/MySignature(我的签字)/C/YHMySignatureDetailViewController.swift

@@ -454,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

@@ -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

@@ -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

+{
+  "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

+{
+  "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

+{
+  "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
+  }
+}