Преглед изворни кода

【系统菜单栏】帮助菜单,反馈、评分等菜单补充

tangchao пре 1 година
родитељ
комит
a1965cabf8

+ 4 - 4
PDF Office/PDF Master/AppDelegate.swift

@@ -560,11 +560,11 @@ class AppDelegate: NSObject, NSApplicationDelegate, iRateDelegate{
     }
     
     @IBAction func menuItemAction_feekback(_ sender: NSMenuItem) -> Void {
-        KMTools.feekback()
+        KMTools.proposeNewFeature()
     }
     
     @IBAction func menuItemAction_giveFiveStar(_ sender: NSMenuItem) -> Void {
-        KMPrint("menuItemAction_giveFiveStar ...")
+        KMTools.rateUs()
     }
     
     @objc func restoreSubscriptions(_ sender: NSMenuItem) {
@@ -647,10 +647,10 @@ class AppDelegate: NSObject, NSApplicationDelegate, iRateDelegate{
         KMTools.feekback()
     }
     @IBAction func reportBug(_ sender: NSMenuItem) -> Void {
-        KMPrint("reportBug ...")
+        KMTools.reportBug()
     }
     @IBAction func reportGeneralQuestions(_ sender: NSMenuItem) -> Void {
-        KMPrint("reportGeneralQuestions ...")
+        KMTools.reportGeneralQuestions()
     }
 }
 

+ 7 - 6
PDF Office/PDF Master/Base.lproj/Main.storyboard

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -2150,8 +2151,8 @@ CA
                         <outlet property="delegate" destination="Voe-Tx-rLC" id="PrD-fu-P6m"/>
                     </connections>
                 </application>
-                <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="PDF_Master" customModuleProvider="target"/>
-                <customObject id="86N-QX-1VH" userLabel="KMDocumentController" customClass="KMDocumentController" customModule="PDF_Master" customModuleProvider="target"/>
+                <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="PDF_Reader_Pro" customModuleProvider="target"/>
+                <customObject id="86N-QX-1VH" userLabel="KMDocumentController" customClass="KMDocumentController" customModule="PDF_Reader_Pro" customModuleProvider="target"/>
                 <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
                 <customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
             </objects>
@@ -2160,7 +2161,7 @@ CA
         <!--Window Controller-->
         <scene sceneID="R2V-B0-nI4">
             <objects>
-                <windowController id="B8D-0N-5wS" customClass="NSMainWindowController" customModule="PDF_Master" customModuleProvider="target" sceneMemberID="viewController">
+                <windowController id="B8D-0N-5wS" customClass="NSMainWindowController" customModule="PDF_Reader_Pro" customModuleProvider="target" sceneMemberID="viewController">
                     <window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="IQv-IB-iLA">
                         <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
                         <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
@@ -2181,7 +2182,7 @@ CA
         <!--View Controller-->
         <scene sceneID="hIz-AP-VOD">
             <objects>
-                <viewController id="XfG-lQ-9wD" customClass="ViewController" customModule="PDF_Master" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="XfG-lQ-9wD" customClass="ViewController" customModule="PDF_Reader_Pro" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" id="m2S-Jp-Qdl">
                         <rect key="frame" x="0.0" y="0.0" width="480" height="270"/>
                         <autoresizingMask key="autoresizingMask"/>

+ 54 - 0
PDF Office/PDF Master/Class/Common/Tools/KMTools.swift

@@ -367,6 +367,32 @@ extension KMTools {
         let (major, minor, bugFix) = KMTools.getSystemVersion()
         let versionInfoString = "\(KMTools.getRawSystemInfo()) - \(major).\(minor).\(bugFix)"
         
+        let appVersion = KMTools.getAppVersion()
+        let appName = KMTools.getAppNameForSupportEmail()
+        let subjects = "\(appName) - \(appVersion);\(NSLocalizedString("Feedback", comment: ""));\(versionInfoString)"
+        let email = "support@pdfreaderpro.com"
+        
+        KMMailHelper.newEmail(withContacts: email, andSubjects: subjects)
+    }
+    
+    //
+    @objc class func reportBug() {
+        let (major, minor, bugFix) = KMTools.getSystemVersion()
+        let versionInfoString = "\(KMTools.getRawSystemInfo()) - \(major).\(minor).\(bugFix)"
+        
+        let appVersion = KMTools.getAppVersion()
+        let appName = KMTools.getAppNameForSupportEmail()
+        let subjects = "\(appName) - \(appVersion);\(NSLocalizedString("Report a Bug", comment: ""));\(versionInfoString)"
+        let email = "support@pdfreaderpro.com"
+        
+        KMMailHelper.newEmail(withContacts: email, andSubjects: subjects)
+    }
+    
+    //
+    @objc class func proposeNewFeature() {
+        let (major, minor, bugFix) = KMTools.getSystemVersion()
+        let versionInfoString = "\(KMTools.getRawSystemInfo()) - \(major).\(minor).\(bugFix)"
+        
         let appVersion = KMTools.getAppVersion()
         let appName = KMTools.getAppNameForSupportEmail()
         let subjects = "\(appName) - \(appVersion);\(NSLocalizedString("Propose a New Feature", comment: ""));\(versionInfoString)"
@@ -375,6 +401,34 @@ extension KMTools {
         KMMailHelper.newEmail(withContacts: email, andSubjects: subjects)
     }
     
+    //
+    @objc class func reportGeneralQuestions() {
+        let (major, minor, bugFix) = KMTools.getSystemVersion()
+        let versionInfoString = "\(KMTools.getRawSystemInfo()) - \(major).\(minor).\(bugFix)"
+        
+        let appVersion = KMTools.getAppVersion()
+        let appName = KMTools.getAppNameForSupportEmail()
+        let subjects = "\(appName) - \(appVersion);\(NSLocalizedString("General Questions", comment: ""));\(versionInfoString)"
+        let email = "support@pdfreaderpro.com"
+        
+        KMMailHelper.newEmail(withContacts: email, andSubjects: subjects)
+    }
+    
+    @objc class func rateUs() {
+#if VERSION_FREE
+        iRate.sharedInstance().appStoreID = 919472673
+#else
+        iRate.sharedInstance().appStoreID = 825459243
+#endif
+        
+        if UserDefaults.standard.bool(forKey: "kUserHaveClickRateUsKey") == false {
+            UserDefaults.standard.set(true, forKey: "kUserHaveClickRateUsKey")
+            UserDefaults.standard.synchronize()
+            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "kUserHaveClickRateUsNotification"), object: self)
+    }
+        iRate.sharedInstance().openRatingsPageInAppStore()
+    }
+    
     @objc class func getAppNameForSupportEmail() -> String {
         var tAppName = "PDF Reader Pro"
     #if VERSION_FREE