Browse Source

【综合】引导&IAP界面完善

niehaoyu 1 year ago
parent
commit
ae23dc9419
40 changed files with 21058 additions and 15543 deletions
  1. 8 0
      PDF Office/PDF Master.xcodeproj/project.pbxproj
  2. 111 0
      PDF Office/PDF Master.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  3. 0 15096
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_Vip/dmg_upgrade_bg.imageset/dmg_upgrade_bg.pdf
  4. 1 10
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_Vip/dmg_upgrade_part_bg.imageset/Contents.json
  5. 6 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/Purchase/Contents.json
  6. 22 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/Purchase/KMImageNameLincenseEmail 1.imageset/Contents.json
  7. 95 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/Purchase/KMImageNameLincenseEmail 1.imageset/ic-3.pdf
  8. 96 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/Purchase/KMImageNameLincenseEmail 1.imageset/ic-4.pdf
  9. 22 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/Purchase/KMImageNameLincenseEmail.imageset/Contents.json
  10. BIN
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/Purchase/KMImageNameLincenseEmail.imageset/ic_license_license (1).pdf
  11. BIN
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/Purchase/KMImageNameLincenseEmail.imageset/ic_license_license.pdf
  12. 22 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/Purchase/KMImageNameLincenseUSer 1.imageset/Contents.json
  13. 116 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/Purchase/KMImageNameLincenseUSer 1.imageset/ic-2.pdf
  14. 115 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/Purchase/KMImageNameLincenseUSer 1.imageset/ic.pdf
  15. 22 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/Purchase/KMImageNameLincenseUSer.imageset/Contents.json
  16. BIN
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/Purchase/KMImageNameLincenseUSer.imageset/ic_license_user (1).pdf
  17. BIN
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/Purchase/KMImageNameLincenseUSer.imageset/ic_license_user.pdf
  18. 22 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/Purchase/KMPurchaseFirstTrialWindowBG.imageset/Contents.json
  19. 5833 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/Purchase/KMPurchaseFirstTrialWindowBG.imageset/bg 1.pdf
  20. 5833 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/Purchase/KMPurchaseFirstTrialWindowBG.imageset/bg.pdf
  21. 1 1
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_Vip/dmg_upgrade_bg.imageset/Contents.json
  22. 7652 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/Purchase/dmg_upgrade_bg.imageset/bg.pdf
  23. 22 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/compare_nosupport.imageset/Contents.json
  24. 79 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/compare_nosupport.imageset/ic_else_no.pdf
  25. 107 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/compare_nosupport.imageset/vip.pdf
  26. 22 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/ic_Tooltip.imageset/Contents.json
  27. 94 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/ic_Tooltip.imageset/ic_Tooltip 1.pdf
  28. 94 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/ic_Tooltip.imageset/ic_Tooltip.pdf
  29. 22 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/ic_Tooltip_hover.imageset/Contents.json
  30. 94 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/ic_Tooltip_hover.imageset/ic_Tooltip_hover 1.pdf
  31. 94 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/ic_Tooltip_hover.imageset/ic_Tooltip_hover.pdf
  32. 219 222
      PDF Office/PDF Master/Class/Purchase/Appstore/KMPurchaseCompareWindowController.m
  33. 7 7
      PDF Office/PDF Master/Class/Purchase/Appstore/KMPurchaseCompareWindowController.xib
  34. 19 0
      PDF Office/PDF Master/Class/Purchase/Category/SKInspectPublicTool.swift
  35. 4 4
      PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseCompareDMGWindowController.m
  36. 2 2
      PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseCompareDMGWindowController.xib
  37. 149 149
      PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseFirstTrialWindowController.swift
  38. 19 18
      PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseFirstTrialWindowController.xib
  39. 25 25
      PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseLimitWindowController.swift
  40. 9 9
      PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMVerificationWindowController.m

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

@@ -2844,6 +2844,9 @@
 		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 */; };
+		BB1E7F302B511079002D9785 /* SKInspectPublicTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB1E7F2F2B511079002D9785 /* SKInspectPublicTool.swift */; };
+		BB1E7F312B511079002D9785 /* SKInspectPublicTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB1E7F2F2B511079002D9785 /* SKInspectPublicTool.swift */; };
+		BB1E7F322B511079002D9785 /* SKInspectPublicTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB1E7F2F2B511079002D9785 /* SKInspectPublicTool.swift */; };
 		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 */; };
@@ -5845,6 +5848,7 @@
 		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>"; };
+		BB1E7F2F2B511079002D9785 /* SKInspectPublicTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SKInspectPublicTool.swift; 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>"; };
@@ -11259,6 +11263,7 @@
 		BBA9221B2B4E7AF50061057A /* Category */ = {
 			isa = PBXGroup;
 			children = (
+				BB1E7F2F2B511079002D9785 /* SKInspectPublicTool.swift */,
 			);
 			path = Category;
 			sourceTree = "<group>";
@@ -13798,6 +13803,7 @@
 				F37322E7292DF9410013862C /* CPDFAnnotationModel.m in Sources */,
 				9FBA0EF92900188F001117AF /* KMFastToolCollectionView.swift in Sources */,
 				BBFE6E752930E53000142C01 /* KMMergePopoverViewController.swift in Sources */,
+				BB1E7F302B511079002D9785 /* SKInspectPublicTool.swift in Sources */,
 				BB65A0472AF893DD003A27A0 /* KMGeneralPreferences.swift in Sources */,
 				9FBA0EFE29015A82001117AF /* KMFastToolCollectionViewItem.swift in Sources */,
 				BBA8B7A32935CD740097D183 /* KMRemovePasswordAlertWindowController.swift in Sources */,
@@ -15727,6 +15733,7 @@
 				BBB9B329299A5D6D004F3235 /* GTMAppAuthFetcherAuthorization+Keychain.m in Sources */,
 				9F1FE4A329406E4700E952CA /* CTToolbarController.m in Sources */,
 				BB6719FA2AD2CC05003D44D5 /* CPDFSignatureWidgetAnnotation+PDFListView.swift in Sources */,
+				BB1E7F312B511079002D9785 /* SKInspectPublicTool.swift in Sources */,
 				BB2EDF71296ECE17003BCF58 /* KMPageEditThumbnailView.swift in Sources */,
 				BB3A668D2B06FD0100575343 /* KMBotaEnum.swift in Sources */,
 				9FD0FA2A29CD3ED400F2AB0D /* KMRightSideEmptyVC.swift in Sources */,
@@ -16480,6 +16487,7 @@
 				9FF816E82AFA5D650087EFC5 /* KMTableAnnotation.swift in Sources */,
 				ADDF83222B391A5C00A81A4E /* KMPDFDigitalSignViewController.swift in Sources */,
 				BB6B436D2A04935000E02B54 /* KMPDFThumbViewBaseController.swift in Sources */,
+				BB1E7F322B511079002D9785 /* SKInspectPublicTool.swift in Sources */,
 				ADDF83282B391A5C00A81A4E /* CPDFDigtalView.m in Sources */,
 				BBB9B330299A5D6D004F3235 /* GTMAppAuthFetcherAuthorization.m in Sources */,
 				BB146FBC299DC0D100784A6A /* GTLRBase64.m in Sources */,

+ 111 - 0
PDF Office/PDF Master.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -157,6 +157,21 @@
                   endingLineNumber = "727"
                   offsetFromSymbolStart = "5360">
                </Location>
+               <Location
+                  uuid = "770E4A49-AE8B-4D16-BE6A-9C03F79E1C27 - 5eaa69c29cebb394"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Master_DMG.KMMainViewController.loadOpenFileFunctionGuide(PDF_Master_DMG.KMGuideInfoType) -&gt; ()"
+                  moduleName = "PDF Master DMG"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "727"
+                  endingLineNumber = "727"
+                  offsetFromSymbolStart = "1720">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -331,5 +346,101 @@
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "80629F37-8355-4489-A0B5-D2C232463B29"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/Purchase/Appstore/KMPurchaseCompareWindowController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "391"
+            endingLineNumber = "391"
+            landmarkName = "-windowDidLoad"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "80629F37-8355-4489-A0B5-D2C232463B29 - c997bf6f4a1165b6"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMPurchaseCompareWindowController windowDidLoad]"
+                  moduleName = "PDF Master DMG"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/Purchase/Appstore/KMPurchaseCompareWindowController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "391"
+                  endingLineNumber = "391"
+                  offsetFromSymbolStart = "508">
+               </Location>
+               <Location
+                  uuid = "80629F37-8355-4489-A0B5-D2C232463B29 - c997bf6f4a1165b6"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMPurchaseCompareWindowController windowDidLoad]"
+                  moduleName = "PDF Master DMG"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/Purchase/Appstore/KMPurchaseCompareWindowController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "391"
+                  endingLineNumber = "391"
+                  offsetFromSymbolStart = "504">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "528221B4-8368-4C3B-8886-ADBD55DCFE61"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/Purchase/DMG/KMPurchaseCompareDMGWindowController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "497"
+            endingLineNumber = "497"
+            landmarkName = "-buttonItemClicked_Buy:"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "528221B4-8368-4C3B-8886-ADBD55DCFE61 - 37e800954b53551d"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMPurchaseCompareDMGWindowController buttonItemClicked_Buy:]"
+                  moduleName = "PDF Master DMG"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/Purchase/DMG/KMPurchaseCompareDMGWindowController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "500"
+                  endingLineNumber = "500"
+                  offsetFromSymbolStart = "44">
+               </Location>
+               <Location
+                  uuid = "528221B4-8368-4C3B-8886-ADBD55DCFE61 - 37e800954b5355ba"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMPurchaseCompareDMGWindowController buttonItemClicked_Buy:]"
+                  moduleName = "PDF Master DMG"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/Purchase/DMG/KMPurchaseCompareDMGWindowController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "497"
+                  endingLineNumber = "497"
+                  offsetFromSymbolStart = "44">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

File diff suppressed because it is too large
+ 0 - 15096
PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_Vip/dmg_upgrade_bg.imageset/dmg_upgrade_bg.pdf


+ 1 - 10
PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_Vip/dmg_upgrade_part_bg.imageset/Contents.json

