【综合】远程相关内容调整

PDF Office/PDF Master DMG/AppDelegate.swift

@@ -16,12 +16,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
     func applicationDidFinishLaunching(_ aNotification: Notification) {
         // Insert code here to initialize your application
-        //        MARK: 广告数据初始化
-                KMAdvertisementManager.manager.initConfig(appName: .PDFReaderProMac,
-                                                          subscribeType: .unsubscribed,
-                                                          platform: .Mac)
-        //        测试模式，默认false
-                KMAdvertisementManager.manager.debug = true
     }
 
     func applicationWillTerminate(_ aNotification: Notification) {

PDF Office/PDF Master Pro/AppDelegate.swift

@@ -18,12 +18,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     
     func applicationDidFinishLaunching(_ aNotification: Notification) {
         // Insert code here to initialize your application
-        //        MARK: 广告数据初始化
-                KMAdvertisementManager.manager.initConfig(appName: .PDFReaderProMac,
-                                                          subscribeType: .unsubscribed,
-                                                          platform: .Mac)
-        //        测试模式，默认false
-                KMAdvertisementManager.manager.debug = true
     }
 
     func applicationWillTerminate(_ aNotification: Notification) {

PDF Office/PDF Master/AppDelegate.swift

@@ -110,25 +110,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, iRateDelegate{
         }
 
         KMStatusBar.system()
-        
-        //        MARK: 广告数据初始化
-        var appName: KMAdvertisementAppNameType = .PDFReaderProMac
-#if VERSION_FREE
-
-#if VERSION_DMG
-        appName = .PDFReaderProMacDMG
-#else
-        
-#endif
-        
-#else
-        appName = .PDFReaderProMacPro
-#endif
-        KMAdvertisementManager.manager.initConfig(appName: appName,
-                                                  subscribeType: .unknow,
-                                                  platform: .Mac)
-        //        测试模式，默认false
-        KMAdvertisementManager.manager.debug = true
                 
         NSApp.appearance = NSAppearance.current
         KMAnalytics.configure()

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

@@ -61,10 +61,10 @@ import Cocoa
     
     //HomeContentView
     @IBOutlet weak var homeContentView: KMHomeContentView!
-    //广告 互推
-    @IBOutlet weak var advertisementTableView: KMAdvertisementTableView!
-    @IBOutlet weak var advertisementTableViewHeightConstraint: NSLayoutConstraint!
-    @IBOutlet weak var advertisementShowView: KMAdvertisementShowView!
+    
+    @IBOutlet weak var otherLabel: NSTextField!
+    @IBOutlet weak var screenRecorderLabel: NSTextField!
+    @IBOutlet weak var ntfsMacLabel: NSTextField!
     
     //合并
     var mergeWindowController: KMMergeWindowController?
@@ -159,7 +159,6 @@ import Cocoa
             self.otherMouseDown(with: aEvent)
             return aEvent
         }
-        self.initNetworkingData()
 //        self.initLocalization()
 //        self.initializeUI()
         self.initializeUI_DMG()
@@ -200,103 +199,6 @@ import Cocoa
 //        self.loadAITipIconGuide()
     }
     
