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

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeHoldViewPageViewController.swift

@@ -197,7 +197,6 @@ extension YHHomeHoldViewPageViewController {
                     //签约用户新人指引
                     self.showYHManagerTipsView()
                 } else {
-                    self.showYHManagerTipsView()
                 }
             }
         }
@@ -459,14 +458,22 @@ private extension YHHomeHoldViewPageViewController {
         }
     }
     
-    
+    //银河管家 引导弹窗
     func showYHManagerTipsView() {
-        //TODO: 需要完善
+        //TODO: 需要完善  for test hjl
         
         print("HJL1: \(self.homePageVC.homeHeaderView.orderTipsView.mgrItem.frame.origin.y)")
         print("HJL2: \(self.isViewVisibleOnScreen(view: self.homePageVC.homeHeaderView.orderTipsView.mgrItem))")
         
         
+        if YHUatHelper.shared.getUatModuleStatusBy(module: .QiYu_Service) != 1 {
+            printLog("非目标用户")
+            return
+        }
+        
+        self.princleVM.postAlertStatus(20) { success, error in
+        }
+        
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
             //不在屏幕内 就上移  200px
             var offSetY : CGFloat = 0.0
@@ -488,12 +495,15 @@ private extension YHHomeHoldViewPageViewController {
             point.y += offSetY
             self.homePageVC.homeCollectView.setContentOffset(point, animated: false)
             
+            self.homePageVC.homeCollectView.isScrollEnabled = false
             DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) {
                 let viewFrame = self.homePageVC.homeHeaderView.orderTipsView.mgrItem.convert(self.homePageVC.homeHeaderView.orderTipsView.mgrItem.bounds, to: UIScreen.main.coordinateSpace)
                 
                 let view = YHManagerFuncGuildeCheckView.sheetView()
                 view.itemRect = viewFrame
                 view.show()
+                
+                self.homePageVC.homeCollectView.isScrollEnabled = true
             }
         }
         

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

@@ -88,6 +88,9 @@ extension YHPrincleViewModel {
         } else if type == 15 {
             //identify              = 2  // 首页正式批弹窗
             params = ["identify":15]
+        } else if type == 20 {
+            //identify              = 20  // 首页 银河管家 功能指引
+            params = ["identify":20]
         }
         else {
             return