@@ -2,16 +2,7 @@
   "images" : [
     {
       "filename" : "dmg_upgrade_part_bg.pdf",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
     }
   ],
   "info" : {

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

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

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

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic-3.pdf",
+      "idiom" : "mac"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic-4.pdf",
+      "idiom" : "mac"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

+ 95 - 0
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/Purchase/KMImageNameLincenseEmail 1.imageset/ic-3.pdf

@@ -0,0 +1,95 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 3.000000 5.250000 cm
+0.152276 0.234759 0.385445 scn
+18.000000 13.500000 m
+0.000000 13.500000 l
+0.000000 0.000000 l
+18.000000 0.000000 l
+18.000000 13.500000 l
+h
+15.585332 1.500000 m
+11.488131 6.132177 l
+9.000000 4.322627 l
+6.511869 6.132176 l
+2.414668 1.500000 l
+15.585332 1.500000 l
+h
+16.500000 2.729954 m
+16.500000 9.777173 l
+12.706775 7.018464 l
+16.500000 2.729954 l
+h
+1.500000 9.777172 m
+1.500000 2.729954 l
+5.293225 7.018464 l
+1.500000 9.777172 l
+h
+16.500000 11.631944 m
+16.500000 12.000000 l
+1.500000 12.000000 l
+1.500000 11.631943 l
+9.000000 6.178000 l
+16.500000 11.631944 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  657
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 24.000000 24.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000747 00000 n
+0000000769 00000 n
+0000000942 00000 n
+0000001016 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1075
+%%EOF

+ 96 - 0
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/Purchase/KMImageNameLincenseEmail 1.imageset/ic-4.pdf

@@ -0,0 +1,96 @@
+%PDF-1.7
+
+1 0 obj
+  << /ExtGState << /E1 << /ca 0.700000 >> >> >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+/E1 gs
+1.000000 0.000000 -0.000000 1.000000 3.000000 5.250000 cm
+1.000000 1.000000 1.000000 scn
+18.000000 13.500000 m
+0.000000 13.500000 l
+0.000000 0.000000 l
+18.000000 0.000000 l
+18.000000 13.500000 l
+h
+15.585332 1.500000 m
+11.488131 6.132177 l
+9.000000 4.322627 l
+6.511869 6.132176 l
+2.414668 1.500000 l
+15.585332 1.500000 l
+h
+16.500000 2.729954 m
+16.500000 9.777173 l
+12.706775 7.018464 l
+16.500000 2.729954 l
+h
+1.500000 9.777172 m
+1.500000 2.729954 l
+5.293225 7.018464 l
+1.500000 9.777172 l
+h
+16.500000 11.631944 m
+16.500000 12.000000 l
+1.500000 12.000000 l
+1.500000 11.631943 l
+9.000000 6.178000 l
+16.500000 11.631944 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  664
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 24.000000 24.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000074 00000 n
+0000000794 00000 n
+0000000816 00000 n
+0000000989 00000 n
+0000001063 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1122
+%%EOF

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

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_license_license.pdf",
+      "idiom" : "mac"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic_license_license (1).pdf",
+      "idiom" : "mac"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/Purchase/KMImageNameLincenseEmail.imageset/ic_license_license (1).pdf


BIN
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/Purchase/KMImageNameLincenseEmail.imageset/ic_license_license.pdf


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

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic.pdf",
+      "idiom" : "mac"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic-2.pdf",
+      "idiom" : "mac"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

+ 116 - 0
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/Purchase/KMImageNameLincenseUSer 1.imageset/ic-2.pdf

@@ -0,0 +1,116 @@
+%PDF-1.7
+
+1 0 obj
+  << /ExtGState << /E1 << /ca 0.700000 >> >> >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+/E1 gs
+1.000000 0.000000 -0.000000 1.000000 2.250000 2.250000 cm
+1.000000 1.000000 1.000000 scn
+0.000000 9.750000 m
+0.000000 15.134776 4.365224 19.500000 9.750000 19.500000 c
+15.134776 19.500000 19.500000 15.134776 19.500000 9.750000 c
+19.500000 4.365224 15.134776 0.000000 9.750000 0.000000 c
+4.365224 0.000000 0.000000 4.365224 0.000000 9.750000 c
+h
+18.000000 9.750000 m
+18.000000 14.306349 14.306349 18.000000 9.750000 18.000000 c
+5.193651 18.000000 1.500000 14.306349 1.500000 9.750000 c
+1.500000 7.139176 2.712766 4.811610 4.605681 3.299915 c
+5.130267 5.942797 l
+5.341544 6.999181 6.233273 7.774383 7.294185 7.849261 c
+7.463029 7.855204 l
+12.299641 7.855204 l
+13.376945 7.855204 14.311975 7.132821 14.593645 6.106280 c
+14.632614 5.941729 l
+15.119914 3.486696 l
+16.883051 4.999747 18.000000 7.244435 18.000000 9.750000 c
+h
+13.776993 2.547901 m
+13.161531 5.648623 l
+13.086831 6.022120 12.781910 6.300483 12.412298 6.348007 c
+12.299641 6.355204 l
+7.463029 6.355204 l
+7.082135 6.355204 6.749378 6.110795 6.630449 5.758484 c
+6.601351 5.649691 l
+5.960289 2.420000 l
+7.095075 1.832108 8.383753 1.500000 9.750000 1.500000 c
+11.212402 1.500000 12.585934 1.880501 13.776993 2.547901 c
+h
+9.562670 15.000000 m
+9.675792 15.000000 l
+11.439480 15.000000 12.869230 13.570249 12.869230 11.806561 c
+12.869230 11.693439 l
+12.869230 9.929751 11.439480 8.500000 9.675792 8.500000 c
+9.562670 8.500000 l
+7.798982 8.500000 6.369231 9.929751 6.369231 11.693439 c
+6.369231 11.806561 l
+6.369231 13.570249 7.798982 15.000000 9.562670 15.000000 c
+h
+9.675792 13.500000 m
+9.562670 13.500000 l
+8.627409 13.500000 7.869231 12.741821 7.869231 11.806561 c
+7.869231 11.693439 l
+7.869231 10.758179 8.627409 10.000000 9.562670 10.000000 c
+9.675792 10.000000 l
+10.611053 10.000000 11.369230 10.758179 11.369230 11.693439 c
+11.369230 11.806561 l
+11.369230 12.741821 10.611053 13.500000 9.675792 13.500000 c
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  1911
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 24.000000 24.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000074 00000 n
+0000002041 00000 n
+0000002064 00000 n
+0000002237 00000 n
+0000002311 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+2370
+%%EOF

+ 115 - 0
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/Purchase/KMImageNameLincenseUSer 1.imageset/ic.pdf

@@ -0,0 +1,115 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 2.250000 2.250000 cm
+0.152276 0.234759 0.385445 scn
+0.000000 9.750000 m
+0.000000 15.134776 4.365224 19.500000 9.750000 19.500000 c
+15.134776 19.500000 19.500000 15.134776 19.500000 9.750000 c
+19.500000 4.365224 15.134776 0.000000 9.750000 0.000000 c
+4.365224 0.000000 0.000000 4.365224 0.000000 9.750000 c
+h
+18.000000 9.750000 m
+18.000000 14.306349 14.306349 18.000000 9.750000 18.000000 c
+5.193651 18.000000 1.500000 14.306349 1.500000 9.750000 c
+1.500000 7.139176 2.712766 4.811610 4.605681 3.299915 c
+5.130267 5.942797 l
+5.341544 6.999181 6.233273 7.774383 7.294185 7.849261 c
+7.463029 7.855204 l
+12.299641 7.855204 l
+13.376945 7.855204 14.311975 7.132821 14.593645 6.106280 c
+14.632614 5.941729 l
+15.119914 3.486696 l
+16.883051 4.999747 18.000000 7.244435 18.000000 9.750000 c
+h
+13.776993 2.547901 m
+13.161531 5.648623 l
+13.086831 6.022120 12.781910 6.300483 12.412298 6.348007 c
+12.299641 6.355204 l
+7.463029 6.355204 l
+7.082135 6.355204 6.749378 6.110795 6.630449 5.758484 c
+6.601351 5.649691 l
+5.960289 2.420000 l
+7.095075 1.832108 8.383753 1.500000 9.750000 1.500000 c
+11.212402 1.500000 12.585934 1.880501 13.776993 2.547901 c
+h
+9.562670 15.000000 m
+9.675792 15.000000 l
+11.439480 15.000000 12.869230 13.570249 12.869230 11.806561 c
+12.869230 11.693439 l
+12.869230 9.929751 11.439480 8.500000 9.675792 8.500000 c
+9.562670 8.500000 l
+7.798982 8.500000 6.369231 9.929751 6.369231 11.693439 c
+6.369231 11.806561 l
+6.369231 13.570249 7.798982 15.000000 9.562670 15.000000 c
+h
+9.675792 13.500000 m
+9.562670 13.500000 l
+8.627409 13.500000 7.869231 12.741821 7.869231 11.806561 c
+7.869231 11.693439 l
+7.869231 10.758179 8.627409 10.000000 9.562670 10.000000 c
+9.675792 10.000000 l
+10.611053 10.000000 11.369230 10.758179 11.369230 11.693439 c
+11.369230 11.806561 l
+11.369230 12.741821 10.611053 13.500000 9.675792 13.500000 c
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  1904
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 24.000000 24.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000001994 00000 n
+0000002017 00000 n
+0000002190 00000 n
+0000002264 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+2323
+%%EOF

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

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_license_user.pdf",
+      "idiom" : "mac"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic_license_user (1).pdf",
+      "idiom" : "mac"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/Purchase/KMImageNameLincenseUSer.imageset/ic_license_user (1).pdf


BIN
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/Purchase/KMImageNameLincenseUSer.imageset/ic_license_user.pdf


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

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

File diff suppressed because it is too large
+ 5833 - 0
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/Purchase/KMPurchaseFirstTrialWindowBG.imageset/bg 1.pdf


File diff suppressed because it is too large
+ 5833 - 0
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/Purchase/KMPurchaseFirstTrialWindowBG.imageset/bg.pdf


+ 1 - 1
PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_Vip/dmg_upgrade_bg.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "dmg_upgrade_bg.pdf",
+      "filename" : "bg.pdf",
       "idiom" : "universal"
     }
   ],