-    func initNetworkingData() {
-        KMAdvertisementManager.manager.fetchDataWithResponseObject { [weak self] data, responseObject, error in
-            KMPrint("获取广告数据成功")
-            if data != nil {
-                let showMenu = (data?.remoteControl?.showMenuHelpInfo ?? "") == "1"
-                DispatchQueue.main.async {
-                    let mainMenu =  NSApp.mainMenu?.item(at: 0)?.submenu
-                    if let item = mainMenu?.item(withTitle: NSLocalizedString("Volume Discount", comment: "")) {
-                        item.isHidden = !showMenu
-                    }
-                    if let item = mainMenu?.item(withTitle: NSLocalizedString("One License for Mac and Windows", comment: "")) {
-                        item.isHidden = !showMenu
-                    }
-                    if let item = mainMenu?.item(withTitle: NSLocalizedString("Education Discount", comment: "")) {
-                        item.isHidden = !showMenu
-                    }
-                }
-                
-                let content = data!.recommondContent
-                let item = content?.recommondContentPDFPro
-                var infos: [KMAdvertisementItemInfo] = []
-                for info in item?.content ?? [] {
-                    if info.version == "recommondPDF-PDFtoOfficePack" {
-                        if IAPProductsManager.default().isAvailableAdvancedPDFToOffice() == false && IAPProductsManager.default().isAvailableAllFunction() {
-                            infos.append(info)
-                        }
-                    } else {
-                        infos.append(info)
-                    }
-                }
-                item?.content = infos
-                self?.advertisementTableView.inputData = content
-                self?.advertisementTableView.didSelect = { view, item in
-                    let string = KMAdvertisementModelTransition.transitionLanguage(langeuage: item.linkURL)
-                    if string.count != 0  {
-                        NSWorkspace.shared.open(URL.init(string: string)!)
-                    }
-                }
-                
-                self?.advertisementShowView.inputData = data!.advertisement
-                self?.advertisementShowView.didSelect = { view, item in
-                    let string = KMAdvertisementModelTransition.transitionLanguage(langeuage: item.linkURL)
-                    if string.count != 0  {
-                        NSWorkspace.shared.open(URL.init(string: string)!)
-                    }
-                    
-                    guard let firebaseInfo = item.firebase else {
-                        return
-                    }
-                    KMAdvertisementModelTransition.sendFireBaseEvent(firebase: firebaseInfo)
-
-                }
-                
-                if let item = data?.StoreUserRecovery?.content?.first {
-                    let url = URL(string: KMAdvertisementModelTransition.transitionImagePath(image: item.image, highlight: false))
-                    KMAdvertisementImage.imageWithURL(url: url) { image in
-                        // 预加载
-                    }
-                    
-                    let saleUrl = URL(string: KMAdvertisementModelTransition.transitionImagePath(image: item.saleImage, highlight: false))
-                    KMAdvertisementImage.imageWithURL(url: saleUrl) { image in
-                        // 预加载
-                    }
-                }
-                
-                if KMAdvertisementManager.manager.infoDict.allKeys.count > 0 {
-                    if let adsInfo = KMAdvertisementManager.manager.infoDict["adsInfo"] {
-                        let infoDict: NSDictionary = KMAdvertisementManager.manager.infoDict["adsInfo"] as! NSDictionary
-                        let array: [[String: Any]] = infoDict["content"] as! [[String : Any]]
-                        
-                        let arrM = NSMutableArray.init()
-                        for dict in array {
-                            let adsInfo = KMAdsInfo.init()
-                            let mutableDictionary = NSMutableDictionary(dictionary: dict)
-                            adsInfo.infoDict = mutableDictionary
-                            arrM.add(adsInfo)
-                        }
-                        KMAdsInfoManager.shareInstance.adsInfoArrM = arrM
-                    }
-                    
-                    if let couponInfo = KMAdvertisementManager.manager.infoDict["couponContent"] {
-                        let infoDict: NSDictionary = KMAdvertisementManager.manager.infoDict["couponContent"] as! NSDictionary
-                        let array: [[String: Any]] = infoDict["content"] as! [[String : Any]]
-                        if array.isEmpty == false {
-                            let dict = array[0]
-                            let adsInfo = KMCouponInfo.init()
-                            let mutableDictionary = NSMutableDictionary(dictionary: dict)
-                            adsInfo.infoDict = mutableDictionary
-                            KMAdsInfoManager.shareInstance.couponInfo = adsInfo
-                        }
-                    }
-                    self?.checkTrialEndCouponInfo()
-                }
-            }
-        }
-    }
-    
     func setup() {
         //creatPDF
         self.creatPDFView.openPDFAction = { [unowned self] view, sender in
@@ -352,12 +254,6 @@ import Cocoa
             self.fastToolItemAction(item.type!)
         }
         
-        if IAPProductsManager.default().isAvailableAllFunction() {
-            self.advertisementShowView.isHidden = true
-        } else {
-            self.advertisementShowView.isHidden = false
-        }
-        
         NotificationCenter.default.addObserver(self, selector: #selector(purchaseStateUpdateNoti), name: NSNotification.Name(rawValue: "KMIAPProductPurchasedNotification"), object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(purchaseStateUpdateNoti), name: NSNotification.Name(rawValue: "kDeviceActivateNotification"), object: nil)
         
@@ -396,6 +292,13 @@ import Cocoa
         rightTopBox.fillColor = .white
         rightBottomBox.fillColor = .white
         rightFullBox.fillColor = .white
+        
+        otherLabel.stringValue = NSLocalizedString("Others", comment: "")
+        otherLabel.font = NSFont.SFProTextSemiboldFont(12.0)
+        screenRecorderLabel.stringValue = NSLocalizedString("Screen Recorder", comment: "")
+        screenRecorderLabel.font = NSFont.SFProTextRegularFont(13.0)
+        ntfsMacLabel.stringValue = NSLocalizedString("NTFS for Mac", comment: "")
+        ntfsMacLabel.font = NSFont.SFProTextRegularFont(13.0)
 
         self.aiHomeBox.fillColor = .clear
         self.aiHomeBox.cornerRadius = 8.0
@@ -522,7 +425,22 @@ import Cocoa
             self.view.appearance = NSAppearance(named: .aqua)
         }
         self.updateUI()
-        self.advertisementTableView.reloadData()
+    }
+    
+    @IBAction func screenRecorderAction(_ sender: NSButton) {
+        let httpUrl: NSURL = NSURL.init(string: "https://apps.apple.com/app/apple-store/id1581903884?pt=855050&ct=pdfmac&mt=8")!
+        let tWorkSpace: NSWorkspace = NSWorkspace.shared
+        if !tWorkSpace.open(httpUrl as URL) {
+            tWorkSpace.open(httpUrl as URL)
+        }
+    }
+    
+    @IBAction func ntfsMacAction(_ sender: NSButton) {
+        let httpUrl: NSURL = NSURL.init(string: "https://apps.apple.com/app/apple-store/id6468982811?pt=855050&ct=pdfmac&mt=8")!
+        let tWorkSpace: NSWorkspace = NSWorkspace.shared
+        if !tWorkSpace.open(httpUrl as URL) {
+            tWorkSpace.open(httpUrl as URL)
+        }
     }
     
     // MARK: Public Methods
