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

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/ OfficialApprovalBatch/C/YHOfficialApprovalResultVC.swift

@@ -14,16 +14,8 @@ import FSPagerView
  */
 
 class YHOfficialApprovalResultVC: YHBaseViewController {
-
     var contentView: YHOffivialApprovalSuccessView!
     
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        setupUI()
-        
-        getAlertStatus()
-    }
-    
     //背景
     lazy var bkgImageV: UIImageView = {
         let imageV  = UIImageView()
@@ -140,6 +132,16 @@ class YHOfficialApprovalResultVC: YHBaseViewController {
         return vm
     }()
     
+    
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        setupUI()
+        
+        getAlertStatus()
+        getOfficalGuildCheckStatus()
+    }
+    
 }
 
 private extension YHOfficialApprovalResultVC {
@@ -153,6 +155,15 @@ private extension YHOfficialApprovalResultVC {
         }
     }
     
+    //获取正式批 操作指引 确认状态
+    func getOfficalGuildCheckStatus() {
+        princleVM.getOfficialCheckStatus { success, error in
+            if success {
+                
+            }
+        }
+    }
+    
     //获取弹窗状态
     func getAlertStatus() {
         princleVM.getPrincleStatus { success, error in
@@ -336,6 +347,20 @@ private extension YHOfficialApprovalResultVC {
     @objc func clickRightItemBtn() {
         
         let view = YHOffivialApprovalGuildLineCheckView.sheetView()
+        view.ischeckBeforeFlag = princleVM.isOfficialGuildCheckFlag
+        view.block = {
+            //点击了 正式批 操作指引
+            if !self.princleVM.isOfficialGuildCheckFlag {
+                self.princleVM.postAlertStatus(2) { success, error in
+                    if success {
+                        
+                    } else {
+                        
+                    }
+                    self.getOfficalGuildCheckStatus()
+                }
+            }
+        }
         view.show()
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/ OfficialApprovalBatch/V/YHOffivialApprovalGuildLineCheckView.swift

@@ -8,6 +8,10 @@
 
 import UIKit
 class YHOffivialApprovalGuildLineCheckView: UIView {
+    
+    typealias Block = () -> ()
+    var block: Block?
+    
     lazy var blackMaskView: UIView = {
         let view = UIView()
         view.backgroundColor = UIColor(hex: 0x0F1214, alpha: 0.5)
@@ -90,7 +94,17 @@ class YHOffivialApprovalGuildLineCheckView: UIView {
     private var timer : Timer?
     private var maxCount : Int = 5
     
-    private var ischeckBeforeFlag : Bool = false //之前是否展示过
+    //之前是否展示过
+    var ischeckBeforeFlag : Bool = false {
+        didSet {
+            if ischeckBeforeFlag {
+                setButtonEnable(true)
+            } else {
+                setButtonEnable(false)
+                startTimer()
+            }
+        }
+    }
 }
 
 extension YHOffivialApprovalGuildLineCheckView  {
@@ -109,6 +123,7 @@ extension YHOffivialApprovalGuildLineCheckView  {
     }
     
     @objc func clickSureBtn() {
+        self.block?()
         dismiss()
     }
 }
@@ -208,14 +223,6 @@ private extension YHOffivialApprovalGuildLineCheckView {
             }
             myScrollView.contentSize = CGSize(width: KScreenWidth, height: imageH)
         }
-        
-        
-        if ischeckBeforeFlag {
-            setButtonEnable(true)
-        } else {
-            startTimer()
-            setButtonEnable(false)
-        }
     }
 }
 
@@ -230,6 +237,7 @@ extension YHOffivialApprovalGuildLineCheckView : UIScrollViewDelegate {
            let currentOffset = scrollView.contentOffset.y
            if currentOffset > scrollOffsetThreshold { // 接近底部
                // 滚动到了底部
+               ischeckBeforeFlag = true
                stopTimer()
                setButtonEnable(true)
            } else {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/VM/YHPrincleViewModel.swift

@@ -18,6 +18,11 @@ class YHPrincleViewModel: YHBaseViewModel {
     
     //原则批、正式批弹窗状态
     var alertStatusModel : YHPrincipleAlertStatusModel?
+    
+    //正式批 操作指引是否确认
+//    var officialGuildCheckModel : YHPrincipleAlertStatusModel?
+    var isOfficialGuildCheckFlag : Bool = false
+    
 }
 
 
@@ -63,7 +68,35 @@ extension YHPrincleViewModel {
         }
     }
     
-    //获取是否弹窗
+    
+    //获取正式批 操作指引 确认状态
+    func getOfficialCheckStatus(callback:((_ success: Bool,_ error:YHErrorModel?)->())?) {
+        let param = ["IdentifyGetHKAcceptOperateGuid":2]
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Principle.getOfficialCheckStatusApi
+        let _ = YHNetRequest.getRequest(url: strUrl,params: param) { [weak self] json, code in
+            //1. json字符串 转 对象
+            guard let self = self else { return }
+            printLog("model 是 ==> \(json)")
+            
+            if json.code == 200 {
+                if let flag = json.data as? Bool {
+                    self.isOfficialGuildCheckFlag = flag
+                } else {
+                    self.isOfficialGuildCheckFlag = false
+                }
+                callback?(true, nil)
+            } else {
+                
+                let err = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.isEmpty ? "" : json.msg)
+                callback?(false, err)
+            }
+            
+        } failBlock: { err in
+            callback?(false, err)
+        }
+    }
+    
+    //获取是否弹窗 原则批、正式批
     func getPrincleStatus(callback:((_ success: Bool,_ error:YHErrorModel?)->())?) {
         
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Principle.getAlertStatusApi

galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift

@@ -380,9 +380,12 @@ class YHAllApiName {
     struct Principle {
         //上报原则批弹窗已展示
         static let postAlertStatusApi = "super-app/common/agreement/add"
-        //原则批弹窗状态
+        //原则批、正式批弹窗状态
         static let getAlertStatusApi = "super-app/home/agreement-check"
         
+        //正式批操作指引是否确认
+        static let getOfficialCheckStatusApi = "super-app/common/agreement/check"
+        
         // 原则批审批结果
         static let getReviewResult = "super-app/order/approval/principle"
         // 获取档案号列表