File diff suppressed because it is too large
+ 7652 - 0
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/Purchase/dmg_upgrade_bg.imageset/bg.pdf


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

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_else_no.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "vip.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

+ 79 - 0
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/compare_nosupport.imageset/ic_else_no.pdf

@@ -0,0 +1,79 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 2.343018 2.342773 cm
+0.980392 0.117647 0.364706 scn
+10.253048 11.313965 m
+11.313708 10.253304 l
+6.717515 5.657111 l
+11.313708 1.060917 l
+10.253048 0.000257 l
+5.656174 4.597130 l
+1.060687 0.000230 l
+0.000027 1.060889 l
+4.595514 5.657791 l
+0.000000 10.253304 l
+1.060660 11.313965 l
+5.656854 6.717771 l
+10.253048 11.313965 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  398
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 16.000000 16.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000488 00000 n
+0000000510 00000 n
+0000000683 00000 n
+0000000757 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+816
+%%EOF

+ 107 - 0
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/compare_nosupport.imageset/vip.pdf

@@ -0,0 +1,107 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 6.000000 3.878906 cm
+1.000000 0.397070 0.569727 scn
+8.530330 9.590764 m
+9.060660 10.121094 l
+8.000000 11.181754 l
+7.469670 10.651423 l
+8.530330 9.590764 l
+h
+-0.530330 2.651424 m
+-1.060660 2.121094 l
+0.000000 1.060433 l
+0.530330 1.590764 l
+-0.530330 2.651424 l
+h
+7.469670 10.651423 m
+-0.530330 2.651424 l
+0.530330 1.590764 l
+8.530330 9.590764 l
+7.469670 10.651423 l
+h
+f
+n
+Q
+q
+-1.000000 -0.000000 -0.000000 1.000000 14.000000 3.878906 cm
+1.000000 0.397070 0.569727 scn
+8.530330 9.590764 m
+9.060660 10.121094 l
+8.000000 11.181754 l
+7.469670 10.651423 l
+8.530330 9.590764 l
+h
+-0.530330 2.651424 m
+-1.060660 2.121094 l
+0.000000 1.060433 l
+0.530330 1.590764 l
+-0.530330 2.651424 l
+h
+7.469670 10.651423 m
+-0.530330 2.651424 l
+0.530330 1.590764 l
+8.530330 9.590764 l
+7.469670 10.651423 l
+h
+f
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  855
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000945 00000 n
+0000000967 00000 n
+0000001140 00000 n
+0000001214 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1273
+%%EOF

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

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

+ 94 - 0
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/ic_Tooltip.imageset/ic_Tooltip 1.pdf

@@ -0,0 +1,94 @@
+%PDF-1.7
+
+1 0 obj
+  << /ExtGState << /E1 << /ca 0.700000 >> >> >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+/E1 gs
+1.000000 0.000000 -0.000000 1.000000 2.000000 2.000000 cm
+1.000000 1.000000 1.000000 scn
+12.000000 6.000000 m
+12.000000 2.723529 9.282353 0.000000 6.000000 0.000000 c
+2.723529 0.000000 0.000000 2.723529 0.000000 6.000000 c
+0.000000 9.282352 2.717647 12.000000 5.994118 12.000000 c
+9.276471 12.000000 12.000000 9.282352 12.000000 6.000000 c
+h
+6.030401 8.094555 m
+5.505007 8.094555 5.084692 8.514874 5.084692 9.047277 c
+5.084692 9.579681 5.505007 10.000000 6.030401 10.000000 c
+6.555795 10.000000 6.969105 9.579681 6.969105 9.047277 c
+6.969105 8.514874 6.555795 8.094555 6.030401 8.094555 c
+h
+7.767650 2.403337 m
+4.832448 2.403337 l
+4.531222 2.403337 4.300049 2.620502 4.300049 2.921730 c
+4.300049 3.201942 4.531222 3.433119 4.832448 3.433119 c
+5.722116 3.433119 l
+5.722116 6.225616 l
+4.951538 6.225616 l
+4.657317 6.225616 4.426143 6.442780 4.426143 6.744009 c
+4.426143 7.024221 4.657317 7.255397 4.951538 7.255397 c
+6.310556 7.255397 l
+6.681835 7.255397 6.877982 6.989195 6.877982 6.596897 c
+6.877982 3.433119 l
+7.767650 3.433119 l
+8.068875 3.433119 8.300049 3.201942 8.300049 2.921730 c
+8.300049 2.620502 8.068875 2.403337 7.767650 2.403337 c
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  1189
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 16.000000 16.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000074 00000 n
+0000001319 00000 n
+0000001342 00000 n
+0000001515 00000 n
+0000001589 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1648
+%%EOF

+ 94 - 0
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/ic_Tooltip.imageset/ic_Tooltip.pdf

@@ -0,0 +1,94 @@
+%PDF-1.7
+
+1 0 obj
+  << /ExtGState << /E1 << /ca 0.700000 >> >> >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+/E1 gs
+1.000000 0.000000 -0.000000 1.000000 2.000000 2.000000 cm
+1.000000 1.000000 1.000000 scn
+12.000000 6.000000 m
+12.000000 2.723529 9.282353 0.000000 6.000000 0.000000 c
+2.723529 0.000000 0.000000 2.723529 0.000000 6.000000 c
+0.000000 9.282352 2.717647 12.000000 5.994118 12.000000 c
+9.276471 12.000000 12.000000 9.282352 12.000000 6.000000 c
+h
+6.030401 8.094555 m
+5.505007 8.094555 5.084692 8.514874 5.084692 9.047277 c
+5.084692 9.579681 5.505007 10.000000 6.030401 10.000000 c
+6.555795 10.000000 6.969105 9.579681 6.969105 9.047277 c
+6.969105 8.514874 6.555795 8.094555 6.030401 8.094555 c
+h
+7.767650 2.403337 m
+4.832448 2.403337 l
+4.531222 2.403337 4.300049 2.620502 4.300049 2.921730 c
+4.300049 3.201942 4.531222 3.433119 4.832448 3.433119 c
+5.722116 3.433119 l
+5.722116 6.225616 l
+4.951538 6.225616 l
+4.657317 6.225616 4.426143 6.442780 4.426143 6.744009 c
+4.426143 7.024221 4.657317 7.255397 4.951538 7.255397 c
+6.310556 7.255397 l
+6.681835 7.255397 6.877982 6.989195 6.877982 6.596897 c
+6.877982 3.433119 l
+7.767650 3.433119 l
+8.068875 3.433119 8.300049 3.201942 8.300049 2.921730 c
+8.300049 2.620502 8.068875 2.403337 7.767650 2.403337 c
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  1189
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 16.000000 16.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000074 00000 n
+0000001319 00000 n
+0000001342 00000 n
+0000001515 00000 n
+0000001589 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1648
+%%EOF

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

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

+ 94 - 0
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/ic_Tooltip_hover.imageset/ic_Tooltip_hover 1.pdf

@@ -0,0 +1,94 @@
+%PDF-1.7
+
+1 0 obj
+  << /ExtGState << /E1 << /ca 0.300000 >> >> >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+/E1 gs
+1.000000 0.000000 -0.000000 1.000000 2.000000 2.000000 cm
+1.000000 1.000000 1.000000 scn
+12.000000 6.000000 m
+12.000000 2.723529 9.282353 0.000000 6.000000 0.000000 c
+2.723529 0.000000 0.000000 2.723529 0.000000 6.000000 c
+0.000000 9.282352 2.717647 12.000000 5.994118 12.000000 c
+9.276471 12.000000 12.000000 9.282352 12.000000 6.000000 c
+h
+6.030401 8.094555 m
+5.505007 8.094555 5.084692 8.514874 5.084692 9.047277 c
+5.084692 9.579681 5.505007 10.000000 6.030401 10.000000 c
+6.555795 10.000000 6.969105 9.579681 6.969105 9.047277 c
+6.969105 8.514874 6.555795 8.094555 6.030401 8.094555 c
+h
+7.767650 2.403337 m
+4.832448 2.403337 l
+4.531222 2.403337 4.300049 2.620502 4.300049 2.921730 c
+4.300049 3.201942 4.531222 3.433119 4.832448 3.433119 c
+5.722116 3.433119 l
+5.722116 6.225616 l
+4.951538 6.225616 l
+4.657317 6.225616 4.426143 6.442780 4.426143 6.744009 c
+4.426143 7.024221 4.657317 7.255397 4.951538 7.255397 c
+6.310556 7.255397 l
+6.681835 7.255397 6.877982 6.989195 6.877982 6.596897 c
+6.877982 3.433119 l
+7.767650 3.433119 l
+8.068875 3.433119 8.300049 3.201942 8.300049 2.921730 c
+8.300049 2.620502 8.068875 2.403337 7.767650 2.403337 c
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  1189
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 16.000000 16.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000074 00000 n
+0000001319 00000 n
+0000001342 00000 n
+0000001515 00000 n
+0000001589 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1648
+%%EOF

+ 94 - 0
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/ic_Tooltip_hover.imageset/ic_Tooltip_hover.pdf

