【广告】春季活动位置迁移，春季活动条件判断调整

PDF Office/PDF Master/Class/Home/ViewController/KMHomeViewController.swift

@@ -102,9 +102,6 @@ import Cocoa
     var didTrialExpiredLoad: Bool = false
     var repeatTrialAlertLoad: Bool = false
     
-    //春季活动
-    var recommondPopWindowVC: KMRecommondPopWindow?
-    
     @IBOutlet weak var rightBottonHeight: NSLayoutConstraint!
     
     var currentController: NSWindowController?
@@ -231,15 +228,6 @@ import Cocoa
                         KMAdsInfoManager.shareInstance.adsInfoArrM = arrM
                     }
                 }
-                
-                if ((KMAdvertisementManager.manager.info.popWindowContent) != nil) {
-                    if KMAdvertisementManager.manager.info.popWindowContent!.content!.count > 0 {
-                        let info = KMAdvertisementManager.manager.info.popWindowContent!.content?.first
-                        if KMAdvertisementManager.checkAdvertisementValid(info!) {
-                            self.loadRecommondPopWindow()
-                        }
-                    }
-                }
             }
         }
     }
@@ -1031,30 +1019,3 @@ extension KMHomeViewController {
         self.updateAITipViewShowState()
     }
 }
-
-extension KMHomeViewController {
-    // MARK: - Recommond活动
-    func loadRecommondPopWindow() {
-        if recommondPopWindowVC == nil {
-            recommondPopWindowVC = KMRecommondPopWindow()
-        }
-        
-        if let info = KMAdvertisementManager.manager.info.popWindowContent?.content?.first {
-            recommondPopWindowVC?.recommondInfo = info
-            
-            guard let windowFrame = self.view.window?.frame, let popWindowFrame = recommondPopWindowVC?.window?.frame else {
-                return
-            }
-            
-            let x = windowFrame.minX + (windowFrame.size.width - popWindowFrame.size.width) / 2.0
-            let y = windowFrame.minY + (windowFrame.size.height - popWindowFrame.size.height) / 2.0
-            recommondPopWindowVC?.window?.setFrame(NSRect(x: x, y: y, width: popWindowFrame.size.width, height: popWindowFrame.size.height), display: true)
-            
-            recommondPopWindowVC?.window?.orderFront((Any).self)
-//            recommondPopWindowVC?.window?.becomeMain()
-            
-            UserDefaults.standard.set("Show", forKey: info.version ?? "")
-            UserDefaults.standard.synchronize()
-        }
-    }
-}

PDF Office/PDF Master/Class/KMAdvertisement/Manager/KMAdvertisementManager.swift

@@ -373,7 +373,7 @@ extension KMAdvertisementManager {
             return false
         }
         
-        if info.subscriptionType == "1" {
+        if info.subscriptionType == "3" {
             if !IAPProductsManager.default().isAvailableAllFunction() {
                 return false
             }

PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController.swift

@@ -97,6 +97,9 @@ let LOCKED_KEY  = "locked"
     //密码弹窗
     var passwordWindow: KMPasswordInputWindow?
     
+    //春季活动
+    var recommondPopWindowVC: KMRecommondPopWindow?
+    
     private var _needSave = false
     var needSave: Bool {
         set {
@@ -277,6 +280,17 @@ let LOCKED_KEY  = "locked"
     
     override func viewDidAppear() {
         super.viewDidAppear()
+        
+        //春季活动
+        if ((KMAdvertisementManager.manager.info.popWindowContent) != nil) {
+            if KMAdvertisementManager.manager.info.popWindowContent!.content!.count > 0 {
+                let info = KMAdvertisementManager.manager.info.popWindowContent!.content?.first
+                if KMAdvertisementManager.checkAdvertisementValid(info!) {
+                    self.loadRecommondPopWindow()
+                }
+            }
+        }
+        
         //刷新前一页后一页按钮
         self.updateNextAndPreViousButtonState()
         
@@ -3443,3 +3457,30 @@ extension KMMainViewController {
         return setup
     }
 }
+
+extension KMMainViewController {
+    // MARK: - Recommond活动
+    func loadRecommondPopWindow() {
+        if recommondPopWindowVC == nil {
+            recommondPopWindowVC = KMRecommondPopWindow()
+        }
+        
+        if let info = KMAdvertisementManager.manager.info.popWindowContent?.content?.first {
+            recommondPopWindowVC?.recommondInfo = info
+            
+            guard let windowFrame = self.view.window?.frame, let popWindowFrame = recommondPopWindowVC?.window?.frame else {
+                return
+            }
+            
+            let x = windowFrame.minX + (windowFrame.size.width - popWindowFrame.size.width) / 2.0
+            let y = windowFrame.minY + (windowFrame.size.height - popWindowFrame.size.height) / 2.0
+            recommondPopWindowVC?.window?.setFrame(NSRect(x: x, y: y, width: popWindowFrame.size.width, height: popWindowFrame.size.height), display: true)
+            
+            recommondPopWindowVC?.window?.orderFront((Any).self)
+            recommondPopWindowVC?.window?.becomeMain()
+            
+            UserDefaults.standard.set("Show", forKey: info.version ?? "")
+            UserDefaults.standard.synchronize()
+        }
+    }
+}