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

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

@@ -224,7 +224,7 @@ class YHHomeHoldViewPageViewController: YHBaseViewController, WKUIDelegate, WKNa
             homePageVC.requestOrder()
         }
         
-        checkHomeAlertView()
+        requestAppNewVersion()
         getCurrentUserInfo()
         getConfigData()
         NotificationCenter.default.addObserver(self, selector: #selector(handleNotification(_:)), name: YhConstant.YhNotification.backToHomeNotification, object: nil)
@@ -609,15 +609,7 @@ extension YHHomeHoldViewPageViewController : UITabBarControllerDelegate {
 
 //MARK: 弹窗相关的逻辑
 private extension YHHomeHoldViewPageViewController {
-    // 1、强升级 弹窗 > 2、签约用户新人指引 > 3、原则批/正式批 弹窗 > 4、建议更新 > 5 会员弹窗
-    func checkHomeAlertView() {
-        self.showFlowAlertView { showFlag in
-            if !showFlag {
-                self.requestAppNewVersion()
-            }
-        }
-    }
-    
+    // 1、强升级 弹窗, 建议更新  > 2、签约用户新人指引 > 3、原则批/正式批 弹窗 > 5 会员弹窗
     func requestAppNewVersion() {
         if YHConfigManager.shared.loadNewDataFlag == false {
             YHConfigManager.shared.loadConfigData {
@@ -639,11 +631,19 @@ private extension YHHomeHoldViewPageViewController {
                 alertView.updateContentArray(arr)
                 alertView.show()
                 alertView.cancleBlock = {
-                    self.showUserLevelAlertView()
+                    self.checkHomeAlertView()
                 }
             }
         } else {
-            showUserLevelAlertView()
+            checkHomeAlertView()
+        }
+    }
+    
+    func checkHomeAlertView() {
+        self.showFlowAlertView { showFlag in
+            if !showFlag {
+                self.showUserLevelAlertView()
+            }
         }
     }