@@ -0,0 +1,94 @@
+%PDF-1.7
+
+1 0 obj
+  << /ExtGState << /E1 << /ca 0.300000 >> >> >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+/E1 gs
+1.000000 0.000000 -0.000000 1.000000 2.000000 2.000000 cm
+1.000000 1.000000 1.000000 scn
+12.000000 6.000000 m
+12.000000 2.723529 9.282353 0.000000 6.000000 0.000000 c
+2.723529 0.000000 0.000000 2.723529 0.000000 6.000000 c
+0.000000 9.282352 2.717647 12.000000 5.994118 12.000000 c
+9.276471 12.000000 12.000000 9.282352 12.000000 6.000000 c
+h
+6.030401 8.094555 m
+5.505007 8.094555 5.084692 8.514874 5.084692 9.047277 c
+5.084692 9.579681 5.505007 10.000000 6.030401 10.000000 c
+6.555795 10.000000 6.969105 9.579681 6.969105 9.047277 c
+6.969105 8.514874 6.555795 8.094555 6.030401 8.094555 c
+h
+7.767650 2.403337 m
+4.832448 2.403337 l
+4.531222 2.403337 4.300049 2.620502 4.300049 2.921730 c
+4.300049 3.201942 4.531222 3.433119 4.832448 3.433119 c
+5.722116 3.433119 l
+5.722116 6.225616 l
+4.951538 6.225616 l
+4.657317 6.225616 4.426143 6.442780 4.426143 6.744009 c
+4.426143 7.024221 4.657317 7.255397 4.951538 7.255397 c
+6.310556 7.255397 l
+6.681835 7.255397 6.877982 6.989195 6.877982 6.596897 c
+6.877982 3.433119 l
+7.767650 3.433119 l
+8.068875 3.433119 8.300049 3.201942 8.300049 2.921730 c
+8.300049 2.620502 8.068875 2.403337 7.767650 2.403337 c
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  1189
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 16.000000 16.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000074 00000 n
+0000001319 00000 n
+0000001342 00000 n
+0000001515 00000 n
+0000001589 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1648
+%%EOF

File diff suppressed because it is too large
+ 219 - 222
PDF Office/PDF Master/Class/Purchase/Appstore/KMPurchaseCompareWindowController.m


+ 7 - 7
PDF Office/PDF Master/Class/Purchase/Appstore/KMPurchaseCompareWindowController.xib

@@ -1,8 +1,8 @@
 <?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>
@@ -85,7 +85,7 @@
                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <button focusRingType="none" allowsExpansionToolTips="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lSB-Bp-t6o" customClass="HyperLinkButton">
+                                <button focusRingType="none" allowsExpansionToolTips="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lSB-Bp-t6o" customClass="HyperLinkButton" customModule="PDF_Master" customModuleProvider="target">
                                     <rect key="frame" x="32" y="20" width="51" height="16"/>
                                     <buttonCell key="cell" type="bevel" title="Restore" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" focusRingType="none" imageScaling="proportionallyDown" inset="2" id="dxE-vy-K4S">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -98,7 +98,7 @@
                                         <action selector="buttonItemClicked_Restore:" target="-2" id="rMA-uA-beq"/>
                                     </connections>
                                 </button>
-                                <button allowsExpansionToolTips="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pHZ-4d-36m" customClass="HyperLinkButton">
+                                <button allowsExpansionToolTips="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pHZ-4d-36m" customClass="HyperLinkButton" customModule="PDF_Master" customModuleProvider="target">
                                     <rect key="frame" x="103" y="20" width="49" height="16"/>
                                     <buttonCell key="cell" type="bevel" title="Privacy" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" imageScaling="proportionallyDown" inset="2" id="xbr-1s-eFJ">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -130,7 +130,7 @@
                                         <constraint firstItem="ezY-Bo-aWV" firstAttribute="centerY" secondItem="vtH-j9-yK4" secondAttribute="centerY" id="vSw-Dt-143"/>
                                     </constraints>
                                 </customView>
-                                <button allowsExpansionToolTips="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="N4T-qV-91e" customClass="HyperLinkButton">
+                                <button allowsExpansionToolTips="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="N4T-qV-91e" customClass="HyperLinkButton" customModule="PDF_Master" customModuleProvider="target">
                                     <rect key="frame" x="172" y="20" width="42" height="16"/>
                                     <buttonCell key="cell" type="bevel" title="Terms" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" imageScaling="proportionallyDown" inset="2" id="KQ8-ZB-77h">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -879,7 +879,7 @@ https://www.pdfreaderpro.com/privacy-policy</mutableString>
                                                 <rect key="frame" x="550" y="0.0" width="170" height="130"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             </customView>
-                                            <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="v8v-YN-QiY" customClass="HyperLinkButton">
+                                            <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="v8v-YN-QiY" customClass="HyperLinkButton" customModule="PDF_Master" customModuleProvider="target">
                                                 <rect key="frame" x="479" y="57" width="131" height="16"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                 <buttonCell key="cell" type="bevel" title="About Subscriptions " bezelStyle="rounded" alignment="left" controlSize="mini" imageScaling="proportionallyDown" inset="2" id="GiH-IO-i19">
@@ -965,7 +965,7 @@ https://www.pdfreaderpro.com/privacy-policy</mutableString>
         </window>
     </objects>
     <resources>
-        <image name="KMImageNameCompareBG" width="970" height="192"/>
+        <image name="KMImageNameCompareBG" width="970" height="120"/>
         <image name="KMImageNamePurchaseBuy" width="16" height="16"/>
     </resources>
 </document>

+ 19 - 0
PDF Office/PDF Master/Class/Purchase/Category/SKInspectPublicTool.swift

@@ -0,0 +1,19 @@
+//
+//  SKInspectPublicTool.swift
+//  PDF Master
+//
+//  Created by Niehaoyu on 2024/1/12.
+//
+
+import Cocoa
+
+class SKInspectPublicTool: NSObject {
+
+    @objc static func currentisLanguageHans() -> Bool {
+        let language = Bundle.main.preferredLocalizations[0]
+        if language == "zh_CN" {
+            return true
+        }
+        return false
+    }
+}

+ 4 - 4
PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseCompareDMGWindowController.m

@@ -129,7 +129,7 @@ static NSString *const KMPurchaseCompareDMGCellIdentifier       = @"KMPurchaseCo
 @interface KMPurchaseCompareDMGWindowController ()
 
 @property (nonatomic, assign) IBOutlet NSTextField *titleLabel;
-@property (assign) IBOutlet KMButton *enterLicenseButton;
+@property (assign) IBOutlet HyperLinkButton *enterLicenseButton;
 
 @property (assign) IBOutlet NSView *freeContendView;
 
