弹窗逻辑

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

@@ -75,17 +75,12 @@ class YHHomeHoldViewPageViewController: YHBaseViewController {
         
         updateDefaultSearchKeyWord()
         
-        requestAppNewVersion()
-        
+        checkHomeAlertView()
         
         if needReloadDataFlag {
             needReloadDataFlag = false
             homePageVC.requestOrder()
         }
-        
-//        DispatchQueue.main.async {
-//            self.getAlertStatus()
-//        }
     }
 
     override func viewWillDisappear(_ animated: Bool) {
@@ -140,14 +135,11 @@ extension YHHomeHoldViewPageViewController {
             return
         }
         
-        
         princleVM.getPrincleStatus { success, error in
             if success {
                 guard let model = self.princleVM.alertStatusModel else {
                     return
                 }
-                
-                
                 if let vc = UIApplication.shared.keyWindow?.rootViewController as? YHTabBarViewController {
                     if vc.selectedIndex != 0 {
                         return
@@ -191,6 +183,9 @@ extension YHHomeHoldViewPageViewController {
                         }
                     }
                     view.show()
+                } else if model.type == 20 {
+                    //签约用户新人指引
+                    //TODO: 需要完善  for test hjl
                 }
             }
         }
@@ -212,35 +207,6 @@ extension YHHomeHoldViewPageViewController {
         getTotalUnreadMsgCount()
     }
     
-    func requestAppNewVersion() {
-        if YHConfigManager.shared.loadNewDataFlag == false {
-            YHConfigManager.shared.loadConfigData {
-                [weak self] in
-                guard let self = self else { return }
-                self.showNewVersionAlertView()
-            }
-        } else {
-            showNewVersionAlertView()
-        }
-    }
-    
-    func showNewVersionAlertView() {
-        let isNeedShowAlert =  YHAppVersionManager.shared.needShowAlertViewOfSuggestVersionUpdate()
-        if isNeedShowAlert {
-            if let configModel = YHConfigManager.shared.reqVM.configModel {
-                let alertView = YHFindAppNewVersionView.alertView(version: configModel.max_version)
-                let arr = configModel.suggest_updating_msg.components(separatedBy: "$")
-                alertView.updateContentArray(arr)
-                alertView.show()
-                alertView.cancleBlock = {
-                    self.getAlertStatus()
-                }
-            }
-        } else {
-            self.getAlertStatus()
-        }
-    }
-    
     // 请求未读消息总数
     @objc func getTotalUnreadMsgCount() {
         if !YHLoginManager.shared.isLogin() {
@@ -436,3 +402,41 @@ extension YHHomeHoldViewPageViewController : UITabBarControllerDelegate {
         return true
     }
 }
+
+//MARK: 弹窗相关的逻辑
+private extension YHHomeHoldViewPageViewController {
+    // 1、强升级 弹窗 > 2、签约用户新人指引 > 3、原则批/正式批 弹窗 > 4、建议更新
+    
+    func checkHomeAlertView() {
+        requestAppNewVersion()
+    }
+    
+    func requestAppNewVersion() {
+        if YHConfigManager.shared.loadNewDataFlag == false {
+            YHConfigManager.shared.loadConfigData {
+                [weak self] in
+                guard let self = self else { return }
+                self.showNewVersionAlertView()
+            }
+        } else {
+            showNewVersionAlertView()
+        }
+    }
+    
+    func showNewVersionAlertView() {
+        let isNeedShowAlert =  YHAppVersionManager.shared.needShowAlertViewOfSuggestVersionUpdate()
+        if isNeedShowAlert {
+            if let configModel = YHConfigManager.shared.reqVM.configModel {
+                let alertView = YHFindAppNewVersionView.alertView(version: configModel.max_version)
+                let arr = configModel.suggest_updating_msg.components(separatedBy: "$")
+                alertView.updateContentArray(arr)
+                alertView.show()
+                alertView.cancleBlock = {
+                    self.getAlertStatus()
+                }
+            }
+        } else {
+            self.getAlertStatus()
+        }
+    }
+}

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

@@ -19,7 +19,7 @@ enum YHPrincipleWaitItemType: Int {
 
 // MARK: - Applicant
 class YHPrincipleAlertStatusModel: SmartCodable {
-    var type: Int = 0 //1-展示正式批已获批弹窗 2-展示原则批已获批弹窗 0-不展示
+    var type: Int = 0 //1-展示正式批已获批弹窗 2-展示原则批已获批弹窗 0-不展示 20-首页展示签约新人指引
     var date: Int = 0 //正式批获批时间
     
     required init() {