Merge branch 'develop_PDFReaderProV4.6.0' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderProV4.6.0

PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseCompareDMGWindowController.m

@@ -506,12 +506,16 @@ static NSString *const KMPurchaseCompareDMGCellIdentifier       = @"KMPurchaseCo
     NSString *originalText = @"";
     NSString *discountText = @"";
 #if VERSION_DMG
+    NSString *abbreviation = @"$";
+    if ([@"CNY" isEqualToString:NSLocalizedString(@"USD", nil)])  {
+        abbreviation = @"￥";
+    }
     if ([self.buySwitch state]) {
-        originalText = [NSString stringWithFormat:@"$%@", [[KMDMGProductsManager shareInstance] getPrice:@"com.brother.pdfreaderpro.mac.product_3"]];
-        discountText = [NSString stringWithFormat:@"$%@", [[KMDMGProductsManager shareInstance] getActivityPrice:@"com.brother.pdfreaderpro.mac.product_3"]];
+        originalText = [NSString stringWithFormat:@"%@%@", abbreviation, [[KMDMGProductsManager shareInstance] getPrice:@"com.brother.pdfreaderpro.mac.product_3"]];
+        discountText = [NSString stringWithFormat:@"%@%@", abbreviation, [[KMDMGProductsManager shareInstance] getActivityPrice:@"com.brother.pdfreaderpro.mac.product_3"]];
     } else {
-        originalText = [NSString stringWithFormat:@"$%@", [[KMDMGProductsManager shareInstance] getPrice:@"com.brother.pdfreaderpro.mac.product_1"]];
-        discountText = [NSString stringWithFormat:@"$%@", [[KMDMGProductsManager shareInstance] getActivityPrice:@"com.brother.pdfreaderpro.mac.product_1"]];
+        originalText = [NSString stringWithFormat:@"%@%@", abbreviation, [[KMDMGProductsManager shareInstance] getPrice:@"com.brother.pdfreaderpro.mac.product_1"]];
+        discountText = [NSString stringWithFormat:@"%@%@", abbreviation, [[KMDMGProductsManager shareInstance] getActivityPrice:@"com.brother.pdfreaderpro.mac.product_1"]];
     }
 #endif
     NSMutableAttributedString *attributedText = [[NSMutableAttributedString alloc] initWithString:originalText];

PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseEmbeddedWindowController.swift

@@ -1469,6 +1469,7 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
         DispatchQueue.main.async { [weak self] in
             guard let self = self else { return }
 //            let wc = KMEmbeddedPaymentPopWC.init(windowNibName: "KMEmbeddedPaymentPopWC")
+            pollCount = 0
             self.embeddedPaymentPopWC = KMEmbeddedPaymentPopWC.currentFirstTrialWC(urlPath)
             if self.paymentMethod == .paddle {
                 self.embeddedPaymentPopWC?.isPaddle = true
@@ -1624,11 +1625,6 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
         guard pollCount < maxPolls else {
             timer?.invalidate()
             timer = nil
-            DispatchQueue.main.async { [weak self] in
-                guard let self = self else { return }
-                self.embeddedPaymentPopWC?.close()
-                self.embeddedPaymentPopWC = nil
-            }
             return
         }
         

PDF Office/PDF Master/Third Pard Library/Sparkle.framework/Versions/A/Modules/module.modulemap

@@ -1,6 +1,6 @@
 framework module Sparkle {
   umbrella header "Sparkle.h"
-
   export *
+
   module * { export * }
 }

PDF Office/PDF Master/Third Pard Library/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>21A559</string>
+	<string>23A339</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -29,23 +29,23 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>13C100</string>
+	<string></string>
 	<key>DTPlatformName</key>
 	<string>macosx</string>
 	<key>DTPlatformVersion</key>
-	<string>12.1</string>
+	<string>14.2</string>
 	<key>DTSDKBuild</key>
-	<string>21C46</string>
+	<string>23C53</string>
 	<key>DTSDKName</key>
-	<string>macosx12.1</string>
+	<string>macosx14.2</string>
 	<key>DTXcode</key>
-	<string>1321</string>
+	<string>1520</string>
 	<key>DTXcodeBuild</key>
-	<string>13C100</string>
+	<string>15C500b</string>
 	<key>LSBackgroundOnly</key>
 	<string>1</string>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.12</string>
+	<string>11.0</string>
 	<key>LSUIElement</key>
 	<string>1</string>
 	<key>NSMainNibFile</key>

PDF Office/PDF Master/Third Pard Library/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/_CodeSignature/CodeResources

@@ -8,13 +8,9 @@
 		<data>
 		4McwRDEss5BzWwUMG2Xf93+ze08=
 		</data>
-		<key>Resources/SUStatus.nib/keyedobjects-101300.nib</key>
+		<key>Resources/SUStatus.nib</key>
 		<data>
-		dEh8NH2apS2rLwMhO67dGhz55f0=
-		</data>
-		<key>Resources/SUStatus.nib/keyedobjects.nib</key>
-		<data>
-		cs/xRKcjkSXig62pMnBXQr+5ZJI=
+		92PJX7uNJ0IH5PzlDLTdxh6R37k=
 		</data>
 		<key>Resources/ar.lproj/Sparkle.strings</key>
 		<dict>
@@ -302,10 +298,10 @@
 		<dict>
 			<key>cdhash</key>
 			<data>
-			m0QASuLkzYAxGqGH1FjKWwExeIg=
+			Dkm+fHnhAyp1BKh6hzucYqqssLg=
 			</data>
 			<key>requirement</key>
-			<string>identifier fileop and anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = "4GGQPGRTSV"</string>
+			<string>cdhash H"0e49be7c79e1032a7504a87a873b9c62aaacb0b8" or cdhash H"b43f2704aabe355393675602c2463148a1ae1941"</string>
 		</dict>
 		<key>Resources/AppIcon.icns</key>
 		<dict>
@@ -314,18 +310,11 @@
 			nq7j0ugQwyNbJn/7zGFwxIR0njwU3i7hAYKEyZhvUfE=
 			</data>
 		</dict>
-		<key>Resources/SUStatus.nib/keyedobjects-101300.nib</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			l4LhDo1XAZkQiBHJUawTw1bbNrW7+BhjTcYnSofI1SU=
-			</data>
-		</dict>
-		<key>Resources/SUStatus.nib/keyedobjects.nib</key>
+		<key>Resources/SUStatus.nib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			uq+XDANTVdbcTrozPJi88faX+bEtVJXqw11EZP3/aPI=
+			lve9XxWKepvHahbh0fQXcsmG2UHLBNhdVSnHPuywFi0=
 			</data>
 		</dict>
 		<key>Resources/ar.lproj/Sparkle.strings</key>

PDF Office/PDF Master/Third Pard Library/Sparkle.framework/Versions/A/Resources/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>21A559</string>
+	<string>23A339</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -29,20 +29,20 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>13C100</string>
+	<string></string>
 	<key>DTPlatformName</key>
 	<string>macosx</string>
 	<key>DTPlatformVersion</key>
-	<string>12.1</string>
+	<string>14.2</string>
 	<key>DTSDKBuild</key>
-	<string>21C46</string>
+	<string>23C53</string>
 	<key>DTSDKName</key>
-	<string>macosx12.1</string>
+	<string>macosx14.2</string>
 	<key>DTXcode</key>
-	<string>1321</string>
+	<string>1520</string>
 	<key>DTXcodeBuild</key>
-	<string>13C100</string>
+	<string>15C500b</string>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.12</string>
+	<string>11.0</string>
 </dict>
 </plist>