处理

1、弹窗逻辑
2、刷屏

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

@@ -68,22 +68,18 @@ class YHHomeHoldViewPageViewController: YHBaseViewController {
         //处于第一个item的时候，才允许屏幕边缘手势返回
         navigationController?.interactivePopGestureRecognizer?.isEnabled = (segmentedView.selectedIndex == 0)
         
-        
         YHOSSManager.share.getOSSID()
         
         getTotalUnreadMsgCount()
         
         updateDefaultSearchKeyWord()
         
-        checkHomeAlertView()
-        
         if needReloadDataFlag {
             needReloadDataFlag = false
             homePageVC.requestOrder()
         }
         
-        
-        
+        checkHomeAlertView()
     }
     
     
@@ -139,19 +135,21 @@ class YHHomeHoldViewPageViewController: YHBaseViewController {
 //MARK: - 内部函数
 extension YHHomeHoldViewPageViewController {
     //获取原则批、正式批的弹窗状态
-    func getAlertStatus() {
-        
+    func showFlowAlertView(callback:@escaping ((_ showFlag: Bool)->())) {
         if !YHLoginManager.shared.isLogin() {
+            callback(false)
             return
         }
         
         princleVM.getPrincleStatus { success, error in
             if success {
                 guard let model = self.princleVM.alertStatusModel else {
+                    callback(false)
                     return
                 }
                 if let vc = UIApplication.shared.keyWindow?.rootViewController as? YHTabBarViewController {
                     if vc.selectedIndex != 0 {
+                        callback(false)
                         return
                     }
                 }
@@ -197,7 +195,10 @@ extension YHHomeHoldViewPageViewController {
                     //签约用户新人指引
                     self.showYHManagerTipsView()
                 } else {
+                    callback(false)
+                    return
                 }
+                callback(true)
             }
         }
     }
@@ -424,9 +425,12 @@ extension YHHomeHoldViewPageViewController : UITabBarControllerDelegate {
 //MARK: 弹窗相关的逻辑
 private extension YHHomeHoldViewPageViewController {
     // 1、强升级 弹窗 > 2、签约用户新人指引 > 3、原则批/正式批 弹窗 > 4、建议更新
-    
     func checkHomeAlertView() {
-        requestAppNewVersion()
+        self.showFlowAlertView { showFlag in
+            if !showFlag {
+                self.requestAppNewVersion()
+            }
+        }
     }
     
     func requestAppNewVersion() {
@@ -450,11 +454,8 @@ private extension YHHomeHoldViewPageViewController {
                 alertView.updateContentArray(arr)
                 alertView.show()
                 alertView.cancleBlock = {
-                    self.getAlertStatus()
                 }
             }
-        } else {
-            self.getAlertStatus()
         }
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceOrderListViewController.swift

@@ -322,6 +322,7 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
                         vc.navTitle = "身份续签指引"
                         vc.url = url
                         vc.isFullScreenFlag = false
+                        vc.isNeedRefreshDataFlag = true
                         UIViewController.current?.navigationController?.pushViewController(vc)
                     }
                     

galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMessageDetailListVC.swift

@@ -545,6 +545,7 @@ extension YHMessageDetailListVC: UITableViewDelegate, UITableViewDataSource {
                    vc.navTitle = "身份续签指引"
                    vc.url = url
                    vc.isFullScreenFlag = false
+                   vc.isNeedRefreshDataFlag = true
                    UIViewController.current?.navigationController?.pushViewController(vc)
                }
            } else if msg.redirectPage == YHRedirectPage.renewalPlan.rawValue { // 我的续签方案 H5

galaxy/galaxy/Classes/Modules/VersionUpload(版本更新)/M/YHAppVersionManager.swift

@@ -33,7 +33,7 @@ class YHAppVersionManager {
     func needShowRedPointOfSuggestVersionUpdate() -> Bool {
         var isShowRedPoint = false
         
-        if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 9)) == 1 {
+        if YHUatHelper.shared.getUatModuleStatusBy(module: .Update_Suggest) == 1 {
             // 判断版本更新逻辑
             if let configModel = YHConfigManager.shared.reqVM.configModel, configModel.suggest_updating == true {
                 if configModel.max_version != UIDevice.appVersion() {
@@ -57,7 +57,7 @@ class YHAppVersionManager {
     func needShowAlertViewOfSuggestVersionUpdate() -> Bool {
         var isShow = false
         
-        if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 9)) == 1 {
+        if YHUatHelper.shared.getUatModuleStatusBy(module: .Update_Suggest) == 1 {
             if let configModel = YHConfigManager.shared.reqVM.configModel, configModel.suggest_updating == true {
                 if let alertLatestVersion = UserDefaults.standard.object(forKey: YhConstant.kShowAlertOfSuggestLatestVersion) as? String {
                     if !configModel.max_version.isEmpty, configModel.max_version != alertLatestVersion  {