首页更新框展示逻辑

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityTravelViewController.swift

@@ -116,7 +116,6 @@ extension YHActivityTravelViewController {
                 if let nav = self.navigationController {
                     let rrr = nav.viewControllers.contains { $0.isKind(of: YHCommunityViewController.self) }
                     if rrr {
-                        
                         var  targetVc : UIViewController?
                         for(_,value) in nav.viewControllers.enumerated() {
                             if value.isKind(of: YHCommunityViewController.self) {
@@ -131,11 +130,9 @@ extension YHActivityTravelViewController {
                         return
                     }
                 }
-                
             }
         }
        
-       
     }
     
     

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

@@ -83,9 +83,9 @@ class YHHomeHoldViewPageViewController: YHBaseViewController {
             homePageVC.requestOrder()
         }
         
-        DispatchQueue.main.async {
-            self.getAlertStatus()
-        }
+//        DispatchQueue.main.async {
+//            self.getAlertStatus()
+//        }
     }
 
     override func viewWillDisappear(_ animated: Bool) {
@@ -148,6 +148,27 @@ extension YHHomeHoldViewPageViewController {
                     return
                 }
                 
+                
+                if let nav = self.navigationController {
+                    let rrr = nav.viewControllers.contains { $0.isKind(of: YHHomeHoldViewPageViewController.self) }
+                    if rrr {
+                        var  targetVc : UIViewController?
+                        for(_,value) in nav.viewControllers.enumerated() {
+                            if value.isKind(of: YHHomeHoldViewPageViewController.self) {
+                                targetVc = value
+                                break
+                            }
+                        }
+                        
+                        if targetVc != nil {
+                            
+                        } else {
+                            printLog("不在首页了。。。进行后面的逻辑")
+                            return
+                        }
+                    }
+                }
+                
                 if model.type == 1 {
                     //正式弹窗
                     self.princleVM.postAlertStatus(15) { success, error in
@@ -226,7 +247,12 @@ extension YHHomeHoldViewPageViewController {
                 let arr = configModel.suggest_updating_msg.components(separatedBy: "$")
                 alertView.updateContentArray(arr)
                 alertView.show()
+                alertView.cancleBlock = {
+                    self.getAlertStatus()
+                }
             }
+        } else {
+            self.getAlertStatus()
         }
     }
     

galaxy/galaxy/Classes/Modules/VersionUpload(版本更新)/V/YHFindAppNewVersionView.swift

@@ -65,6 +65,10 @@ class YHUpdateContentItemView: UIView {
 
 class YHFindAppNewVersionView: UIView {
     
+    
+    typealias Block = () -> ()
+    var cancleBlock: Block?
+    
     // 底层蒙版
     lazy var blackMaskView: UIView = {
         let view = UIView()
@@ -278,6 +282,7 @@ class YHFindAppNewVersionView: UIView {
     
     @objc func didCloseBtnClicked() {
         YHAppVersionManager.shared.saveShowLatestUpdateVersion()
+        self.cancleBlock?()
         dismiss()
     }