Prechádzať zdrojové kódy

【综合】what's new功能处理

niehaoyu 1 rok pred
rodič
commit
130a21f70f

+ 8 - 0
PDF Office/PDF Master.xcodeproj/project.pbxproj

@@ -2826,6 +2826,9 @@
 		BB1D41D32B26D9BD00994EDC /* KMReusable.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB1D41D22B26D9BD00994EDC /* KMReusable.swift */; };
 		BB1D41D42B26D9BD00994EDC /* KMReusable.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB1D41D22B26D9BD00994EDC /* KMReusable.swift */; };
 		BB1D41D52B26D9BD00994EDC /* KMReusable.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB1D41D22B26D9BD00994EDC /* KMReusable.swift */; };
+		BB1E7F2C2B4FE2C6002D9785 /* GuideInfoImages.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BB1E7F2B2B4FE2C6002D9785 /* GuideInfoImages.xcassets */; };
+		BB1E7F2D2B4FE2C6002D9785 /* GuideInfoImages.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BB1E7F2B2B4FE2C6002D9785 /* GuideInfoImages.xcassets */; };
+		BB1E7F2E2B4FE2C6002D9785 /* GuideInfoImages.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BB1E7F2B2B4FE2C6002D9785 /* GuideInfoImages.xcassets */; };
 		BB1EC7FE2967B26700EC0BC3 /* KMPDFEditViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB1EC7FC2967B26700EC0BC3 /* KMPDFEditViewController.swift */; };
 		BB1EC7FF2967B26700EC0BC3 /* KMPDFEditViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB1EC7FC2967B26700EC0BC3 /* KMPDFEditViewController.swift */; };
 		BB1EC8002967B26700EC0BC3 /* KMPDFEditViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB1EC7FC2967B26700EC0BC3 /* KMPDFEditViewController.swift */; };
