Commit c4708a88 authored by pete谢兆麟's avatar pete谢兆麟

调整弹窗顺序

parent f35f1d4d
...@@ -224,7 +224,7 @@ class YHHomeHoldViewPageViewController: YHBaseViewController, WKUIDelegate, WKNa ...@@ -224,7 +224,7 @@ class YHHomeHoldViewPageViewController: YHBaseViewController, WKUIDelegate, WKNa
homePageVC.requestOrder() homePageVC.requestOrder()
} }
checkHomeAlertView() requestAppNewVersion()
getCurrentUserInfo() getCurrentUserInfo()
getConfigData() getConfigData()
NotificationCenter.default.addObserver(self, selector: #selector(handleNotification(_:)), name: YhConstant.YhNotification.backToHomeNotification, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(handleNotification(_:)), name: YhConstant.YhNotification.backToHomeNotification, object: nil)
...@@ -609,15 +609,7 @@ extension YHHomeHoldViewPageViewController : UITabBarControllerDelegate { ...@@ -609,15 +609,7 @@ extension YHHomeHoldViewPageViewController : UITabBarControllerDelegate {
//MARK: 弹窗相关的逻辑 //MARK: 弹窗相关的逻辑
private extension YHHomeHoldViewPageViewController { private extension YHHomeHoldViewPageViewController {
// 1、强升级 弹窗 > 2、签约用户新人指引 > 3、原则批/正式批 弹窗 > 4、建议更新 > 5 会员弹窗 // 1、强升级 弹窗, 建议更新 > 2、签约用户新人指引 > 3、原则批/正式批 弹窗 > 5 会员弹窗
func checkHomeAlertView() {
self.showFlowAlertView { showFlag in
if !showFlag {
self.requestAppNewVersion()
}
}
}
func requestAppNewVersion() { func requestAppNewVersion() {
if YHConfigManager.shared.loadNewDataFlag == false { if YHConfigManager.shared.loadNewDataFlag == false {
YHConfigManager.shared.loadConfigData { YHConfigManager.shared.loadConfigData {
...@@ -639,11 +631,19 @@ private extension YHHomeHoldViewPageViewController { ...@@ -639,11 +631,19 @@ private extension YHHomeHoldViewPageViewController {
alertView.updateContentArray(arr) alertView.updateContentArray(arr)
alertView.show() alertView.show()
alertView.cancleBlock = { alertView.cancleBlock = {
self.showUserLevelAlertView() self.checkHomeAlertView()
} }
} }
} else { } else {
showUserLevelAlertView() checkHomeAlertView()
}
}
func checkHomeAlertView() {
self.showFlowAlertView { showFlag in
if !showFlag {
self.showUserLevelAlertView()
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment