综合-dmg版本，新增检查更新菜单，调整官网下载页

PDF Office/PDF Master/AppDelegate.swift

@@ -171,10 +171,10 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         }
         
         let PDFOfficeMenu = mainMenu?.item(at: 0)?.submenu
-//        let appTarget = KMTools_OC.getAppTarget()
-//        if (appTarget == .DMG) {
-//            PDFOfficeMenu?.insertItem(withTitle: NSLocalizedString("Check for Updates", comment: ""), action: #selector(checkForUpdates), target: self, at: 1)
-//        }
+        let appTarget = KMTools_OC.getAppTarget()
+        if (appTarget == .DMG) {
+            PDFOfficeMenu?.insertItem(withTitle: NSLocalizedString("Check for Updates", comment: ""), action: #selector(checkForUpdates), target: self, at: 1)
+        }
         if let items = PDFOfficeMenu?.items {
             for menu in items {
                 let ranges = menu.title.ranges(of: "PDF Master")
@@ -317,6 +317,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             return
         }
         
+        KMTools.openDownloadDMGWebsite()
     }
 }
 

PDF Office/PDF Master/Class/Common/Tools/KMTools.swift

@@ -87,8 +87,21 @@ import Cocoa
     // MARK: -
     // MARK: 打开网页
     
-    @objc class func openURL(_ url: URL) {
-        NSWorkspace.shared.open(url)
+    @objc class func openURL(url: URL?) {
+        guard let _url = url else {
+            KMPrint("url invalid.")
+            return
+        }
+        NSWorkspace.shared.open(_url)
+    }
+    
+    @objc class func openURL(urlString: String?) {
+        guard let _urlString = urlString else {
+            KMPrint("url invalid.")
+            return
+        }
+        
+        KMTools.openURL(url: URL(string: _urlString))
     }
     
     // MARK: -
@@ -182,9 +195,7 @@ extension KMTools {
         
         let path = Bundle.main.path(forResource: fileName, ofType: fileType)
         if (path == nil || FileManager.default.fileExists(atPath: path!) == false) {
-            // MARK: -
-            // MARK: url需要替换
-            KMTools.openURL(URL(string: "https://www.pdfreaderpro.com/help")!)
+            KMTools.openURL(url: URL(string: "https://www.pdfreaderpro.com/help"))
             return
         }
         
@@ -223,23 +234,23 @@ extension KMTools {
     
     // 打开 [更多产品] 网站
     @objc class func openMoreProductWebsite() {
-        // MARK: -
-        // FIXME: url需要替换
-        KMTools.openURL(URL(string: "https://www.pdfreaderpro.com/product?utm_source=MacApp&utm_campaign=ProductLink&utm_medium=PdfProduct")!)
+        KMTools.openURL(url: URL(string: "https://www.pdfreaderpro.com/product?utm_source=MacApp&utm_campaign=ProductLink&utm_medium=PdfProduct"))
     }
     
     // 打开 [免费 PDF 模板] 网站
     @objc class func openFreePDFTemplatesWebsite() {
-        // MARK: -
-        // MARK: url需要替换
-        KMTools.openURL(URL(string: "https://www.pdfreaderpro.com/templates?utm_source=MacApp&utm_campaign=TemplatesLink&utm_medium=PdfTemplates")!)
+        KMTools.openURL(url: URL(string: "https://www.pdfreaderpro.com/templates?utm_source=MacApp&utm_campaign=TemplatesLink&utm_medium=PdfTemplates"))
     }
     
     // 打开 [ComPDFKit 授权] 网站
     @objc class func openComPDFKitPowerWebsite() {
-        // MARK: -
-        // MARK TODO: url需要替换
-        KMTools.openURL(URL(string: "https://www.compdf.com/?utm_source=macapp&utm_medium=pdfmac&utm_campaign=compdfkit-promp")!)
+        KMTools.openURL(url: URL(string: "https://www.compdf.com/?utm_source=macapp&utm_medium=pdfmac&utm_campaign=compdfkit-promp"))
+    }
+    
+    // 打开 [官网 下载页] 网站
+    // 测试环境 http://test-pdf-pro.kdan.cn:3021/pdf-master-mac-download
+    @objc class func openDownloadDMGWebsite() {
+        KMTools.openURL(urlString: "https://www.pdfreaderpro.com/pdf-master-mac-download")
     }
     
     // 意见反馈
@@ -293,7 +304,5 @@ extension KMTools {
         case .custom:
             return NSLocalizedString("Customize", comment: "")
         }
-        
-        return ""
     }
 }