@@ -494,9 +494,9 @@ static NSString *const KMPurchaseCompareDMGCellIdentifier       = @"KMPurchaseCo
 - (IBAction)buttonItemClicked_Buy:(id)sender {
 #if VERSION_DMG
     NSURL *url = [NSURL URLWithString:@"https://www.pdfreaderpro.com/store?utm_source=app_dmg&utm_medium=dmg_puw_comparison"];
-//    if([SKInspectPublicTool currentisLanguageHans]) {
-//        url = [NSURL URLWithString:@"https://www.pdfreaderpro.com/zh-cn/store?utm_source=app_dmg&utm_medium=dmg_puw_comparison"];
-//    }
+    if([SKInspectPublicTool currentisLanguageHans]) {
+        url = [NSURL URLWithString:@"https://www.pdfreaderpro.com/zh-cn/store?utm_source=app_dmg&utm_medium=dmg_puw_comparison"];
+    }
     [[NSWorkspace sharedWorkspace] openURL:url];
 //    [[FMTrackEventManager manager] trackEvent:@"PUW" withProperties:@{@"PUW_Btn":@"PUW_Btn_UpgradeBuyNow"}];
 #endif

+ 2 - 2
PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseCompareDMGWindowController.xib

@@ -67,7 +67,7 @@
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="axesIndependently" image="dmg_upgrade_bg" id="9Tm-jc-Gvu"/>
                             </imageView>
-                            <button focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JrW-cc-ivk" customClass="KMButton" customModule="PDF_Master" customModuleProvider="target">
+                            <button focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JrW-cc-ivk" customClass="HyperLinkButton" customModule="PDF_Master" customModuleProvider="target">
                                 <rect key="frame" x="577" y="570" width="87" height="16"/>
                                 <buttonCell key="cell" type="bevel" title="Enter License" bezelStyle="rounded" alignment="left" controlSize="mini" focusRingType="none" imageScaling="proportionallyDown" inset="2" id="5xA-GE-vQ7">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -726,7 +726,7 @@
     </objects>
     <resources>
         <image name="compare_nosupport" width="16" height="16"/>
-        <image name="dmg_upgrade_bg" width="680" height="616"/>
+        <image name="dmg_upgrade_bg" width="684" height="610"/>
         <image name="dmg_upgrade_part_bg" width="300" height="494"/>
         <image name="function_vip" width="20" height="20"/>
         <image name="ic_Tooltip" width="16" height="16"/>

+ 149 - 149
PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseFirstTrialWindowController.swift

@@ -199,9 +199,9 @@ import Cocoa
     }
     
     @objc func updateViewColor () {
-//        self.trialMessageField.textColor = KMAppearance.kmColor_Layout_H0()
-//        self.trialFeaturesField.textColor = KMAppearance.kmColor_Layout_H0()
-//        
+        self.trialMessageField.textColor = KMAppearance.KMColor_Layout_H0()
+        self.trialFeaturesField.textColor = KMAppearance.KMColor_Layout_H0()
+        
         self.features1Field.textColor = NSColor(red: 14.0/255.0, green: 17.0/255.0, blue: 20.0/255.0, alpha: 1)
         self.features2Field.textColor = NSColor(red: 14.0/255.0, green: 17.0/255.0, blue: 20.0/255.0, alpha: 1)
         self.features3Field.textColor = NSColor(red: 14.0/255.0, green: 17.0/255.0, blue: 20.0/255.0, alpha: 1)
@@ -211,22 +211,22 @@ import Cocoa
         
         self.nameTextFieldView.layer?.borderWidth = 1.0
         if (KMAppearance.isDarkMode)(){
-//            self.nameTextFieldView.layer?.borderColor = KMAppearance.kmColor_Layout_W30().cgColor
-//        } else {
-//            self.nameTextFieldView.layer?.borderColor = NSColor(red: 0.0/255.0, green: 85.0/255.0, blue: 251.0/255.0, alpha: 1).cgColor
+            self.nameTextFieldView.layer?.borderColor = KMAppearance.KMColor_Layout_W30().cgColor
+        } else {
+            self.nameTextFieldView.layer?.borderColor = NSColor(red: 0.0/255.0, green: 85.0/255.0, blue: 251.0/255.0, alpha: 1).cgColor
         }
         
         self.emailTextFieldView.layer?.borderWidth = 1.0
         if (KMAppearance.isDarkMode)(){
-//            self.emailTextFieldView.layer?.borderColor = KMAppearance.kmColor_Layout_W30().cgColor
-//        } else {
-//            self.emailTextFieldView.layer?.borderColor = NSColor(red: 0.0/255.0, green: 85.0/255.0, blue: 251.0/255.0, alpha: 1).cgColor
+            self.emailTextFieldView.layer?.borderColor = KMAppearance.KMColor_Layout_W30().cgColor
+        } else {
+            self.emailTextFieldView.layer?.borderColor = NSColor(red: 0.0/255.0, green: 85.0/255.0, blue: 251.0/255.0, alpha: 1).cgColor
         }
         
         if (KMAppearance.isDarkMode)() {
-//            self.nameTextField.textColor = KMAppearance.kmColor_Layout_W0()
-//            self.emailTextField.textColor = KMAppearance.kmColor_Layout_W0()
-//            
+            self.nameTextField.textColor = KMAppearance.KMColor_Layout_W0()
+            self.emailTextField.textColor = KMAppearance.KMColor_Layout_W0()
+
             self.rView.layer?.backgroundColor = NSColor(red: 24.0/255.0, green: 22.0/255.0, blue: 31.0/255.0, alpha: 0.9).cgColor
             
             self.activateTrialNowBtn.title = NSLocalizedString("Free Trial", comment: "")
@@ -234,17 +234,17 @@ import Cocoa
             self.btnBox.layer?.backgroundColor = NSColor(red: 181.0/255.0, green: 177.0/255.0, blue: 239.0/255.0, alpha: 1).cgColor
             self.activateTrialNowBtn.layer?.backgroundColor = NSColor(red: 181.0/255.0, green: 177.0/255.0, blue: 239.0/255.0, alpha: 1).cgColor
             self.activateTrialNowBtn.setTitleColor(NSColor(red: 7.0/255.0, green: 1.0/255.0, blue: 34.0/255.0, alpha: 1))
-//            self.activateTrialNowBtn.mouseMoveCallback = { (mouseEntered) in
-//                if mouseEntered {
-//                    self.activateTrialNowBtn.layer?.backgroundColor = NSColor(red: 255.0/255.0, green: 255.0/255.0, blue: 255.0/255.0, alpha: 1).cgColor
-//                    self.btnBox.fillColor = NSColor(red: 255.0/255.0, green: 255.0/255.0, blue: 255.0/255.0, alpha: 1)
-//                    self.btnBox.layer?.backgroundColor = NSColor(red: 255.0/255.0, green: 255.0/255.0, blue: 255.0/255.0, alpha: 1).cgColor
-//                } else {
-//                    self.btnBox.fillColor = NSColor(red: 181.0/255.0, green: 177.0/255.0, blue: 239.0/255.0, alpha: 1)
-//                    self.btnBox.layer?.backgroundColor = NSColor(red: 181.0/255.0, green: 177.0/255.0, blue: 239.0/255.0, alpha: 1).cgColor
-//                    self.activateTrialNowBtn.layer?.backgroundColor = NSColor(red: 181.0/255.0, green: 177.0/255.0, blue: 239.0/255.0, alpha: 1).cgColor
-//                }
-//            }
+            self.activateTrialNowBtn.mouseMoveCallback = { (mouseEntered) in
+                if mouseEntered {
+                    self.activateTrialNowBtn.layer?.backgroundColor = NSColor(red: 255.0/255.0, green: 255.0/255.0, blue: 255.0/255.0, alpha: 1).cgColor
+                    self.btnBox.fillColor = NSColor(red: 255.0/255.0, green: 255.0/255.0, blue: 255.0/255.0, alpha: 1)
+                    self.btnBox.layer?.backgroundColor = NSColor(red: 255.0/255.0, green: 255.0/255.0, blue: 255.0/255.0, alpha: 1).cgColor
+                } else {
+                    self.btnBox.fillColor = NSColor(red: 181.0/255.0, green: 177.0/255.0, blue: 239.0/255.0, alpha: 1)
+                    self.btnBox.layer?.backgroundColor = NSColor(red: 181.0/255.0, green: 177.0/255.0, blue: 239.0/255.0, alpha: 1).cgColor
+                    self.activateTrialNowBtn.layer?.backgroundColor = NSColor(red: 181.0/255.0, green: 177.0/255.0, blue: 239.0/255.0, alpha: 1).cgColor
+                }
+            }
 //            self.activateTrialNowBtn.setBaseLineOffset(2)
             
             self.titleField.textColor =  NSColor(red: 0.0/255.0, green: 33.0/255.0, blue: 67.0/255.0, alpha: 1)
@@ -254,23 +254,23 @@ import Cocoa
             self.buyNowBtn.title = NSLocalizedString("Buy Now", comment: "")
             
             self.buyNowBtn.setTitleColor(NSColor(red: 181.0/255.0, green: 177.0/255.0, blue: 239.0/255.0, alpha: 1))
-//            self.buyNowBtn.mouseMoveCallback = { (mouseEntered) in
-//                if mouseEntered {
-//                    self.buyNowBtn.setTitleColor(NSColor(red: 255.0/255.0, green: 255.0/255.0, blue: 255.0/255.0, alpha: 1))
-//                } else {
-//                    self.buyNowBtn.setTitleColor(NSColor(red: 181.0/255.0, green: 177.0/255.0, blue: 239.0/255.0, alpha: 1))
-//                }
-//            }
+            self.buyNowBtn.mouseMoveCallback = { (mouseEntered) in
+                if mouseEntered {
+                    self.buyNowBtn.setTitleColor(NSColor(red: 255.0/255.0, green: 255.0/255.0, blue: 255.0/255.0, alpha: 1))
+                } else {
+                    self.buyNowBtn.setTitleColor(NSColor(red: 181.0/255.0, green: 177.0/255.0, blue: 239.0/255.0, alpha: 1))
+                }
+            }
             
             self.enterLicenseBtn.title = NSLocalizedString("Enter License", comment: "")
             self.enterLicenseBtn.setTitleColor(NSColor(red: 181.0/255.0, green: 177.0/255.0, blue: 239.0/255.0, alpha: 1))
-//            self.enterLicenseBtn.mouseMoveCallback = { (mouseEntered) in
-//                if mouseEntered {
-//                    self.enterLicenseBtn.setTitleColor(NSColor(red: 255.0/255.0, green: 255.0/255.0, blue: 255.0/255.0, alpha: 1))
-//                } else {
-//                    self.enterLicenseBtn.setTitleColor(NSColor(red: 181.0/255.0, green: 177.0/255.0, blue: 239.0/255.0, alpha: 1))
-//                }
-//            }
+            self.enterLicenseBtn.mouseMoveCallback = { (mouseEntered) in
+                if mouseEntered {
+                    self.enterLicenseBtn.setTitleColor(NSColor(red: 255.0/255.0, green: 255.0/255.0, blue: 255.0/255.0, alpha: 1))
+                } else {
+                    self.enterLicenseBtn.setTitleColor(NSColor(red: 181.0/255.0, green: 177.0/255.0, blue: 239.0/255.0, alpha: 1))
+                }
+            }
             
             self.nameTextFieldView.layer?.backgroundColor = NSColor(red: 57.0/255.0, green: 58.0/255.0, blue: 70.0/255.0, alpha: 1).cgColor
             self.emailTextFieldView.layer?.backgroundColor = NSColor(red: 57.0/255.0, green: 58.0/255.0, blue: 70.0/255.0, alpha: 1).cgColor
@@ -280,7 +280,7 @@ import Cocoa
             let privacyPolicy : String = NSLocalizedString("Privacy Policy.", comment: "")
             
             let allRange = (stringValue as NSString).range(of: stringValue)
-//            attributedString.addAttributes([NSAttributedString.Key.foregroundColor : KMAppearance.kmColor_Layout_W70()], range: allRange)
+            attributedString.addAttributes([NSAttributedString.Key.foregroundColor : KMAppearance.KMColor_Layout_W70()], range: allRange)
             attributedString.addAttributes([NSAttributedString.Key.font :NSFont(name: "SFProText-Regular", size: 12.0) as Any], range: allRange)
             
             let urlString : String = "https://www.pdfreaderpro.com/privacy-policy"
@@ -290,7 +290,7 @@ import Cocoa
             attributedString.addAttribute(.underlineStyle, value: NSUnderlineStyle.single.rawValue, range: linkRange)
             
             self.bottomTextView.linkTextAttributes = [
-//                NSAttributedString.Key.foregroundColor: KMAppearance.kmColor_Interactive_A0(),
+                NSAttributedString.Key.foregroundColor: KMAppearance.KMColor_Interactive_A0(),
                 NSAttributedString.Key.underlineStyle: NSUnderlineStyle.single.rawValue
             ]
             
@@ -300,8 +300,8 @@ import Cocoa
             self.bottomTextView.sizeToFit()
         } else {
             
-//            self.nameTextField.textColor = KMAppearance.kmColor_Layout_H0()
-//            self.emailTextField.textColor = KMAppearance.kmColor_Layout_H0()
+            self.nameTextField.textColor = KMAppearance.KMColor_Layout_H0()
+            self.emailTextField.textColor = KMAppearance.KMColor_Layout_H0()
             
             self.rView.layer?.backgroundColor = NSColor(red: 248.0/255.0, green: 249.0/255.0, blue: 255.0/255.0, alpha: 1).cgColor
             
@@ -309,40 +309,40 @@ import Cocoa
             self.btnBox.layer?.backgroundColor = NSColor(red: 39.0/255.0, green: 60.0/255.0, blue: 98.0/255.0, alpha: 1).cgColor
             self.activateTrialNowBtn.layer?.backgroundColor = NSColor(red: 39.0/255.0, green: 60.0/255.0, blue: 98.0/255.0, alpha: 1).cgColor
             self.activateTrialNowBtn.setTitleColor(NSColor(red: 255.0/255.0, green: 255.0/255.0, blue: 255.0/255.0, alpha: 1))
-//            self.activateTrialNowBtn.mouseMoveCallback = { (mouseEntered) in
-//                if mouseEntered {
-//                    self.activateTrialNowBtn.layer?.backgroundColor = NSColor(red: 0.0/255.0, green: 207.0/255.0, blue: 133.0/255.0, alpha: 1).cgColor
-//                    self.btnBox.fillColor = NSColor(red: 0.0/255.0, green: 207.0/255.0, blue: 133.0/255.0, alpha: 1)
-//                    self.btnBox.layer?.backgroundColor = NSColor(red: 0.0/255.0, green: 207.0/255.0, blue: 133.0/255.0, alpha: 1).cgColor
-//                } else {
-//                    self.activateTrialNowBtn.layer?.backgroundColor = NSColor(red: 39.0/255.0, green: 60.0/255.0, blue: 98.0/255.0, alpha: 1).cgColor
-//                    self.btnBox.fillColor = NSColor(red: 39.0/255.0, green: 60.0/255.0, blue: 98.0/255.0, alpha: 1)
-//                    self.btnBox.layer?.backgroundColor = NSColor(red: 39.0/255.0, green: 60.0/255.0, blue: 98.0/255.0, alpha: 1).cgColor
-//                }
-//            }
+            self.activateTrialNowBtn.mouseMoveCallback = { (mouseEntered) in
+                if mouseEntered {
+                    self.activateTrialNowBtn.layer?.backgroundColor = NSColor(red: 0.0/255.0, green: 207.0/255.0, blue: 133.0/255.0, alpha: 1).cgColor
+                    self.btnBox.fillColor = NSColor(red: 0.0/255.0, green: 207.0/255.0, blue: 133.0/255.0, alpha: 1)
+                    self.btnBox.layer?.backgroundColor = NSColor(red: 0.0/255.0, green: 207.0/255.0, blue: 133.0/255.0, alpha: 1).cgColor
+                } else {
+                    self.activateTrialNowBtn.layer?.backgroundColor = NSColor(red: 39.0/255.0, green: 60.0/255.0, blue: 98.0/255.0, alpha: 1).cgColor
+                    self.btnBox.fillColor = NSColor(red: 39.0/255.0, green: 60.0/255.0, blue: 98.0/255.0, alpha: 1)
+                    self.btnBox.layer?.backgroundColor = NSColor(red: 39.0/255.0, green: 60.0/255.0, blue: 98.0/255.0, alpha: 1).cgColor
+                }
+            }
             self.titleField.textColor =  NSColor(red: 0.0/255.0, green: 33.0/255.0, blue: 67.0/255.0, alpha: 1)
             
             self.trialTitleField.textColor = NSColor(red: 0.0/255.0, green: 33.0/255.0, blue: 67.0/255.0, alpha: 1)
             
             self.buyNowBtn.title = NSLocalizedString("Buy Now", comment: "")
             self.buyNowBtn.setTitleColor(NSColor(red: 39.0/255.0, green: 60.0/255.0, blue: 98.0/255.0, alpha: 1))
-//            self.buyNowBtn.mouseMoveCallback = { (mouseEntered) in
-//                if mouseEntered {
-//                    self.buyNowBtn.setTitleColor(NSColor(red: 8.0/255.0, green: 124.0/255.0, blue: 255.0/255.0, alpha: 1))
-//                } else {
-//                    self.buyNowBtn.setTitleColor(NSColor(red: 39.0/255.0, green: 60.0/255.0, blue: 98.0/255.0, alpha: 1))
-//                }
-//            }
+            self.buyNowBtn.mouseMoveCallback = { (mouseEntered) in
+                if mouseEntered {
+                    self.buyNowBtn.setTitleColor(NSColor(red: 8.0/255.0, green: 124.0/255.0, blue: 255.0/255.0, alpha: 1))
+                } else {
+                    self.buyNowBtn.setTitleColor(NSColor(red: 39.0/255.0, green: 60.0/255.0, blue: 98.0/255.0, alpha: 1))
+                }
+            }
             
             self.enterLicenseBtn.title = NSLocalizedString("Enter License", comment: "")
             self.enterLicenseBtn.setTitleColor(NSColor(red: 39.0/255.0, green: 60.0/255.0, blue: 98.0/255.0, alpha: 1))
-//            self.enterLicenseBtn.mouseMoveCallback = { (mouseEntered) in
-//                if mouseEntered {
-//                    self.enterLicenseBtn.setTitleColor(NSColor(red: 8.0/255.0, green: 124.0/255.0, blue: 255.0/255.0, alpha: 1))
-//                } else {
-//                    self.enterLicenseBtn.setTitleColor(NSColor(red: 39.0/255.0, green: 60.0/255.0, blue: 98.0/255.0, alpha: 1))
-//                }
-//            }
+            self.enterLicenseBtn.mouseMoveCallback = { (mouseEntered) in
+                if mouseEntered {
+                    self.enterLicenseBtn.setTitleColor(NSColor(red: 8.0/255.0, green: 124.0/255.0, blue: 255.0/255.0, alpha: 1))
+                } else {
+                    self.enterLicenseBtn.setTitleColor(NSColor(red: 39.0/255.0, green: 60.0/255.0, blue: 98.0/255.0, alpha: 1))
+                }
+            }
             
             self.nameTextFieldView.layer?.backgroundColor = NSColor(red: 235.0/255.0, green: 236.0/255.0, blue: 250.0/255.0, alpha: 1).cgColor
             self.emailTextFieldView.layer?.backgroundColor = NSColor(red: 235.0/255.0, green: 236.0/255.0, blue: 250.0/255.0, alpha: 1).cgColor
@@ -358,7 +358,7 @@ import Cocoa
             attributedString.addAttribute(NSAttributedString.Key.underlineStyle, value: NSUnderlineStyle.single.rawValue, range: linkRange)
             
             let allRange = (stringValue as NSString).range(of: stringValue)
-//            attributedString.addAttributes([NSAttributedString.Key.foregroundColor : KMAppearance.kmColor_Layout_H1()], range: allRange)
+            attributedString.addAttributes([NSAttributedString.Key.foregroundColor : KMAppearance.KMColor_Layout_H1()], range: allRange)
             attributedString.addAttributes([NSAttributedString.Key.font :NSFont(name: "SFProText-Regular", size: 12.0) as Any], range: allRange)
             
             // 设置悬停时链接文本颜色
@@ -366,7 +366,7 @@ import Cocoa
 //            attributedString.addAttribute(NSAttributedString.Key(rawValue: "NSMouseInRectAttribute"), value: hoverColor, range: linkRange)
             // 设置TextView的富文本属性
             self.bottomTextView.linkTextAttributes = [
-//                NSAttributedString.Key.foregroundColor: KMAppearance.kmColor_Interactive_A0(),
+                NSAttributedString.Key.foregroundColor: KMAppearance.KMColor_Interactive_A0(),
                 NSAttributedString.Key.underlineStyle: NSUnderlineStyle.single.rawValue
             ]
             
@@ -433,91 +433,91 @@ import Cocoa
     
     //MARK: NSTextFieldDelegate
     func controlTextDidChange(_ obj: Notification) {
-//        if obj.object == nil {
-//            return
-//        }
-//        let textField = obj.object as! NSTextField
-//        if self.emailTextField.isEqual(textField) {
-//            self.emailInvalidLabel.isHidden = true
-//            
-//            self.nameTextFieldView.layer?.borderWidth = 0.0
-//            if (KMAppearance.isDarkMode)(){
-//                self.nameTextFieldView.layer?.borderColor = KMAppearance.kmColor_Layout_W30().cgColor
-//            } else {
-//                self.nameTextFieldView.layer?.borderColor = NSColor(red: 0.0/255.0, green: 85.0/255.0, blue: 251.0/255.0, alpha: 1).cgColor
-//            }
-//            
-//            self.emailTextFieldView.layer?.borderWidth = 1.0
-//            if (KMAppearance.isDarkMode)(){
-//                self.emailTextFieldView.layer?.borderColor = KMAppearance.kmColor_Layout_W30().cgColor
-//            } else {
-//                self.emailTextFieldView.layer?.borderColor = NSColor(red: 0.0/255.0, green: 85.0/255.0, blue: 251.0/255.0, alpha: 1).cgColor
-//            }
-//            
-//        }
-//        
-//        if self.nameTextField.isEqual(textField) {
-//            self.nameInvalidLabel.isHidden = true
-//            
-//            self.nameTextFieldView.layer?.borderWidth = 1.0
-//            if (KMAppearance.isDarkMode)(){
-//                self.nameTextFieldView.layer?.borderColor = KMAppearance.kmColor_Layout_W30().cgColor
-//            } else {
-//                self.nameTextFieldView.layer?.borderColor = NSColor(red: 0.0/255.0, green: 85.0/255.0, blue: 251.0/255.0, alpha: 1).cgColor
-//            }
-//            
-//            self.emailTextFieldView.layer?.borderWidth = 0.0
-//            if (KMAppearance.isDarkMode)(){
-//                self.emailTextFieldView.layer?.borderColor = KMAppearance.kmColor_Layout_W30().cgColor
-//            } else {
-//                self.emailTextFieldView.layer?.borderColor = NSColor(red: 0.0/255.0, green: 85.0/255.0, blue: 251.0/255.0, alpha: 1).cgColor
-//            }
-//        }
+        if obj.object == nil {
+            return
+        }
+        let textField = obj.object as! NSTextField
+        if self.emailTextField.isEqual(textField) {
+            self.emailInvalidLabel.isHidden = true
+            
+            self.nameTextFieldView.layer?.borderWidth = 0.0
+            if (KMAppearance.isDarkMode)(){
+                self.nameTextFieldView.layer?.borderColor = KMAppearance.KMColor_Layout_W30().cgColor
+            } else {
+                self.nameTextFieldView.layer?.borderColor = NSColor(red: 0.0/255.0, green: 85.0/255.0, blue: 251.0/255.0, alpha: 1).cgColor
+            }
+            
+            self.emailTextFieldView.layer?.borderWidth = 1.0
+            if (KMAppearance.isDarkMode)(){
+                self.emailTextFieldView.layer?.borderColor = KMAppearance.KMColor_Layout_W30().cgColor
+            } else {
+                self.emailTextFieldView.layer?.borderColor = NSColor(red: 0.0/255.0, green: 85.0/255.0, blue: 251.0/255.0, alpha: 1).cgColor
+            }
+            
+        }
+        
+        if self.nameTextField.isEqual(textField) {
+            self.nameInvalidLabel.isHidden = true
+            
+            self.nameTextFieldView.layer?.borderWidth = 1.0
+            if (KMAppearance.isDarkMode)(){
+                self.nameTextFieldView.layer?.borderColor = KMAppearance.KMColor_Layout_W30().cgColor
+            } else {
+                self.nameTextFieldView.layer?.borderColor = NSColor(red: 0.0/255.0, green: 85.0/255.0, blue: 251.0/255.0, alpha: 1).cgColor
+            }
+            
+            self.emailTextFieldView.layer?.borderWidth = 0.0
+            if (KMAppearance.isDarkMode)(){
+                self.emailTextFieldView.layer?.borderColor = KMAppearance.KMColor_Layout_W30().cgColor
+            } else {
+                self.emailTextFieldView.layer?.borderColor = NSColor(red: 0.0/255.0, green: 85.0/255.0, blue: 251.0/255.0, alpha: 1).cgColor
+            }
+        }
     }
 
     func controlTextDidEndEditing(_ obj: Notification) {
 
-//        let fied: NSTextField = obj.object as! NSTextField;
-//        if fied.isEqual(self.emailTextField) {
-//            if self.validateEmail(self.emailTextField.stringValue) == true {
-//                self.emailInvalidLabel.isHidden = true
-//            } else {
-//                self.emailInvalidLabel.isHidden = false;
-//            }
-//            self.nameTextFieldView.layer?.borderWidth = 1.0
-//            if (KMAppearance.isDarkMode)(){
-//                self.nameTextFieldView.layer?.borderColor = KMAppearance.kmColor_Layout_W30().cgColor
-//            } else {
-//                self.nameTextFieldView.layer?.borderColor = NSColor(red: 0.0/255.0, green: 85.0/255.0, blue: 251.0/255.0, alpha: 1).cgColor
-//            }
-//            
-//            self.emailTextFieldView.layer?.borderWidth = 0.0
-//            if (KMAppearance.isDarkMode)(){
-//                self.emailTextFieldView.layer?.borderColor = KMAppearance.kmColor_Layout_W30().cgColor
-//            } else {
-//                self.emailTextFieldView.layer?.borderColor = NSColor(red: 0.0/255.0, green: 85.0/255.0, blue: 251.0/255.0, alpha: 1).cgColor
-//            }
-//        }
-//        if fied.isEqual(self.nameTextField) {
-//            if self.nameTextField.stringValue.isEmpty == false {
-//                self.nameInvalidLabel.isHidden = true
-//            } else {
-//                self.nameInvalidLabel.isHidden = false;
-//            }
-//            self.nameTextFieldView.layer?.borderWidth = 0.0
-//            if (KMAppearance.isDarkMode)(){
-//                self.nameTextFieldView.layer?.borderColor = KMAppearance.kmColor_Layout_W30().cgColor
-//            } else {
-//                self.nameTextFieldView.layer?.borderColor = NSColor(red: 0.0/255.0, green: 85.0/255.0, blue: 251.0/255.0, alpha: 1).cgColor
-//            }
-//            
-//            self.emailTextFieldView.layer?.borderWidth = 1.0
-//            if (KMAppearance.isDarkMode)(){
-//                self.emailTextFieldView.layer?.borderColor = KMAppearance.kmColor_Layout_W30().cgColor
-//            } else {
-//                self.emailTextFieldView.layer?.borderColor = NSColor(red: 0.0/255.0, green: 85.0/255.0, blue: 251.0/255.0, alpha: 1).cgColor
-//            }
-//        }
+        let fied: NSTextField = obj.object as! NSTextField;
+        if fied.isEqual(self.emailTextField) {
+            if self.validateEmail(self.emailTextField.stringValue) == true {
+                self.emailInvalidLabel.isHidden = true
+            } else {
+                self.emailInvalidLabel.isHidden = false;
+            }
+            self.nameTextFieldView.layer?.borderWidth = 1.0
+            if (KMAppearance.isDarkMode)(){
+                self.nameTextFieldView.layer?.borderColor = KMAppearance.KMColor_Layout_W30().cgColor
+            } else {
+                self.nameTextFieldView.layer?.borderColor = NSColor(red: 0.0/255.0, green: 85.0/255.0, blue: 251.0/255.0, alpha: 1).cgColor
+            }
+            
+            self.emailTextFieldView.layer?.borderWidth = 0.0
+            if (KMAppearance.isDarkMode)(){
+                self.emailTextFieldView.layer?.borderColor = KMAppearance.KMColor_Layout_W30().cgColor
+            } else {
+                self.emailTextFieldView.layer?.borderColor = NSColor(red: 0.0/255.0, green: 85.0/255.0, blue: 251.0/255.0, alpha: 1).cgColor
+            }
+        }
+        if fied.isEqual(self.nameTextField) {
+            if self.nameTextField.stringValue.isEmpty == false {
+                self.nameInvalidLabel.isHidden = true
+            } else {
+                self.nameInvalidLabel.isHidden = false;
+            }
+            self.nameTextFieldView.layer?.borderWidth = 0.0
+            if (KMAppearance.isDarkMode)(){
+                self.nameTextFieldView.layer?.borderColor = KMAppearance.KMColor_Layout_W30().cgColor
+            } else {
+                self.nameTextFieldView.layer?.borderColor = NSColor(red: 0.0/255.0, green: 85.0/255.0, blue: 251.0/255.0, alpha: 1).cgColor
+            }
+            
+            self.emailTextFieldView.layer?.borderWidth = 1.0
+            if (KMAppearance.isDarkMode)(){
+                self.emailTextFieldView.layer?.borderColor = KMAppearance.KMColor_Layout_W30().cgColor
+            } else {
+                self.emailTextFieldView.layer?.borderColor = NSColor(red: 0.0/255.0, green: 85.0/255.0, blue: 251.0/255.0, alpha: 1).cgColor
+            }
+        }
     }
 
     func textView(_ textView: NSTextView, clickedOnLink link: Any, at charIndex: Int) -> Bool {

+ 19 - 18
PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseFirstTrialWindowController.xib

@@ -1,13 +1,13 @@
 <?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="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMPurchaseFirstTrialWindowController" customModule="PDF_Reader_Pro" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMPurchaseFirstTrialWindowController" customModule="PDF_Master" customModuleProvider="target">
             <connections>
                 <outlet property="activateTrialNowBtn" destination="IGp-1C-Tbg" id="ibx-WR-cwx"/>
                 <outlet property="bottomTextView" destination="6cO-55-aAM" id="hSV-mZ-ink"/>
@@ -68,7 +68,7 @@
                                 </constraints>
                                 <imageCell key="cell" scrollable="YES" lineBreakMode="clipping" refusesFirstResponder="YES" alignment="left" imageScaling="axesIndependently" image="KMPurchaseFirstTrialWindowBG" id="vLJ-x4-096"/>
                             </imageView>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vPM-DF-YB7">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vPM-DF-YB7">
                                 <rect key="frame" x="32" y="425" width="290" height="19"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="286" id="KkX-c7-DJF"/>
@@ -87,7 +87,7 @@
                                 </constraints>
                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="vipSecondDark" id="bgy-p1-n4M"/>
                             </imageView>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Vic-p3-d6D">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Vic-p3-d6D">
                                 <rect key="frame" x="54" y="394" width="121" height="18"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="117" id="Uon-jZ-Cam"/>
@@ -106,7 +106,7 @@
                                 </constraints>
                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="vipSecondDark" id="DBD-27-duG"/>
                             </imageView>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="evf-e2-497">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="evf-e2-497">
                                 <rect key="frame" x="199" y="394" width="149" height="18"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="145" id="fqi-jO-6yB"/>
@@ -125,7 +125,7 @@
                                 </constraints>
                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="vipSecondDark" id="4jc-Wm-QdJ"/>
                             </imageView>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VUp-uq-VmT">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VUp-uq-VmT">
                                 <rect key="frame" x="54" y="362" width="121" height="18"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="117" id="Wc2-LH-mYT"/>
@@ -144,7 +144,7 @@
                                 </constraints>
                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="vipSecondDark" id="Ncm-2l-rhh"/>
                             </imageView>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fjj-kS-gK4">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fjj-kS-gK4">
                                 <rect key="frame" x="199" y="362" width="149" height="18"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="145" id="GgS-IJ-ROe"/>
@@ -163,7 +163,7 @@
                                 </constraints>
                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="vipSecondDark" id="7N9-HB-91k"/>
                             </imageView>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="iKJ-38-4VD">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="iKJ-38-4VD">
                                 <rect key="frame" x="54" y="330" width="121" height="18"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="117" id="b9f-ly-oaY"/>
@@ -182,7 +182,7 @@
                                 </constraints>
                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="vipSecondDark" id="QmU-PX-X3P"/>
                             </imageView>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="SlX-HG-utg">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="SlX-HG-utg">
                                 <rect key="frame" x="199" y="330" width="149" height="18"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="145" id="50W-dR-j6k"/>
@@ -196,7 +196,7 @@
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="XhB-pt-Dsl">
                                 <rect key="frame" x="354" y="32" width="464" height="444"/>
                                 <subviews>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="L9f-Mh-jyz">
+                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="L9f-Mh-jyz">
                                         <rect key="frame" x="30" y="390" width="434" height="30"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="430" id="bT9-Li-dd9"/>
@@ -207,7 +207,7 @@
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
                                     </textField>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="c37-1L-mMl">
+                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="c37-1L-mMl">
                                         <rect key="frame" x="30" y="354" width="404" height="32"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="400" id="S2f-ks-g3Z"/>
@@ -218,7 +218,7 @@
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
                                     </textField>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4jw-yp-Q6R">
+                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4jw-yp-Q6R">
                                         <rect key="frame" x="30" y="315" width="404" height="19"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="400" id="F5v-WJ-Zwh"/>
@@ -260,7 +260,7 @@
                                             <constraint firstItem="kE9-FX-Rvu" firstAttribute="centerY" secondItem="kBD-XH-cfu" secondAttribute="centerY" id="ifc-Mh-TpL"/>
                                         </constraints>
                                     </customView>
-                                    <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zSr-vZ-awC">
+                                    <textField hidden="YES" focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zSr-vZ-awC">
                                         <rect key="frame" x="62" y="248" width="152" height="14"/>
                                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Please enter valid username" id="IEa-EF-cTi">
                                             <font key="font" metaFont="smallSystem"/>
@@ -299,7 +299,7 @@
                                             <constraint firstAttribute="height" constant="32" id="pUk-jO-w7q"/>
                                         </constraints>
                                     </customView>
-                                    <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dAA-oE-Y4K">
+                                    <textField hidden="YES" focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dAA-oE-Y4K">
                                         <rect key="frame" x="62" y="193" width="128" height="14"/>
                                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Please enter valid email" id="l1l-qe-MXw">
                                             <font key="font" metaFont="smallSystem"/>
@@ -313,7 +313,7 @@
                                             <rect key="frame" x="0.0" y="0.0" width="240" height="48"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
-                                                <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="IGp-1C-Tbg" customClass="KMButton">
+                                                <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="IGp-1C-Tbg" customClass="KMButton" customModule="PDF_Master" customModuleProvider="target">
                                                     <rect key="frame" x="0.0" y="0.0" width="240" height="48"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                     <buttonCell key="cell" type="bevel" title="Activate Trial Now" bezelStyle="rounded" imagePosition="overlaps" alignment="center" imageScaling="axesIndependently" inset="2" id="WSR-aq-hXl">
@@ -346,6 +346,7 @@
                                                     <color key="backgroundColor" white="1" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     <size key="minSize" width="404" height="68"/>
                                                     <size key="maxSize" width="404" height="10000000"/>
+                                                    <color key="insertionPointColor" name="textInsertionPointColor" catalog="System" colorSpace="catalog"/>
                                                 </textView>
                                             </subviews>
                                             <color key="backgroundColor" red="1" green="1" blue="1" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
@@ -368,7 +369,7 @@
                                                     <rect key="frame" x="0.0" y="0.0" width="65" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
-                                                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1Lk-iR-tGS" customClass="HyperLinkButton">
+                                                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1Lk-iR-tGS" customClass="HyperLinkButton" customModule="PDF_Master" customModuleProvider="target">
                                                             <rect key="frame" x="0.0" y="0.0" width="65" height="21"/>
                                                             <buttonCell key="cell" type="bevel" title="Buy Now" bezelStyle="rounded" imagePosition="overlaps" alignment="center" imageScaling="axesIndependently" inset="2" id="veD-K9-dCw">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -397,7 +398,7 @@
                                                     <rect key="frame" x="0.0" y="0.0" width="124" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
-                                                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="848-I0-ckh" customClass="HyperLinkButton">
+                                                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="848-I0-ckh" customClass="HyperLinkButton" customModule="PDF_Master" customModuleProvider="target">
                                                             <rect key="frame" x="0.0" y="0.0" width="124" height="21"/>
                                                             <buttonCell key="cell" type="bevel" title="Enter the License" bezelStyle="rounded" imagePosition="overlaps" alignment="center" imageScaling="axesIndependently" inset="2" id="orV-D8-Oxt">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>

+ 25 - 25
PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseLimitWindowController.swift

@@ -92,31 +92,31 @@ class KMPurchaseLimitWindowController: NSWindowController {
         self.purchaseBtn.layer?.masksToBounds = true
         self.purchaseBtn.title = NSLocalizedString("Upgrade", comment: "")
         self.purchaseBtn.setTitleColor(NSColor.white)
-//        self.purchaseBtn.mouseMoveCallback = { mouseEntered in
-//            if mouseEntered {
-//                self.purchaseBtn.layer?.backgroundColor = NSColor.black.withAlphaComponent(0.15).cgColor
-//            } else {
-//                self.purchaseBtn.layer?.backgroundColor = NSColor.clear.cgColor
-//            }
-//        }
+        self.purchaseBtn.mouseMoveCallback = { mouseEntered in
+            if mouseEntered {
+                self.purchaseBtn.layer?.backgroundColor = NSColor.black.withAlphaComponent(0.15).cgColor
+            } else {
+                self.purchaseBtn.layer?.backgroundColor = NSColor.clear.cgColor
+            }
+        }
 //        self.purchaseBtn.setTitleFont(NSFont.UbuntuBoldFontWithSize(16)
         
         self.convertButton.title = NSLocalizedString("Refresh Purchase Status", comment: "")
-//        self.convertButton.mouseMoveCallback = { mouseEntered in
-//            if mouseEntered {
-//                if KMAppearance.isDarkMode() {
-//                    self.convertButton.setTitleColor(NSColor.white)
-//                } else {
-//                    self.convertButton.setTitleColor(NSColor(red: 8/255.0, green: 124/255.0, blue: 255/255.0, alpha: 1))
-//                }
-//            } else {
-//                if KMAppearance.isDarkMode() {
-//                    self.convertButton.setTitleColor(NSColor(red: 181/255.0, green: 179/255.0, blue: 231/255.0, alpha: 1))
-//                } else {
-//                    self.convertButton.setTitleColor(NSColor(red: 0, green: 33/255.0, blue: 67/255.0, alpha: 1))
-//                }
-//            }
-//        }
+        self.convertButton.mouseMoveCallback = { mouseEntered in
+            if mouseEntered {
+                if KMAppearance.isDarkMode() {
+                    self.convertButton.setTitleColor(NSColor.white)
+                } else {
+                    self.convertButton.setTitleColor(NSColor(red: 8/255.0, green: 124/255.0, blue: 255/255.0, alpha: 1))
+                }
+            } else {
+                if KMAppearance.isDarkMode() {
+                    self.convertButton.setTitleColor(NSColor(red: 181/255.0, green: 179/255.0, blue: 231/255.0, alpha: 1))
+                } else {
+                    self.convertButton.setTitleColor(NSColor(red: 0, green: 33/255.0, blue: 67/255.0, alpha: 1))
+                }
+            }
+        }
         
         self.updateViewColor()
     }
@@ -155,9 +155,9 @@ class KMPurchaseLimitWindowController: NSWindowController {
     //MARK: IBAction
     @IBAction func unlimitConvertAction(_ sender: Any) {
         var url = URL(string:"https://www.pdfreaderpro.com/store?product_code=product_2&utm_source=MacAppDmg&utm_campaign=OfficeStoreLink&utm_medium=PdfOfficeStore")!
-//        if SKInspectPublicTool.currentisLanguageHans() == true {
-//            url = URL(string: "https://www.pdfreaderpro.com/zh-cn/store?product_code=product_2&utm_source=MacAppDmg&utm_campaign=OfficeStoreLink&utm_medium=PdfOfficeStore")!
-//        }
+        if SKInspectPublicTool.currentisLanguageHans() == true {
+            url = URL(string: "https://www.pdfreaderpro.com/zh-cn/store?product_code=product_2&utm_source=MacAppDmg&utm_campaign=OfficeStoreLink&utm_medium=PdfOfficeStore")!
+        }
         NSWorkspace.shared.open(url)
 //        FMTrackEventManager.default().trackOnceEvent("PUW", withProperties: ["PUW_Btn":"Btn_PUW_PDFtoOffice_Buy"])
     }

+ 9 - 9
PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMVerificationWindowController.m

@@ -239,9 +239,9 @@ static KMVerificationWindowController *_currentWindowController = nil;
         _alertViewController.buyActionHandle = ^{
 #if VERSION_DMG
             NSURL *url = [NSURL URLWithString:@"https://www.pdfreaderpro.com/store"];
-//            if([SKInspectPublicTool currentisLanguageHans]) {
-//                url = [NSURL URLWithString:@"https://www.pdfreaderpro.com/zh-cn/store"];
-//            }
+            if([SKInspectPublicTool currentisLanguageHans]) {
+                url = [NSURL URLWithString:@"https://www.pdfreaderpro.com/zh-cn/store"];
+            }
             [[NSWorkspace sharedWorkspace] openURL:url];
 #endif
 //            [[FMTrackEventManager manager] trackEvent:@"PUW" withProperties:@{@"PUW_Btn":@"Btn_PUW_BuyNow-Trial"}];
@@ -290,9 +290,9 @@ static KMVerificationWindowController *_currentWindowController = nil;
             } else if (clickIndex == 1) {
                 //了解更多
                 NSURL *url = [NSURL URLWithString:@"https://www.pdfreaderpro.com/store?utm_source=app_dmg&utm_medium=dmg_puw_sec_free_trial"];
-//                if([SKInspectPublicTool currentisLanguageHans]) {
-//                    url = [NSURL URLWithString:@"https://www.pdfreaderpro.com/zh-cn/store?utm_source=app_dmg&utm_medium=dmg_puw_sec_free_trial"];
-//                }
+                if([SKInspectPublicTool currentisLanguageHans]) {
+                    url = [NSURL URLWithString:@"https://www.pdfreaderpro.com/zh-cn/store?utm_source=app_dmg&utm_medium=dmg_puw_sec_free_trial"];
+                }
                 [[NSWorkspace sharedWorkspace] openURL:url];
                 [blockSelf close];
             } else if (clickIndex == 2) {
@@ -599,9 +599,9 @@ static KMVerificationWindowController *_currentWindowController = nil;
 - (void)verificationBuy {
 #if VERSION_DMG
     NSURL *url = [NSURL URLWithString:@"https://www.pdfreaderpro.com/store?utm_source=MacAppDmg&utm_campaign=StoreLink&utm_medium=PdfStore"];
-//    if([SKInspectPublicTool currentisLanguageHans]) {
-//        url = [NSURL URLWithString:@"https://www.pdfreaderpro.com/zh-cn/store?utm_source=MacAppDmg&utm_campaign=StoreLink&utm_medium=PdfStore"];
-//    }
+    if([SKInspectPublicTool currentisLanguageHans]) {
+        url = [NSURL URLWithString:@"https://www.pdfreaderpro.com/zh-cn/store?utm_source=MacAppDmg&utm_campaign=StoreLink&utm_medium=PdfStore"];
+    }
     [[NSWorkspace sharedWorkspace] openURL:url];
 #endif