服务页跳会话引导

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/C/YHServerCenterHoldViewController.swift

@@ -10,10 +10,6 @@ import UIKit
 import JXSegmentedView
 
 class YHServerCenterHoldViewController: UIViewController {
-    private lazy var princleVM : YHPrincleViewModel = {
-        let vm = YHPrincleViewModel()
-        return vm
-    }()
     
     private let serviceCenterMainReqVM : YHServiceCenterViewModel = YHServiceCenterViewModel()
     var stepID: Int = 0
@@ -94,11 +90,6 @@ class YHServerCenterHoldViewController: UIViewController {
         NotificationCenter.default.addObserver(self, selector: #selector(goToServiceTabFromFileListPage), name: YhConstant.YhNotification.didClickFileListBackToServiceTabNotifiction, object: nil)
         // Do any additional setup after loading the view.
     }
-    
-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-        showAlert()
-    }
 
     override func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
@@ -114,27 +105,7 @@ class YHServerCenterHoldViewController: UIViewController {
             make.bottom.equalToSuperview()
         }
     }
-    
-    private func showAlert() {
-        guard YHLoginManager.shared.isLogin() else {
-            return
-        }
-        princleVM.getPrincleStatus { [weak self] success, error in
-            if success {
-                guard let self = self else {
-                    return
-                }
-                guard let model = self.princleVM.alertStatusModel else {
-                    return
-                }
-                
-                if model.type == 20 {
-                    self.showYHManagerGuideView(self.navigationController)
-                }
-            }
-        }
-    }
-    
+        
     func setupView() {
         view.backgroundColor = .clear
         controllerOne.type = 0
@@ -265,41 +236,3 @@ extension YHServerCenterHoldViewController: JXSegmentedListContainerViewDataSour
         return arrItemVCs[index]
     }
 }
-
-extension YHServerCenterHoldViewController {
-    //MARK: - 跳银河管家
-    
-    private func showYHManagerGuideView(_ navigationController: UINavigationController?) {
-        if YHUatHelper.shared.getUatModuleStatusBy(module: .QiYu_Service) != 1 {
-            printLog("非目标用户")
-            return
-        }
-        if let key = YHButlerServiceManager.shared.guideWindowShowedKey, YHButlerServiceManager.shared.didShowWindowDict[key] == true {
-            return
-        }
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) {
-            if let key = YHButlerServiceManager.shared.guideWindowShowedKey {
-                YHButlerServiceManager.shared.didShowWindowDict[key] = true
-            }
-            let view = YHConversationGuideView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: KScreenHeight))
-            view.checkButtonEvent = { [weak self] in
-                guard let self = self else {
-                    return
-                }
-                self.princleVM.postAlertStatus(20) { success, error in
-                }
-                self.gotoYinHeManager(navigationController)
-            }
-            view.show()
-        }
-    }
-    
-    private func gotoYinHeManager(_ navigationController: UINavigationController?) {
-        guard let userId = YHLoginManager.shared.userModel?.id, userId.count > 0 else {
-            return
-        }
-        //YHAnalytics.track("APP_HomeTab_IntelligentAssistant")
-        YHButlerServiceManager.shared.gotoButlerServiceSessionVC(navigationController: navigationController, completion: { _ in
-        })
-    }
-}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/C/YHServiceCenterViewController.swift

