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

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  续签文书管理控制使得已经上传10个文件点击上传按钮弹出toast
  续签补件bug修复
  更改版本号

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -6329,7 +6329,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -6474,7 +6474,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -6682,7 +6682,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -6732,7 +6732,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignDocumentManagement(续签文书管理)/C/YHResignDocumentDetailViewController.swift

@@ -356,7 +356,7 @@ extension YHResignDocumentDetailViewController: UITableViewDelegate, UITableView
                     }
                     let count = detailModel.signedDocument.count
                     if count >= 10 {
-                        YHHUD.flash(message: "最多上传10个图片或文件")
+                        YHHUD.flash(message: "最多上传10个文件，请删除后再次上传")
                         return
                     }
                     let allowedCount = 10 - count
@@ -600,7 +600,7 @@ extension YHResignDocumentDetailViewController {
             let isSureButtonEnable = model.signedDocument.count > 0
             if model.signedDocument.count == uploadMaxCount {
                 name = "继续上传"
-                isUploadEnable = false
+                isUploadEnable = true
             } else if model.signedDocument.count > 0 {
                 name = "继续上传"
                 isUploadEnable = true
@@ -639,7 +639,7 @@ extension YHResignDocumentDetailViewController {
         let isSureButtonEnable = totalCount > 0
         if totalCount >= uploadMaxCount {
             name = "继续上传"
-            isUploadEnable = false
+            isUploadEnable = true
         } else if totalCount > 0 {
             name = "继续上传"
             isUploadEnable = true

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignUploadDoc(续签补件)/V/YHResignUploadDocListCell.swift

@@ -301,7 +301,12 @@ class YHResignUploadDocItemView: UIView {
     
     @objc func centerClick() {
         if let block = clickBlock {
-            block(self.dataSource ?? YHResignUploadDocModel())
+            if let model = self.dataSource {
+                block(model)
+            }
+            if let model = self.docDataSource {
+                block(model)
+            }
         }
     }