【内嵌支付】修复“官网 超过100笔 Paddle会隐藏，APP要同步处理成隐藏Paddle”

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

@@ -78,6 +78,7 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
     @IBOutlet weak var cardButton: NSButton!
     @IBOutlet weak var wechatPayButton: NSButton!
     @IBOutlet weak var alipayButton: NSButton!
+    @IBOutlet weak var wechatPayButton2: NSButton!
     
     @IBOutlet weak var payBox: NSBox!
     @IBOutlet weak var payBoxHeight: NSLayoutConstraint!
@@ -354,6 +355,7 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
         paymentMethodLabel.stringValue = NSLocalizedString("Payment Method", comment: "")
         paymentMethodLabel.textColor = NSColor(named: "KMPurchaseTitleColor1")
         paymentMethodLabel.font = NSFont.SFProTextRegularFont(14.0)
+        wechatPayButton2.isHidden = true
 
         payExplainLabel.textColor = NSColor.black
         let localizedString = NSLocalizedString("By submitting this order, I agree to the %@ and %@ for subscription products", comment: "")
@@ -668,6 +670,18 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
             } else {
                 removeButton1.isEnabled = false
             }
+            if pdfCount > 100 {
+                wechatPayButton2.isHidden = false
+                cardButton.isHidden = true
+                wechatPayButton.isHidden = true
+                if _paymentMethod == .paddle {
+                    paymentMethod = .paypal
+                }
+            } else {
+                wechatPayButton2.isHidden = true
+                cardButton.isHidden = false
+                wechatPayButton.isHidden = false
+            }
             amountTextField1.stringValue = String(pdfCount)
             if extendedButton.state == .on {
                 amountTextField2.stringValue = String(pdfCount * 2)
@@ -943,6 +957,7 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
             paypalButton.image = NSImage(named: "EmbeddedPayment19")
             cardButton.image = NSImage(named: "EmbeddedPayment21")
             wechatPayButton.image = NSImage(named: "EmbeddedPayment23")
+            wechatPayButton2.image = NSImage(named: "EmbeddedPayment23")
             alipayButton.image = NSImage(named: "EmbeddedPayment25")
             if _paymentMethod == .paypal {
                 paypalButton.image = NSImage(named: "EmbeddedPayment18")
@@ -957,6 +972,7 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
                 payBoxHeight.constant = 150.0
             } else if _paymentMethod == .wxpay {
                 wechatPayButton.image = NSImage(named: "EmbeddedPayment22")
+                wechatPayButton2.image = NSImage(named: "EmbeddedPayment22")
                 payBox.contentView = weChatPayView
                 weChatBox.fillColor = NSColor(named: "KMPurchaseBoxColor") ?? NSColor.blue
                 payBoxHeight.constant = 92.0
@@ -1222,14 +1238,7 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
     }
     
     private func isNumeric(_ text: String) -> Bool {
-        let pattern = "^[0-9]+$"
-        let regex = try? NSRegularExpression(pattern: pattern)
-        let range = NSRange(location: 0, length: text.utf16.count)
-        if let match = regex?.firstMatch(in: text, options: [], range: range) {
-            return match.range.location != NSNotFound
-        } else {
-            return false
-        }
+        return !text.isEmpty && text.rangeOfCharacter(from: CharacterSet.decimalDigits.inverted) == nil
     }
     
     private func openWebView(_ urlPath: String) -> Void {
@@ -1421,10 +1430,22 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
     func controlTextDidEndEditing(_ obj: Notification) {
         let textField = obj.object as? NSTextField
         if textField == amountTextField1 {
-            if isNumeric(textField!.stringValue) {
+            if !isNumeric(textField!.stringValue) {
                 if textField == amountTextField1 { textField?.stringValue = String(pdfCount) }
             } else {
                 if textField == amountTextField1 { pdfCount = Int(textField!.stringValue) ?? 1 }
+                if pdfCount > 100 {
+                    wechatPayButton2.isHidden = false
+                    cardButton.isHidden = true
+                    wechatPayButton.isHidden = true
+                    if _paymentMethod == .paddle {
+                        paymentMethod = .paypal
+                    }
+                } else {
+                    wechatPayButton2.isHidden = true
+                    cardButton.isHidden = false
+                    wechatPayButton.isHidden = false
+                }
             }
         } else if textField == emailTextField {
             

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

@@ -82,6 +82,7 @@
                 <outlet property="weChatButton" destination="hj1-6S-4j5" id="768-we-YrD"/>
                 <outlet property="weChatPayView" destination="pBx-yN-WZs" id="1hO-qE-DpL"/>
                 <outlet property="wechatPayButton" destination="JIl-bG-lBU" id="QWO-cp-GKX"/>
+                <outlet property="wechatPayButton2" destination="JbC-bo-Pmh" id="d64-VO-kHD"/>
                 <outlet property="window" destination="F0z-JX-Cv5" id="gIp-Ho-8D9"/>
                 <outlet property="yourOrderLabel" destination="lJA-9J-Qba" id="auS-qa-bMM"/>
             </connections>
@@ -91,10 +92,12 @@
         <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="196" y="240" width="970" height="618"/>
+            <rect key="contentRect" x="196" y="240" width="970" height="612"/>
             <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+            <value key="minSize" type="size" width="970" height="612"/>
+            <value key="maxSize" type="size" width="970" height="612"/>
             <view key="contentView" id="se5-gp-TjO">
-                <rect key="frame" x="0.0" y="0.0" width="970" height="618"/>
+                <rect key="frame" x="0.0" y="0.0" width="970" height="612"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="l3P-ZG-GJY">
@@ -188,16 +191,16 @@
                         <rect key="frame" x="0.0" y="85" width="970" height="5"/>
                     </box>
                     <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="NWI-HO-4Jh">
-                        <rect key="frame" x="0.0" y="88" width="970" height="530"/>
+                        <rect key="frame" x="0.0" y="88" width="970" height="524"/>
                         <view key="contentView" id="yHo-bZ-A7K">
-                            <rect key="frame" x="0.0" y="0.0" width="970" height="530"/>
+                            <rect key="frame" x="0.0" y="0.0" width="970" height="524"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="vmh-tU-E0c">
-                                    <rect key="frame" x="611" y="16" width="335" height="498"/>
+                                    <rect key="frame" x="611" y="16" width="335" height="492"/>
                                     <subviews>
                                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="Dnb-jj-AQO">
-                                            <rect key="frame" x="0.0" y="478" width="335" height="20"/>
+                                            <rect key="frame" x="0.0" y="472" width="335" height="20"/>
                                             <subviews>
                                                 <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Plj-ou-oBV">
                                                     <rect key="frame" x="-2" y="2" width="37" height="16"/>
@@ -215,7 +218,7 @@
                                             </constraints>
                                         </customView>
                                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="ih0-ST-chg">
-                                            <rect key="frame" x="0.0" y="418" width="335" height="52"/>
+                                            <rect key="frame" x="0.0" y="412" width="335" height="52"/>
                                             <subviews>
                                                 <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="e5R-5a-vfZ">
                                                     <rect key="frame" x="-2" y="32" width="37" height="20"/>
@@ -272,7 +275,7 @@
                                             </constraints>
                                         </customView>
                                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="O9F-uH-62i">
-                                            <rect key="frame" x="0.0" y="342" width="335" height="20"/>
+                                            <rect key="frame" x="0.0" y="336" width="335" height="20"/>
                                             <subviews>
                                                 <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="32Y-Vg-5EG">
                                                     <rect key="frame" x="-2" y="2" width="107" height="16"/>
@@ -290,7 +293,7 @@
                                             </constraints>
                                         </customView>
                                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="NiL-sj-flK">
-                                            <rect key="frame" x="0.0" y="300" width="335" height="30"/>
+                                            <rect key="frame" x="0.0" y="294" width="335" height="30"/>
                                             <subviews>
                                                 <button translatesAutoresizingMaskIntoConstraints="NO" id="aFQ-fz-Dn4">
                                                     <rect key="frame" x="0.0" y="0.0" width="78" height="30"/>
@@ -332,6 +335,16 @@
                                                         <action selector="payButtonAction:" target="-2" id="Cde-Yg-tRW"/>
                                                     </connections>
                                                 </button>
+                                                <button tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="JbC-bo-Pmh">
+                                                    <rect key="frame" x="129" y="0.0" width="77" height="30"/>
+                                                    <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" image="EmbeddedPayment22" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="rnk-BW-E5i">
+                                                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                        <font key="font" metaFont="system"/>
+                                                    </buttonCell>
+                                                    <connections>
+                                                        <action selector="payButtonAction:" target="-2" id="mja-Et-dwv"/>
+                                                    </connections>
+                                                </button>
                                             </subviews>
                                             <constraints>
                                                 <constraint firstItem="aFQ-fz-Dn4" firstAttribute="leading" secondItem="NiL-sj-flK" secondAttribute="leading" id="1SA-ZG-F4l"/>
@@ -346,18 +359,22 @@
                                                 <constraint firstAttribute="bottom" secondItem="aFQ-fz-Dn4" secondAttribute="bottom" id="F36-Pi-gFe"/>
                                                 <constraint firstAttribute="bottom" secondItem="6fV-kv-Kqb" secondAttribute="bottom" id="OzU-we-1MW"/>
                                                 <constraint firstItem="JIl-bG-lBU" firstAttribute="leading" secondItem="6fV-kv-Kqb" secondAttribute="trailing" constant="8" id="PI8-H5-K7j"/>
+                                                <constraint firstItem="JbC-bo-Pmh" firstAttribute="centerY" secondItem="NiL-sj-flK" secondAttribute="centerY" id="Rlb-2K-18L"/>
                                                 <constraint firstItem="6fV-kv-Kqb" firstAttribute="leading" secondItem="aFQ-fz-Dn4" secondAttribute="trailing" constant="8" id="Rqt-FS-5jt"/>
                                                 <constraint firstAttribute="trailing" secondItem="HXS-6q-4NR" secondAttribute="trailing" id="ZMD-wn-srM"/>
+                                                <constraint firstItem="JbC-bo-Pmh" firstAttribute="centerX" secondItem="NiL-sj-flK" secondAttribute="centerX" id="bee-zY-usk"/>
+                                                <constraint firstItem="JbC-bo-Pmh" firstAttribute="width" secondItem="aFQ-fz-Dn4" secondAttribute="width" id="bvg-hk-Os2"/>
                                                 <constraint firstItem="JIl-bG-lBU" firstAttribute="height" secondItem="aFQ-fz-Dn4" secondAttribute="height" id="dNJ-BF-cFT"/>
                                                 <constraint firstItem="aFQ-fz-Dn4" firstAttribute="top" secondItem="NiL-sj-flK" secondAttribute="top" id="dgy-tC-gFg"/>
                                                 <constraint firstItem="6fV-kv-Kqb" firstAttribute="width" secondItem="aFQ-fz-Dn4" secondAttribute="width" id="dx3-VY-Llj"/>
                                                 <constraint firstItem="HXS-6q-4NR" firstAttribute="leading" secondItem="JIl-bG-lBU" secondAttribute="trailing" constant="8" id="kAe-OC-bwh"/>
                                                 <constraint firstAttribute="bottom" secondItem="JIl-bG-lBU" secondAttribute="bottom" id="ma9-4C-Qo4"/>
                                                 <constraint firstItem="HXS-6q-4NR" firstAttribute="width" secondItem="aFQ-fz-Dn4" secondAttribute="width" id="nPt-xT-9oG"/>
+                                                <constraint firstItem="JbC-bo-Pmh" firstAttribute="height" secondItem="aFQ-fz-Dn4" secondAttribute="height" id="t6q-xl-FQ9"/>
                                             </constraints>
                                         </customView>
                                         <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="2Fv-aT-yF4">
-                                            <rect key="frame" x="0.0" y="254" width="335" height="40"/>
+                                            <rect key="frame" x="0.0" y="248" width="335" height="40"/>
                                             <view key="contentView" id="hfC-RP-EPJ">
                                                 <rect key="frame" x="0.0" y="0.0" width="335" height="40"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -367,7 +384,7 @@
                                             </constraints>
                                         </box>
                                         <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Bf9-95-LZa">
-                                            <rect key="frame" x="-2" y="232" width="339" height="16"/>
+                                            <rect key="frame" x="-2" y="226" width="339" height="16"/>
                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="Label" id="xst-Rc-74s">
                                                 <font key="font" usesAppearanceFont="YES"/>
                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -375,7 +392,7 @@
                                             </textFieldCell>
                                         </textField>
                                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="W7H-2A-riS">
-                                            <rect key="frame" x="0.0" y="382" width="335" height="32"/>
+                                            <rect key="frame" x="0.0" y="376" width="335" height="32"/>
                                             <subviews>
                                                 <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GJE-gl-04P">
                                                     <rect key="frame" x="-2" y="0.0" width="339" height="32"/>
@@ -420,13 +437,13 @@
                                     </constraints>
                                 </customView>
                                 <box horizontalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="h4u-aQ-6IT">
-                                    <rect key="frame" x="584" y="16" width="5" height="498"/>
+                                    <rect key="frame" x="584" y="16" width="5" height="492"/>
                                 </box>
                                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="tRc-PM-BHR">
-                                    <rect key="frame" x="24" y="16" width="538" height="498"/>
+                                    <rect key="frame" x="24" y="16" width="538" height="492"/>
                                     <subviews>
                                         <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lJA-9J-Qba">
-                                            <rect key="frame" x="-2" y="482" width="542" height="16"/>
+                                            <rect key="frame" x="-2" y="476" width="542" height="16"/>
                                             <textFieldCell key="cell" lineBreakMode="clipping" title="Your Order" id="Ozs-wZ-Jdr">
                                                 <font key="font" usesAppearanceFont="YES"/>
                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -434,10 +451,10 @@
                                             </textFieldCell>
                                         </textField>
                                         <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="aGq-d0-5pa">
-                                            <rect key="frame" x="0.0" y="467" width="538" height="5"/>
+                                            <rect key="frame" x="0.0" y="461" width="538" height="5"/>
                                         </box>
                                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="M6b-Qf-5FA">
-                                            <rect key="frame" x="0.0" y="397" width="538" height="48"/>
+                                            <rect key="frame" x="0.0" y="391" width="538" height="48"/>
                                             <subviews>
                                                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="nrp-eO-h7F">
                                                     <rect key="frame" x="0.0" y="0.0" width="264" height="48"/>
@@ -575,7 +592,7 @@
                                             </constraints>
                                         </customView>
                                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="A4x-fh-Pac">
-                                            <rect key="frame" x="0.0" y="327" width="538" height="50"/>
+                                            <rect key="frame" x="0.0" y="321" width="538" height="50"/>
                                             <subviews>
                                                 <button translatesAutoresizingMaskIntoConstraints="NO" id="lDe-WV-H1b">
                                                     <rect key="frame" x="4" y="22" width="24" height="24"/>
@@ -726,7 +743,7 @@
                                             </constraints>
                                         </customView>
                                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="DDi-AB-k2w">
-                                            <rect key="frame" x="0.0" y="265" width="538" height="50"/>
+                                            <rect key="frame" x="0.0" y="259" width="538" height="50"/>
                                             <subviews>
                                                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="uWl-6n-x7Q">
                                                     <rect key="frame" x="464" y="4" width="70" height="42"/>