@@ -5818,6 +5821,7 @@
 		BB1CA5C5298E20820059E31C /* KMPreferenceAligementView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPreferenceAligementView.swift; sourceTree = "<group>"; };
 		BB1CA5CA298E5F540059E31C /* KMMergeTools.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMMergeTools.swift; sourceTree = "<group>"; };
 		BB1D41D22B26D9BD00994EDC /* KMReusable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMReusable.swift; sourceTree = "<group>"; };
+		BB1E7F2B2B4FE2C6002D9785 /* GuideInfoImages.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = GuideInfoImages.xcassets; sourceTree = "<group>"; };
 		BB1EC7FC2967B26700EC0BC3 /* KMPDFEditViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPDFEditViewController.swift; sourceTree = "<group>"; };
 		BB1EC7FD2967B26700EC0BC3 /* KMPDFEditViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMPDFEditViewController.xib; sourceTree = "<group>"; };
 		BB24D4A52977BE6700041659 /* KMRedactConfirmWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMRedactConfirmWindowController.swift; sourceTree = "<group>"; };
@@ -9829,6 +9833,7 @@
 		BB1B0AA02B4FC6E800889528 /* GuideInfo */ = {
 			isa = PBXGroup;
 			children = (
+				BB1E7F2B2B4FE2C6002D9785 /* GuideInfoImages.xcassets */,
 				BB1B0AA42B4FC6E800889528 /* KMGuideConfig.swift */,
 				BB1B0AA32B4FC6E800889528 /* KMGuideInfoWindow.swift */,
 				BB1B0ABD2B4FC6E800889528 /* KMGuideInfoWindow.xib */,
@@ -12526,6 +12531,7 @@
 				BB49ED09293F461500C82CA2 /* KMConvertCSVWindowController.xib in Resources */,
 				9F1F82D5292F6D510092C4B4 /* KMPDFInsertPreviewViewController.xib in Resources */,
 				ADC63E4B2A49BEDD00854E02 /* KMSubscribeWaterMarkCollectionItem.xib in Resources */,
+				BB1E7F2C2B4FE2C6002D9785 /* GuideInfoImages.xcassets in Resources */,
 				BBF62C742B0347D1007B7E86 /* SplitWindowController.xib in Resources */,
 				ADD1B6BF2942DD3D00C3FFF7 /* KMPrintChooseView.xib in Resources */,
 				ADDF83A42B391A5D00A81A4E /* DSignatureConfigWindowController.xib in Resources */,
@@ -13104,6 +13110,7 @@
 				9F1F82CE292F6CF90092C4B4 /* KMPDFInsertPageWindow.xib in Resources */,
 				9F0201822A1BAC1600C9B673 /* KMAIRewritingVC.xib in Resources */,
 				89E4E7422964160F002DBA6F /* KMAnnotationLinkViewController.xib in Resources */,
+				BB1E7F2D2B4FE2C6002D9785 /* GuideInfoImages.xcassets in Resources */,
 				89752DEE293875FC003FF08E /* KMMainToolbarController.xib in Resources */,
 				BB49ED0A293F461500C82CA2 /* KMConvertCSVWindowController.xib in Resources */,
 				BBEC00B3295C2AF300A26C98 /* KMBatesPreviewController.xib in Resources */,
@@ -13465,6 +13472,7 @@
 				BB04FD122B206F4000D80F7B /* KMPlanViewController.xib in Resources */,
 				AD199DE32B200FB000D56FEE /* KMPrintPosterView.xib in Resources */,
 				9F8539DC294318D600DF644E /* TabsImage.xcassets in Resources */,
+				BB1E7F2E2B4FE2C6002D9785 /* GuideInfoImages.xcassets in Resources */,
 				BBC745EF295F067B0072C2ED /* KMCropSettingWindowController.xib in Resources */,
 				BBAFC84F298519F700D0648E /* KMSavePanelAccessoryController.xib in Resources */,
 				BBEC00C4295C306400A26C98 /* KMBatesPropertyController.xib in Resources */,

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 746
PDF Office/PDF Master.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist


+ 9 - 9
PDF Office/PDF Master/Class/GuideInfo/Controllers/KMFunctionGuideMultiController.xib

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" 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="22155"/>
+        <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="KMFunctionGuideMultiController" customModule="PDF_Reader_Pro" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMFunctionGuideMultiController" customModule="PDF_Master" customModuleProvider="target">
             <connections>
                 <outlet property="contendView" destination="TY5-yF-SZr" id="sih-Zb-vDg"/>
                 <outlet property="desLabel" destination="h9u-pa-nqn" id="dwU-eM-iM0"/>
@@ -69,7 +69,7 @@
                                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                         </textFieldCell>
                                                     </textField>
-                                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bNV-bb-hUn" customClass="KMButton">
+                                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bNV-bb-hUn" customClass="KMButton" customModule="PDF_Master" customModuleProvider="target">
                                                         <rect key="frame" x="0.0" y="0.0" width="120" height="32"/>
                                                         <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="G0x-Qt-ZVB">
                                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -98,7 +98,7 @@
                                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="ZqB-a4-2Kx">
                                             <rect key="frame" x="120" y="0.0" width="120" height="32"/>
                                             <subviews>
-                                                <button allowsExpansionToolTips="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="BLI-t8-GUb" customClass="HyperLinkButton">
+                                                <button allowsExpansionToolTips="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="BLI-t8-GUb" customClass="HyperLinkButton" customModule="PDF_Master" customModuleProvider="target">
                                                     <rect key="frame" x="20" y="8" width="73" height="16"/>
                                                     <buttonCell key="cell" type="bevel" title="Learn More" bezelStyle="rounded" alignment="center" lineBreakMode="truncatingTail" imageScaling="proportionallyDown" inset="2" id="rFj-Aj-3Hq">
                                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -149,9 +149,9 @@
                                         <constraint firstAttribute="height" constant="224" id="Cnu-yH-kK4"/>
                                         <constraint firstAttribute="width" constant="392" id="lC0-1S-jSV"/>
                                     </constraints>
-                                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="axesIndependently" image="icon_pdfToOffice" id="Lb7-E2-Hao"/>
+                                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="axesIndependently" image="whatNew_Digital" id="Lb7-E2-Hao"/>
                                 </imageView>
-                                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WXK-no-Mi5" customClass="KMButton">
+                                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WXK-no-Mi5" customClass="KMButton" customModule="PDF_Master" customModuleProvider="target">
                                     <rect key="frame" x="360" y="168" width="24" height="24"/>
                                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="arrow_down_sel" imagePosition="overlaps" alignment="center" imageScaling="proportionallyDown" inset="2" id="eel-L1-lBe">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -185,7 +185,7 @@
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="g30-Mi-n9I" customClass="KMButton">
+                                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="g30-Mi-n9I" customClass="KMButton" customModule="PDF_Master" customModuleProvider="target">
                                     <rect key="frame" x="392" y="168" width="24" height="24"/>
                                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="arrow_right_sel" imagePosition="overlaps" alignment="center" imageScaling="proportionallyDown" inset="2" id="beh-Eg-Ukr">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -237,6 +237,6 @@
     <resources>
         <image name="arrow_down_sel" width="16" height="16"/>
         <image name="arrow_right_sel" width="16" height="16"/>
-        <image name="icon_pdfToOffice" width="1278" height="720"/>
+        <image name="whatNew_Digital" width="1176" height="672"/>
     </resources>
 </document>

+ 6 - 0
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

+ 22 - 0
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/whatNew_Digital.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "whatNew_Digital.png",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "Frame 1000006532.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/whatNew_Digital.imageset/Frame 1000006532.png


BIN
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/whatNew_Digital.imageset/whatNew_Digital.png


+ 1 - 1
PDF Office/PDF Master/Class/GuideInfo/KMFunctionGuideWindowController.xib

@@ -15,7 +15,7 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" titlebarAppearsTransparent="YES" titleVisibility="hidden" id="F0z-JX-Cv5">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" fullSizeContentView="YES"/>
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" fullSizeContentView="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="574" height="387"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>

+ 27 - 0
PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController.swift

@@ -367,6 +367,10 @@ import Cocoa
         #if VERSION_DMG
         KMResourceDownloadManager.manager.checkDocumentAIVersion()
         #endif
+         
+        self.loadFunctionGuide()
+ 
+        
     }
        
     //MARK: - KMToolbarViewControllerDelegate
@@ -632,6 +636,29 @@ import Cocoa
         return self._getPDFRedactController() != nil
     }
     
+    //MARK: - 引导
+    func loadFunctionGuide() -> Void {
+#if VERSION_DMG
+        
+#else
+        self.loadNewUserGuide()
+#endif
+        
+    }
+    
+    //MARK: what's New
+    func loadNewUserGuide() -> Void {
+        if KMFunctionGuideWindowController.availableShow(.functionMulitDidital) {
+            let guideWindowVC = KMFunctionGuideWindowController.init(windowNibName: "KMFunctionGuideWindowController")
+            guideWindowVC.type = .functionMulti
+            guideWindowVC.showWindow(nil)
+            guideWindowVC.window?.orderFront(nil)
+            
+            KMFunctionGuideWindowController.setDidShowFor(.functionMulitDidital)
+        }
+    }
+    
+    
     // MARK: - 页面编辑
     
     open func enterPageEdit(_ pages: [Int] = []) {