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:
  续签文书管理失败弹窗以及隐藏签字按钮

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

@@ -96,8 +96,7 @@ extension YHResignDocumentDetailViewController {
             guard let documentModel = documentModel else {
                 printLog("YHResignDocumentDetailViewController:  请求失败")
                 if let errorMsg = error?.errorMsg, errorMsg.count > 0 {
-                    YHHUD.show(.error(message: errorMsg))
-                    YHHUD.hide(afterDelay: 1)
+                    YHHUD.flash(message: errorMsg)
                 }
                 return
             }
@@ -186,8 +185,7 @@ extension YHResignDocumentDetailViewController {
                     self.present(safariViewController, animated: true, completion: nil)
                 } else if let error = error {
                     let errorMsg = error.errorMsg
-                    YHHUD.show(.error(message: errorMsg))
-                    YHHUD.hide(afterDelay: 1)
+                    YHHUD.flash(message: errorMsg)
                 }
             }
             printLog("###editEvent")
@@ -201,13 +199,11 @@ extension YHResignDocumentDetailViewController {
             self.viewModel.submitResginDocument(model.docId, nil) { success, error in
                 YHHUD.hide()
                 if success {
-                    YHHUD.show(.success(message: "提交成功"))
-                    YHHUD.hide(afterDelay: 1)
+                    YHHUD.flash(message: "提交成功")
                     self.requestData(isNeedLoading: true)
                 } else if let error = error {
                     let errorMsg = error.errorMsg
-                    YHHUD.show(.error(message: errorMsg))
-                    YHHUD.hide(afterDelay: 1)
+                    YHHUD.flash(message: errorMsg)
                 }
             }
             printLog("###submitEvent")
@@ -228,8 +224,7 @@ extension YHResignDocumentDetailViewController {
                     if let error = error {
                         printLog("###续期文书签字: \(error.errorMsg)")
                         let errorMsg = error.errorMsg
-                        YHHUD.show(.error(message: errorMsg))
-                        YHHUD.hide(afterDelay: 1)
+                        YHHUD.flash(message: errorMsg)
                     }
                     return
                 }
@@ -259,8 +254,7 @@ extension YHResignDocumentDetailViewController {
                     self.present(safariViewController, animated: true, completion: nil)
                 } else if let error = error {
                     let errorMsg = error.errorMsg
-                    YHHUD.show(.error(message: errorMsg))
-                    YHHUD.hide(afterDelay: 1)
+                    YHHUD.flash(message: errorMsg)
                 }
             }
             printLog("###previewEvent")
@@ -284,23 +278,32 @@ extension YHResignDocumentDetailViewController {
                 self.navigationController?.pushViewController(vc)
             }
         }
+        // 产品定的没有生成签证文书就隐藏签字确认按钮
+        let isSignFileOK = model.signFileOrigin.count > 0
         
         switch docType {
         case .powerOfAttorney, .settlementPlan, .explanatoryStatement:
             switch status {
             case .pendingConfirmation, .awaitingSignature:
-                config.names = ["在线编辑", "提交", "签字确认"]
                 if let editEvent = editEvent {
                     actions.append(editEvent)
                 }
                 if let submitEvent = submitEvent {
                     actions.append(submitEvent)
                 }
-                if let signatureConfirmationEvent = signatureConfirmationEvent {
-                    actions.append(signatureConfirmationEvent)
+                
+                if isSignFileOK {
+                    config.names = ["在线编辑", "提交", "签字确认"]
+                    config.style = .three
+                    if let signatureConfirmationEvent = signatureConfirmationEvent {
+                        actions.append(signatureConfirmationEvent)
+                    }
+                } else {
+                    config.names = ["在线编辑", "提交"]
+                    config.style = .two
                 }
                 config.actions = actions
-                config.style = .three
+                
             case .finalizing, .underReview, .completed:
                 if let previewEvent = previewEvent {
                     actions.append(previewEvent)
@@ -329,12 +332,19 @@ extension YHResignDocumentDetailViewController {
                 if let infoConfirmationEvent = infoConfirmationEvent {
                     actions.append(infoConfirmationEvent)
                 }
-                if let signatureConfirmationEvent = signatureConfirmationEvent {
-                    actions.append(signatureConfirmationEvent)
+                if isSignFileOK {
+                    config.names = ["信息确认", "签字确认"]
+                    config.style = .two
+                    if let signatureConfirmationEvent = signatureConfirmationEvent {
+                        actions.append(signatureConfirmationEvent)
+                    }
+                } else {
+                    config.names = ["信息确认"]
+                    config.style = .one
                 }
-                config.names = ["信息确认", "签字确认"]
+                
                 config.actions = actions
-                config.style = .two
+                
             }
         }
         return config

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

@@ -87,8 +87,7 @@ extension YHResignDocumentManagementVC {
             } else {
                 printLog("YHResignDocumentManagementVC:  请求失败")
                 if let errorMsg = error?.errorMsg, errorMsg.count > 0 {
-                    YHHUD.show(.error(message: errorMsg))
-                    YHHUD.hide(afterDelay: 1)
+                    YHHUD.flash(message: errorMsg)
                 }
             }
         }

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

@@ -187,7 +187,7 @@ extension YHResignDocumentStatusCell {
         case .one:
             leftButton.isHidden = false
             midButton.isHidden = true
-            midButton.isHidden = true
+            rightButton.isHidden = true
             leftLineView.isHidden = true
             rightLineView.isHidden = true
             
@@ -212,7 +212,7 @@ extension YHResignDocumentStatusCell {
         case .two:
             leftButton.isHidden = false
             midButton.isHidden = false
-            midButton.isHidden = true
+            rightButton.isHidden = true
             leftLineView.isHidden = false
             rightLineView.isHidden = true
             if buttonsConfig.names.count > 1 {