Merge commit 'cc0d41d7' into xiezhaolin

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -2756,7 +2756,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -2776,7 +2776,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.7;
+				MARKETING_VERSION = 0.2.8;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2957,7 +2957,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -2977,7 +2977,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.7;
+				MARKETING_VERSION = 0.2.8;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2999,7 +2999,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3019,7 +3019,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.7;
+				MARKETING_VERSION = 0.2.8;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHHKPlanDoctumentVC.swift

@@ -23,6 +23,9 @@ class YHHKPlanDoctumentVC: YHBaseViewController {
     var status : Int = 0
     private var canEditFlag : Bool = false
     
+    private var timer : Timer?
+    
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         gk_navTitle = "赴港计划书"
@@ -38,6 +41,11 @@ class YHHKPlanDoctumentVC: YHBaseViewController {
         getData()
     }
     
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+        cancelTimer()
+    }
+    
     private var bottomView : UIView = {
         let view = UIView()
         view.backgroundColor = .white
@@ -59,6 +67,53 @@ class YHHKPlanDoctumentVC: YHBaseViewController {
 }
 
 extension YHHKPlanDoctumentVC {
+    
+    
+    fileprivate func cancelTimer() {
+        guard self.timer != nil else {
+            return
+        }
+        self.timer!.invalidate()
+        self.timer = nil
+    }
+    
+    
+    fileprivate func startTimer() {
+        self.timer = Timer.scheduledTimer(timeInterval: TimeInterval(3), target: self, selector: #selector(self.flipNext(sender:)), userInfo: nil, repeats:  false)
+        RunLoop.current.add(self.timer!, forMode: .common)
+    }
+    
+    @objc fileprivate func flipNext(sender: Timer?) {
+        YHHUD.hide()
+        YHHUD.flash(message: "提交成功")
+        getData()
+    }
+    
+    
+    func updateUI() {
+        
+        if status > 3 {
+            canEditFlag = false
+            bottomView.isHidden = true
+            tableView.snp.removeConstraints()
+            tableView.snp.remakeConstraints { make in
+                make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
+                make.left.right.equalToSuperview()
+                make.bottom.equalToSuperview()
+            }
+        } else {
+            canEditFlag = true
+            bottomView.isHidden = false
+            
+            tableView.snp.removeConstraints()
+            tableView.snp.remakeConstraints { make in
+                make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
+                make.left.right.equalToSuperview()
+                make.bottom.equalTo(bottomView.snp.top).offset(-kMargin)
+            }
+        }
+    }
+    
     //点击提交按钮
     @objc func clickSubmitBtn() {
         submitOp()
@@ -68,8 +123,6 @@ extension YHHKPlanDoctumentVC {
     private func submitOp() {
         
         if viewModel.arrHKPlanData.count > 5 {
-            
-            
             if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") {
                 let params = ["order_id":orderID,
                               "supplement_id":supplement_id,
@@ -80,8 +133,13 @@ extension YHHKPlanDoctumentVC {
                               "qualifications_and_awards":viewModel.arrHKPlanData[4].content,
                               "other":viewModel.arrHKPlanData[5].content,
                               "content_save":1]
-                
+                cancelTimer()
+                startTimer()
+                YHHUD.show(.progress(message: ""))
                 viewModel.submitHKPlanDocument(params) { success, error in
+                    YHHUD.hide()
+                    self.cancelTimer()
+                    self.getData()
                     if success {
                         YHHUD.flash(message: "提交成功")
                     } else {
@@ -101,10 +159,14 @@ extension YHHKPlanDoctumentVC {
         viewModel.requestDocumentsDetail("\(supplement_id)", callBackBlock: {[weak self] success, error in
             YHHUD.hide()
             guard let self = self else { return }
+            self.status = viewModel.mainModel?.prospectus.status ?? 0
             
             for item in viewModel.arrHKPlanData {
                 item.canEditFlag = self.canEditFlag
             }
+            
+            self.updateUI()
+            
             self.tableView.isHidden = false
             self.tableView.reloadData()
         })

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHMyDocumentsListViewController.swift

@@ -91,9 +91,7 @@ extension YHMyDocumentsListViewController {
         viewModel?.requestDocumentsList("\(orderId)", mobile, callBackBlock: {[weak self] success, error in
             guard let self = self else { return }
             if success {
-                
                 guard let arr = self.viewModel?.mainModel?.docs else { return }
-                
                 var tag = true
                 for item in arr {
                     if item.sign_doc.doc_send.contains(".pdf",caseSensitive: false) == false {
@@ -101,6 +99,7 @@ extension YHMyDocumentsListViewController {
                         break
                     }
                 }
+                self.headSessionView.userInfoData = self.viewModel?.mainModel?.user_info
                 self.canSendEmailFlag = tag
             } else {
                 YHHUD.flash(message: error?.errorMsg ?? "数据获取失败")

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/Model/YHMyDocumentDetailModel.swift

@@ -30,6 +30,9 @@ class YHMyDocumentProspectusModel: YHBaseModel {
     var tag: String = ""
     var tencent_file_id: String = ""
     var tencent_docs_url: String = ""
+    
+    //赴港计划书状态
+    var status : Int = 0
 }
 
 class YHMyDocumentWritingDocumentModel: YHBaseModel {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHHKPlanItemView.swift

@@ -181,6 +181,11 @@ private extension YHHKPlanItemView {
             myTextView.wrapToContent()
         }
         numberLabel.text = myTextView.text.count.string + "/100"
+        if myTextView.text.count > 100 {
+            numberLabel.textColor = .failColor
+        } else {
+            numberLabel.textColor = UIColor.placeHolderColor
+        }
         
         if model.isLastData {
             line.isHidden = true
@@ -193,6 +198,9 @@ private extension YHHKPlanItemView {
 
 extension YHHKPlanItemView : UITextViewDelegate {
     func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool {
+        if text.isEmpty {
+            return true
+        }
         let newLength = (textView.text as NSString).length + text.count - range.length
         return newLength <= 100
     }
@@ -201,7 +209,11 @@ extension YHHKPlanItemView : UITextViewDelegate {
         guard let model = dataMode else { return }
         guard let text = textView.text else { return }
         model.content = text
-        
         numberLabel.text = myTextView.text.count.string + "/100"
+        if myTextView.text.count > 100 {
+            numberLabel.textColor = .failColor
+        } else {
+            numberLabel.textColor = UIColor.placeHolderColor
+        }
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHMyDocListHeaderView.swift

@@ -26,6 +26,12 @@ class YHMyDocListHeaderView: UIView {
         }
     }
     
+    var userInfoData : YHMyDocumentsUserModel? {
+        didSet {
+            updateName()
+        }
+    }
+    
     
     var canShowDownLoadBtnFlag : Bool = false {
         didSet {
@@ -51,7 +57,7 @@ class YHMyDocListHeaderView: UIView {
     }
     
     private lazy var titleLable : UILabel = {
-        let lable0 = UILabel(text: "您好，林先生/女士")
+        let lable0 = UILabel(text: "您好，尊敬的客户")
         lable0.textColor = UIColor.mainTextColor
         lable0.font = UIFont.PFSC_M(ofSize: 21)
         return lable0
@@ -153,4 +159,20 @@ extension YHMyDocListHeaderView {
             hiddenButton(type:.downAll)
         }
     }
+    
+    
+    private func updateName() {
+        guard let model = userInfoData else { return }
+        if model.username.isEmpty {
+            titleLable.text = "您好，尊敬的客户"
+        } else {
+            var tmp = "您好," + model.username
+            if  model.sex == 1 {
+                tmp = tmp + "先生"
+            } else if model.sex == 2 {
+                tmp = tmp + "女士"
+            }
+            titleLable.text = tmp
+        }
+    }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/C/YHMySignatureListViewController.swift

@@ -95,6 +95,8 @@ extension YHMySignatureListViewController {
             } else {
                 YHHUD.flash(message: error?.errorMsg ?? "数据获取失败")
             }
+            
+            self.headSessionView.userInfoData = self.viewModel.mainModel?.user_info
             self.headSessionView.canShowDownLoadBtnFlag = true
             self.tableView.reloadData()
         })

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/Model/YHMySignatureListModel.swift

@@ -10,7 +10,7 @@ import UIKit
 
 class YHMySignatureListModel: YHBaseModel {
     var list: [YHMySignatureModel] = []
-    var user_info: YHMySignatureUserInfoModel = YHMySignatureUserInfoModel()
+    var user_info: YHMyDocumentsUserModel = YHMyDocumentsUserModel()
 }
 
 class YHMySignatureModel: YHBaseModel {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/V/YHMyFileMethodTableViewCell.swift

@@ -288,4 +288,3 @@ class YHSignatureToActionTableViewCell: UITableViewCell {
         }
     }
 }
-