@@ -925,24 +843,6 @@ extension KMHomeViewController {
     //MARK: Purchase
     @objc func purchaseStateUpdateNoti() {
         if IAPProductsManager.default().isAvailableAllFunction() {
-            self.advertisementShowView.isHidden = true
-            
-            guard let content = self.advertisementTableView.inputData else {
-                return // 如果 content 为 nil，提前退出
-            }
-            let item = content.recommondContentPDFPro
-            var infos: [KMAdvertisementItemInfo] = []
-            for info in item?.content ?? [] {
-                if info.version == "recommondPDF-PDFtoOfficePack" {
-                    if IAPProductsManager.default().isAvailableAdvancedPDFToOffice() == false && IAPProductsManager.default().isAvailableAllFunction() {
-                        infos.append(info)
-                    }
-                } else {
-                    infos.append(info)
-                }
-            }
-            item?.content = infos
-            self.advertisementTableView.inputData = content
         }
     }
     

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

@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="KMHomeViewController" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
-                <outlet property="advertisementShowView" destination="SYM-SV-gBY" id="BFm-b8-txu"/>
-                <outlet property="advertisementTableView" destination="fnz-k9-XjO" id="UbQ-y0-tnF"/>
-                <outlet property="advertisementTableViewHeightConstraint" destination="Tot-Bo-gOe" id="lbH-c8-hec"/>
                 <outlet property="aiErrorCorrectionBox" destination="gfM-nc-QPH" id="Hmh-sg-oXV"/>
                 <outlet property="aiErrorCorrectionImageView" destination="tWj-m1-RHC" id="Vih-4K-hKQ"/>
                 <outlet property="aiErrorCorrectionLabel" destination="aGT-3k-XaH" id="v9b-2n-Uue"/>
@@ -35,6 +32,8 @@
                 <outlet property="homeRightScrollViewView" destination="Fsd-Oz-v7c" id="AOG-NU-G8N"/>
                 <outlet property="homeSplitView" destination="yVp-SB-ljO" id="zSV-aW-5He"/>
                 <outlet property="leftBox" destination="ndG-c5-lCg" id="Gx0-kb-H6N"/>
+                <outlet property="ntfsMacLabel" destination="RPZ-mg-S8i" id="Zw6-Th-kbQ"/>
+                <outlet property="otherLabel" destination="WDw-EP-w3g" id="MUJ-yl-Bvo"/>
                 <outlet property="pdfToolsViewController" destination="cEr-ez-OtI" id="ZeS-9W-X1R"/>
                 <outlet property="rightBottomBox" destination="UYd-oU-m2C" id="XYW-TM-vpq"/>
                 <outlet property="rightBottonHeight" destination="Rdc-5S-WLs" id="hLv-Q8-gGe"/>
@@ -42,6 +41,7 @@
                 <outlet property="rightFullBox" destination="VIr-YS-5o0" id="0cK-du-qOJ"/>
                 <outlet property="rightTopBox" destination="riD-ya-jJ5" id="xFv-Cd-vsI"/>
                 <outlet property="rightTopBoxHeightConstraint" destination="SKw-ql-gO9" id="yOd-jy-tG2"/>
+                <outlet property="screenRecorderLabel" destination="fOi-Hs-EVg" id="XWk-H8-rJI"/>
                 <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
             </connections>
         </customObject>
@@ -53,10 +53,6 @@
             <subviews>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1v2-87-qa4">
                     <rect key="frame" x="537" y="410" width="0.0" height="0.0"/>
-                    <constraints>
-                        <constraint firstAttribute="height" id="S10-65-2uD"/>
-                        <constraint firstAttribute="width" id="nNr-po-NTu"/>
-                    </constraints>
                     <buttonCell key="cell" type="square" title="Button" bezelStyle="shadowlessSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="Qq0-z1-7iI">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
@@ -64,6 +60,10 @@
 Gw
 </string>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="height" id="S10-65-2uD"/>
+                        <constraint firstAttribute="width" id="nNr-po-NTu"/>
+                    </constraints>
                     <connections>
                         <action selector="escButtonAction:" target="-2" id="U8k-vz-XWX"/>
                     </connections>
@@ -95,7 +95,7 @@ Gw
                                                             </constraints>
                                                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="edc-z8-gCQ"/>
                                                         </imageView>
-                                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZAT-Co-tte">
+                                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZAT-Co-tte">
                                                             <rect key="frame" x="54" y="24" width="186" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="XuC-gZ-0YQ">
                                                                 <font key="font" metaFont="system"/>
@@ -130,7 +130,7 @@ Gw
                                                             </constraints>
                                                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="cON-bS-15a"/>
                                                         </imageView>
-                                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="p5N-bY-CVu">
+                                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="p5N-bY-CVu">
                                                             <rect key="frame" x="54" y="24" width="186" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="RZo-Aj-B8y">
                                                                 <font key="font" metaFont="system"/>
@@ -165,7 +165,7 @@ Gw
                                                             </constraints>
                                                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="oLu-02-hg4"/>
                                                         </imageView>
-                                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Fhh-MS-1UA">
+                                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Fhh-MS-1UA">
                                                             <rect key="frame" x="54" y="24" width="186" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="hZb-7Q-757">
                                                                 <font key="font" metaFont="system"/>
@@ -200,7 +200,7 @@ Gw
                                                             </constraints>
                                                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="RX4-be-ygC"/>
                                                         </imageView>
-                                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aGT-3k-XaH">
+                                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aGT-3k-XaH">
                                                             <rect key="frame" x="54" y="24" width="186" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="A36-Eb-2cb">
                                                                 <font key="font" metaFont="system"/>
@@ -237,50 +237,147 @@ Gw
                                             <constraint firstItem="gfM-nc-QPH" firstAttribute="top" secondItem="0aC-uQ-5lW" secondAttribute="bottom" constant="8" id="m9w-w0-Rb8"/>
                                         </constraints>
                                     </customView>
-                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="eZs-02-dfp">
-                                        <rect key="frame" x="16" y="0.0" width="238" height="636"/>
+                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="xMk-8H-B64" customClass="KMCreatPDFView" customModule="PDF_Reader_Pro" customModuleProvider="target">
+                                        <rect key="frame" x="24" y="660" width="222" height="112"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="112" id="b2w-2J-Q98"/>
+                                        </constraints>
+                                    </customView>
+                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="EFI-bR-zm3">
+                                        <rect key="frame" x="8" y="528" width="254" height="96"/>
                                         <subviews>
-                                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="fnz-k9-XjO" customClass="KMAdvertisementTableView" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="136" width="238" height="500"/>
+                                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="CrR-cp-vS5">
+                                                <rect key="frame" x="0.0" y="72" width="254" height="24"/>
+                                                <subviews>
+                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WDw-EP-w3g">
+                                                        <rect key="frame" x="14" y="4" width="226" height="16"/>
+                                                        <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="hFs-ip-3eB">
+                                                            <font key="font" usesAppearanceFont="YES"/>
+                                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                        </textFieldCell>
+                                                    </textField>
+                                                </subviews>
+                                                <constraints>
+                                                    <constraint firstAttribute="trailing" secondItem="WDw-EP-w3g" secondAttribute="trailing" constant="16" id="8Kd-Zk-2UZ"/>
+                                                    <constraint firstAttribute="height" constant="24" id="JxL-vi-o0f"/>
+                                                    <constraint firstItem="WDw-EP-w3g" firstAttribute="leading" secondItem="CrR-cp-vS5" secondAttribute="leading" constant="16" id="bkZ-og-cDP"/>
+                                                    <constraint firstItem="WDw-EP-w3g" firstAttribute="centerY" secondItem="CrR-cp-vS5" secondAttribute="centerY" id="orB-b9-b3D"/>
+                                                </constraints>
+                                            </customView>
+                                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="M50-ns-JF4">
+                                                <rect key="frame" x="0.0" y="36" width="254" height="32"/>
+                                                <subviews>
+                                                    <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="q8R-gx-ysP">
+                                                        <rect key="frame" x="16" y="8" width="16" height="16"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="height" constant="16" id="EZx-CX-dcY"/>
+                                                            <constraint firstAttribute="width" constant="16" id="cQY-ao-dzZ"/>
+                                                        </constraints>
+                                                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="yZy-IZ-nAj"/>
+                                                    </imageView>
+                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fOi-Hs-EVg">
+                                                        <rect key="frame" x="34" y="8" width="206" height="16"/>
+                                                        <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="sX6-Mv-6A4">
+                                                            <font key="font" metaFont="system"/>
+                                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                        </textFieldCell>
+                                                    </textField>
+                                                    <button translatesAutoresizingMaskIntoConstraints="NO" id="bx8-uy-b3I">
+                                                        <rect key="frame" x="0.0" y="0.0" width="254" height="32"/>
+                                                        <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="4ae-l2-6Sf">
+                                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                            <font key="font" metaFont="system"/>
+                                                        </buttonCell>
+                                                        <connections>
+                                                            <action selector="screenRecorderAction:" target="-2" id="bgw-28-B15"/>
+                                                        </connections>
+                                                    </button>
+                                                </subviews>
                                                 <constraints>
-                                                    <constraint firstAttribute="height" constant="500" id="Tot-Bo-gOe"/>
+                                                    <constraint firstItem="q8R-gx-ysP" firstAttribute="leading" secondItem="M50-ns-JF4" secondAttribute="leading" constant="16" id="5eU-ct-bTF"/>
+                                                    <constraint firstAttribute="trailing" secondItem="bx8-uy-b3I" secondAttribute="trailing" id="UcD-wm-Vgg"/>
+                                                    <constraint firstItem="fOi-Hs-EVg" firstAttribute="leading" secondItem="q8R-gx-ysP" secondAttribute="trailing" constant="4" id="Xma-Xx-INZ"/>
+                                                    <constraint firstItem="fOi-Hs-EVg" firstAttribute="centerY" secondItem="q8R-gx-ysP" secondAttribute="centerY" id="Zgz-FP-peR"/>
+                                                    <constraint firstAttribute="bottom" secondItem="bx8-uy-b3I" secondAttribute="bottom" id="aj1-HD-MOM"/>
+                                                    <constraint firstItem="bx8-uy-b3I" firstAttribute="leading" secondItem="M50-ns-JF4" secondAttribute="leading" id="fph-Vn-KKq"/>
+                                                    <constraint firstItem="bx8-uy-b3I" firstAttribute="top" secondItem="M50-ns-JF4" secondAttribute="top" id="jNT-3S-BuK"/>
+                                                    <constraint firstItem="q8R-gx-ysP" firstAttribute="centerY" secondItem="M50-ns-JF4" secondAttribute="centerY" id="mQ2-Jg-D7i"/>
+                                                    <constraint firstAttribute="height" constant="32" id="ppo-1F-FFt"/>
+                                                    <constraint firstAttribute="trailing" secondItem="fOi-Hs-EVg" secondAttribute="trailing" constant="16" id="r7B-eJ-SIo"/>
                                                 </constraints>
                                             </customView>
-                                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="SYM-SV-gBY" customClass="KMAdvertisementShowView" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                                <rect key="frame" x="15" y="16" width="208" height="120"/>
+                                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="Jjw-Rz-UoO">
+                                                <rect key="frame" x="0.0" y="0.0" width="254" height="32"/>
+                                                <subviews>
+                                                    <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="XAB-gY-EYd">
+                                                        <rect key="frame" x="16" y="8" width="16" height="16"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="height" constant="16" id="TOE-0Q-QiG"/>
+                                                            <constraint firstAttribute="width" constant="16" id="XDh-jv-l4s"/>
+                                                        </constraints>
+                                                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="3Fr-XC-Chu"/>
+                                                    </imageView>
+                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="RPZ-mg-S8i">
+                                                        <rect key="frame" x="34" y="8" width="206" height="16"/>
+                                                        <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="fF5-CT-je9">
+                                                            <font key="font" metaFont="system"/>
+                                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                        </textFieldCell>
+                                                    </textField>
+                                                    <button translatesAutoresizingMaskIntoConstraints="NO" id="L4b-rD-vdD">
+                                                        <rect key="frame" x="0.0" y="0.0" width="254" height="32"/>
+                                                        <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="eub-om-y4C">
+                                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                            <font key="font" metaFont="system"/>
+                                                        </buttonCell>
+                                                        <connections>
+                                                            <action selector="ntfsMacAction:" target="-2" id="jye-g4-yTb"/>
+                                                        </connections>
+                                                    </button>
+                                                </subviews>
                                                 <constraints>
-                                                    <constraint firstAttribute="width" constant="208" id="fdx-a3-MSa"/>
-                                                    <constraint firstAttribute="height" constant="120" id="zaj-sz-Tdy"/>
+                                                    <constraint firstAttribute="bottom" secondItem="L4b-rD-vdD" secondAttribute="bottom" id="Fzc-mc-yrf"/>
+                                                    <constraint firstAttribute="height" constant="32" id="KbG-fk-nj2"/>
+                                                    <constraint firstAttribute="trailing" secondItem="RPZ-mg-S8i" secondAttribute="trailing" constant="16" id="Rae-Q0-h5d"/>
+                                                    <constraint firstAttribute="trailing" secondItem="L4b-rD-vdD" secondAttribute="trailing" id="XfU-Od-rth"/>
+                                                    <constraint firstItem="XAB-gY-EYd" firstAttribute="centerY" secondItem="Jjw-Rz-UoO" secondAttribute="centerY" id="ZVp-CY-JOc"/>
+                                                    <constraint firstItem="XAB-gY-EYd" firstAttribute="leading" secondItem="Jjw-Rz-UoO" secondAttribute="leading" constant="16" id="i84-7E-haH"/>
+                                                    <constraint firstItem="RPZ-mg-S8i" firstAttribute="centerY" secondItem="Jjw-Rz-UoO" secondAttribute="centerY" id="ipp-SU-Xnh"/>
+                                                    <constraint firstItem="L4b-rD-vdD" firstAttribute="top" secondItem="Jjw-Rz-UoO" secondAttribute="top" id="khl-xx-LDA"/>
+                                                    <constraint firstItem="RPZ-mg-S8i" firstAttribute="leading" secondItem="XAB-gY-EYd" secondAttribute="trailing" constant="4" id="pbl-Ls-oVh"/>
+                                                    <constraint firstItem="L4b-rD-vdD" firstAttribute="leading" secondItem="Jjw-Rz-UoO" secondAttribute="leading" id="xua-u1-q8g"/>
                                                 </constraints>
                                             </customView>
                                         </subviews>
                                         <constraints>
-                                            <constraint firstItem="SYM-SV-gBY" firstAttribute="centerX" secondItem="eZs-02-dfp" secondAttribute="centerX" id="9MQ-Vd-iI2"/>
-                                            <constraint firstItem="fnz-k9-XjO" firstAttribute="leading" secondItem="eZs-02-dfp" secondAttribute="leading" id="9nx-Kn-ay8"/>
-                                            <constraint firstAttribute="trailing" secondItem="fnz-k9-XjO" secondAttribute="trailing" id="Ea6-4t-JOh"/>
-                                            <constraint firstItem="fnz-k9-XjO" firstAttribute="top" secondItem="eZs-02-dfp" secondAttribute="top" id="SNd-w5-4mI"/>
-                                            <constraint firstAttribute="bottom" secondItem="SYM-SV-gBY" secondAttribute="bottom" constant="16" id="vXu-8W-zAc"/>
-                                        </constraints>
-                                    </customView>
-                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="xMk-8H-B64" customClass="KMCreatPDFView" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                        <rect key="frame" x="24" y="660" width="222" height="112"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="112" id="b2w-2J-Q98"/>
+                                            <constraint firstItem="Jjw-Rz-UoO" firstAttribute="top" secondItem="M50-ns-JF4" secondAttribute="bottom" constant="4" id="3jy-le-hD2"/>
+                                            <constraint firstAttribute="trailing" secondItem="M50-ns-JF4" secondAttribute="trailing" id="6O2-dT-UwB"/>
+                                            <constraint firstItem="M50-ns-JF4" firstAttribute="leading" secondItem="EFI-bR-zm3" secondAttribute="leading" id="Abu-2H-PzX"/>
+                                            <constraint firstItem="CrR-cp-vS5" firstAttribute="leading" secondItem="EFI-bR-zm3" secondAttribute="leading" id="Ff6-H4-PCA"/>
+                                            <constraint firstItem="CrR-cp-vS5" firstAttribute="top" secondItem="EFI-bR-zm3" secondAttribute="top" id="Hv9-Jr-JbO"/>
+                                            <constraint firstAttribute="trailing" secondItem="Jjw-Rz-UoO" secondAttribute="trailing" id="Nyy-Xi-wwC"/>
+                                            <constraint firstAttribute="trailing" secondItem="CrR-cp-vS5" secondAttribute="trailing" id="Tw0-Ur-jKg"/>
+                                            <constraint firstItem="Jjw-Rz-UoO" firstAttribute="leading" secondItem="EFI-bR-zm3" secondAttribute="leading" id="YS7-bf-FJL"/>
+                                            <constraint firstAttribute="bottom" secondItem="Jjw-Rz-UoO" secondAttribute="bottom" id="vwl-rh-ZZa"/>
+                                            <constraint firstAttribute="height" constant="96" id="waG-eh-Qg4"/>
+                                            <constraint firstItem="M50-ns-JF4" firstAttribute="top" secondItem="CrR-cp-vS5" secondAttribute="bottom" constant="4" id="zto-Dn-ViX"/>
                                         </constraints>
                                     </customView>
                                 </subviews>
                                 <constraints>
                                     <constraint firstAttribute="trailing" secondItem="xMk-8H-B64" secondAttribute="trailing" constant="24" id="0Y5-Y0-JAP"/>
+                                    <constraint firstItem="EFI-bR-zm3" firstAttribute="top" secondItem="xMk-8H-B64" secondAttribute="bottom" constant="36" id="1rG-8d-oZo"/>
                                     <constraint firstAttribute="bottom" secondItem="3io-Hj-Kiz" secondAttribute="bottom" id="8hH-Nz-14P"/>
                                     <constraint firstItem="xMk-8H-B64" firstAttribute="top" secondItem="2gJ-MM-ZrB" secondAttribute="top" constant="48" id="BmM-pK-ELG"/>
-                                    <constraint firstItem="eZs-02-dfp" firstAttribute="top" secondItem="xMk-8H-B64" secondAttribute="bottom" constant="24" id="BoC-48-m5e"/>
+                                    <constraint firstAttribute="trailing" secondItem="EFI-bR-zm3" secondAttribute="trailing" constant="8" id="FJ6-9m-JSx"/>
                                     <constraint firstItem="3io-Hj-Kiz" firstAttribute="top" secondItem="2gJ-MM-ZrB" secondAttribute="top" id="OUk-vQ-edJ"/>
                                     <constraint firstItem="3io-Hj-Kiz" firstAttribute="leading" secondItem="2gJ-MM-ZrB" secondAttribute="leading" id="eTW-ob-qK1"/>
-                                    <constraint firstAttribute="bottom" secondItem="eZs-02-dfp" secondAttribute="bottom" id="hKB-Xy-3r7"/>
+                                    <constraint firstItem="EFI-bR-zm3" firstAttribute="leading" secondItem="2gJ-MM-ZrB" secondAttribute="leading" constant="8" id="k52-8W-n4c"/>
                                     <constraint firstAttribute="trailing" secondItem="3io-Hj-Kiz" secondAttribute="trailing" id="kZa-Sb-BLN"/>
                                     <constraint firstItem="xMk-8H-B64" firstAttribute="leading" secondItem="2gJ-MM-ZrB" secondAttribute="leading" constant="24" id="llZ-cI-Lb3"/>
-                                    <constraint firstAttribute="trailing" secondItem="eZs-02-dfp" secondAttribute="trailing" constant="16" id="pwm-0C-e6W"/>
-                                    <constraint firstItem="eZs-02-dfp" firstAttribute="leading" secondItem="2gJ-MM-ZrB" secondAttribute="leading" constant="16" id="s35-fX-Hao"/>
                                 </constraints>
                             </view>
                         </box>
@@ -388,7 +485,7 @@ Gw
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="lTX-FO-7Ze">
                             <rect key="frame" x="489" y="374" width="65" height="40"/>
                             <subviews>
-                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Hn2-R8-Bfv">
+                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Hn2-R8-Bfv">
                                     <rect key="frame" x="14" y="12" width="37" height="16"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="gkz-Hj-UOJ">
                                         <font key="font" metaFont="system"/>

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

@@ -265,16 +265,6 @@ import Cocoa
     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()
         
@@ -2542,27 +2532,6 @@ extension KMMainViewController {
         if IAPProductsManager.default().isAvailableAllFunction() {
             return
         }
-        
-        if let info = KMAdvertisementManager.manager.info.popWindowContent?.content?.first {
-            if recommondPopWindowVC == nil {
-                recommondPopWindowVC = KMRecommondPopWindow.default()
-            }
-            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/Purchase/DMG/KMPurchaseCompareDMGWindowController.m

@@ -525,40 +525,6 @@ static NSString *const KMPurchaseCompareDMGCellIdentifier       = @"KMPurchaseCo
     self.originalPriceLabel.attributedStringValue = attributedText;
     self.discountPriceLabel.stringValue = discountText;
     self.discountPriceLabel2.stringValue = discountText;
-
-    if (KMAdvertisementManager.manager.info.discountContent.content.count > 0) {
-        KMAdvertisementItemInfo *info = KMAdvertisementManager.manager.info.discountContent.content.firstObject;
-        if ([KMAdvertisementManager checkAdvertisementValid:info]) {
-            self.discountTipImage.hidden = NO;
-            
-            NSURL *url = [NSURL URLWithString:[KMAdvertisementModelTransition transitionImagePathWithImage:info.image highlight:NO]];
-            self.discountTipImage.image = [KMAdvertisementImage imageWithURLWithUrl:url completion:^(NSImage * _Nonnull image) {
-                self.discountTipImage.image = image;
-            }];
-            if ([originalText isEqualToString:discountText]) {
-                [self.originalPriceLabel setHidden:YES];
-                [self.discountPriceLabel setHidden:YES];
-                [self.discountPriceLabel2 setHidden:NO];
-                [self.discountTipImage setHidden:YES];
-            } else {
-                [self.originalPriceLabel setHidden:NO];
-                [self.discountPriceLabel setHidden:NO];
-                [self.discountPriceLabel2 setHidden:YES];
-                [self.discountTipImage setHidden:NO];
-            }
-        } else {
-            self.discountTipImage.hidden = YES;
-            if ([originalText isEqualToString:discountText]) {
-                [self.originalPriceLabel setHidden:YES];
-                [self.discountPriceLabel setHidden:YES];
-                [self.discountPriceLabel2 setHidden:NO];
-            } else {
-                [self.originalPriceLabel setHidden:NO];
-                [self.discountPriceLabel setHidden:NO];
-                [self.discountPriceLabel2 setHidden:YES];
-            }
-        }
-    }
 }
 
 //- (void)updatePriceLabel {