@@ -11,6 +11,10 @@ import JXSegmentedView
 import AttributedString
 
 class YHServiceCenterViewController: YHBaseViewController {
+    private lazy var princleVM : YHPrincleViewModel = {
+        let vm = YHPrincleViewModel()
+        return vm
+    }()
     
     private let serviceCenterMainReqVM : YHServiceCenterViewModel = YHServiceCenterViewModel()
     
@@ -28,6 +32,8 @@ class YHServiceCenterViewController: YHBaseViewController {
     var isCanSelectStep: Bool = false
     var stepID: Int = 0
     var headIndex = 0
+    private weak var tipsView: YHServiceOrderTipsView?
+    private var needShowYHManagerGuideView = false
     
     private lazy var topBkg : UIView = {
         let imagV = UIImageView()
@@ -160,6 +166,30 @@ class YHServiceCenterViewController: YHBaseViewController {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         loadData()
+        showAlert()
+    }
+    
+    private func showAlert() {
+        guard YHLoginManager.shared.isLogin() else {
+            return
+        }
+        princleVM.getPrincleStatus { [weak self] success, error in
+            if success {
+                guard let self = self else {
+                    return
+                }
+                guard let model = self.princleVM.alertStatusModel else {
+                    return
+                }
+                if model.type == 20 {
+                    if UserDefaults.standard.string(forKey: "service_tip_show") == nil || tipsView?.isOn == true {
+                        needShowYHManagerGuideView = true
+                    } else {
+                        self.showYHManagerGuideView(self.navigationController)
+                    }
+                }
+            }
+        }
     }
 }
 
@@ -432,7 +462,17 @@ extension YHServiceCenterViewController {
             //首次显示指引
             if UserDefaults.standard.string(forKey: "service_tip_show") != nil {
             } else {
-                YHServiceOrderTipsView.show()
+                tipsView = YHServiceOrderTipsView.show()
+                tipsView?.dismissEvent = { [weak self] in
+                    guard let self = self else {
+                        return
+                    }
+                    
+                    if self.needShowYHManagerGuideView == true {
+                        self.needShowYHManagerGuideView = false
+                        self.showYHManagerGuideView(self.navigationController)
+                    }
+                }
             }
         }
     }
@@ -539,3 +579,43 @@ extension YHServiceCenterViewController {
         canScroll = true
     }
 }
+
+extension YHServiceCenterViewController {
+    //MARK: - 跳银河管家
+    
+    private func showYHManagerGuideView(_ navigationController: UINavigationController?) {
+        if YHUatHelper.shared.getUatModuleStatusBy(module: .QiYu_Service) != 1 {
+            printLog("非目标用户")
+            return
+        }
+        if let key = YHButlerServiceManager.shared.guideWindowShowedKey, YHButlerServiceManager.shared.didShowWindowDict[key] == true {
+            return
+        }
+        
+        
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) {
+            if let key = YHButlerServiceManager.shared.guideWindowShowedKey {
+                YHButlerServiceManager.shared.didShowWindowDict[key] = true
+            }
+            let view = YHConversationGuideView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: KScreenHeight))
+            view.checkButtonEvent = { [weak self] in
+                guard let self = self else {
+                    return
+                }
+                self.princleVM.postAlertStatus(20) { success, error in
+                }
+                self.gotoYinHeManager(navigationController)
+            }
+            view.show()
+        }
+    }
+    
+    private func gotoYinHeManager(_ navigationController: UINavigationController?) {
+        guard let userId = YHLoginManager.shared.userModel?.id, userId.count > 0 else {
+            return
+        }
+        //YHAnalytics.track("APP_HomeTab_IntelligentAssistant")
+        YHButlerServiceManager.shared.gotoButlerServiceSessionVC(navigationController: navigationController, completion: { _ in
+        })
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/V/YHServiceOrderTipsView.swift

@@ -13,11 +13,16 @@ class YHServiceOrderTipsView: UIView {
     var titleLabel: UIImageView!
     var knowButton: UIButton!
     var measageLabel: UILabel!
+    var isOn: Bool = false
+    var dismissEvent: (() -> Void)?
 
-    static func show() {
+    @discardableResult
+    static func show() -> YHServiceOrderTipsView {
         let view = YHServiceOrderTipsView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: KScreenHeight))
+        view.isOn = true
         let window = UIApplication.shared.yhKeyWindow()
         window?.addSubview(view)
+        return view
     }
     
     override init(frame: CGRect) {
@@ -95,8 +100,10 @@ class YHServiceOrderTipsView: UIView {
     }
     
     @objc func dismiss() {
+        isOn = false
         removeFromSuperview()
         UserDefaults.standard.set(true, forKey: "service_tip_show")
+        dismissEvent?()
     }
     
     @objc func goNext() {