Browse Source

【会员系统】比较表样式调整

wanjun 3 months ago
parent
commit
6610c1b664

+ 22 - 0
PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Image/MembershipBenefitsImage.imageset/Contents.json

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

BIN
PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Image/MembershipBenefitsImage.imageset/Upgrade 1.pdf


BIN
PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Image/MembershipBenefitsImage.imageset/Upgrade.pdf


+ 9 - 0
PDF Office/PDF Master/MemberCenter/WindowsController/KMProductCompareWC.swift

@@ -1620,6 +1620,13 @@ extension KMProductCompareWC: NSTableViewDelegate, NSTableViewDataSource {
         if let stringObject = object as? String {
             if let cellView = tableView.makeView(withIdentifier: NSUserInterfaceItemIdentifier("KMProductCompareTableHeaderCell"), owner: self) as? KMProductCompareTableHeaderCell {
                 cellView.textField?.stringValue = NSLocalizedString(stringObject, comment: "")
+                if row == 0 {
+                    cellView.leftImageView?.isHidden = false
+                    cellView.textField?.textColor = NSColor(red: 109/255.0, green: 77/255.0, blue: 9/255.0, alpha: 1.0)
+                } else {
+                    cellView.leftImageView?.isHidden = true
+                }
+                cellView.textfieldLeft.constant = cellView.leftImageView!.isHidden ? 32.0 : 62.0
                 if model.state == .dmg_Base {
                     cellView.selectBoxLeft.constant = 352.0 + 149.5 + 149.5
                     cellView.selectBoxWidth.constant = 149.5
@@ -1910,6 +1917,8 @@ class KMProductCompareTableCell: NSTableCellView {
 
 class KMProductCompareTableHeaderCell: NSTableCellView {
     @IBOutlet weak var contentView: NSView?
+    @IBOutlet weak var leftImageView: NSImageView?
+    @IBOutlet weak var textfieldLeft: NSLayoutConstraint!
     @IBOutlet weak var selectBoxLeft: NSLayoutConstraint!
     @IBOutlet weak var selectBoxWidth: NSLayoutConstraint!
 

+ 15 - 2
PDF Office/PDF Master/MemberCenter/WindowsController/KMProductCompareWC.xib

@@ -487,7 +487,7 @@ https://www.pdfreaderpro.com/privacy-policy</mutableString>
                                                             <rect key="frame" x="0.0" y="0.0" width="970" height="32"/>
                                                             <subviews>
                                                                 <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="vBF-W5-0Vf">
-                                                                    <rect key="frame" x="30" y="8" width="105" height="17"/>
+                                                                    <rect key="frame" x="60" y="8" width="105" height="17"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="qYu-hm-Ci1">
                                                                         <font key="font" metaFont="systemMedium" size="14"/>
                                                                         <color key="textColor" red="0.0" green="0.53333333329999999" blue="1" alpha="1" colorSpace="calibratedRGB"/>
@@ -505,12 +505,22 @@ https://www.pdfreaderpro.com/privacy-policy</mutableString>
                                                                     </constraints>
                                                                     <color key="borderColor" red="1" green="0.36862745099999999" blue="0.17254901959999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                 </box>
+                                                                <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="NdO-Qv-LL5">
+                                                                    <rect key="frame" x="32" y="6" width="20" height="20"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="width" constant="20" id="cMW-3v-tkE"/>
+                                                                        <constraint firstAttribute="height" constant="20" id="iPV-tF-Fg5"/>
+                                                                    </constraints>
+                                                                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="MembershipBenefitsImage" id="pHg-95-o0Q"/>
+                                                                </imageView>
                                                             </subviews>
                                                             <constraints>
-                                                                <constraint firstItem="vBF-W5-0Vf" firstAttribute="leading" secondItem="yZM-JH-Pej" secondAttribute="leading" constant="32" id="OPT-Fj-HPB"/>
+                                                                <constraint firstItem="vBF-W5-0Vf" firstAttribute="leading" secondItem="yZM-JH-Pej" secondAttribute="leading" constant="62" id="OPT-Fj-HPB"/>
                                                                 <constraint firstItem="vBF-W5-0Vf" firstAttribute="centerY" secondItem="yZM-JH-Pej" secondAttribute="centerY" id="RKg-I4-TaY"/>
+                                                                <constraint firstItem="vBF-W5-0Vf" firstAttribute="centerY" secondItem="NdO-Qv-LL5" secondAttribute="centerY" id="VA4-h4-X33"/>
                                                                 <constraint firstItem="Jgf-Tg-8uu" firstAttribute="top" secondItem="yZM-JH-Pej" secondAttribute="top" constant="-5" id="dC9-MK-Ul2"/>
                                                                 <constraint firstItem="Jgf-Tg-8uu" firstAttribute="leading" secondItem="yZM-JH-Pej" secondAttribute="leading" constant="506" id="hb6-eN-hKH"/>
+                                                                <constraint firstItem="vBF-W5-0Vf" firstAttribute="leading" secondItem="NdO-Qv-LL5" secondAttribute="trailing" constant="10" id="reW-lV-dSv"/>
                                                                 <constraint firstAttribute="bottom" secondItem="Jgf-Tg-8uu" secondAttribute="bottom" constant="-5" id="v4C-MQ-NmI"/>
                                                             </constraints>
                                                         </customView>
@@ -523,9 +533,11 @@ https://www.pdfreaderpro.com/privacy-policy</mutableString>
                                                     </constraints>
                                                     <connections>
                                                         <outlet property="contentView" destination="yZM-JH-Pej" id="KUw-10-Su5"/>
+                                                        <outlet property="leftImageView" destination="NdO-Qv-LL5" id="2cm-YC-uAf"/>
                                                         <outlet property="selectBoxLeft" destination="hb6-eN-hKH" id="Nfp-Sp-1OT"/>
                                                         <outlet property="selectBoxWidth" destination="dsM-5m-jQx" id="Bz4-c3-uTy"/>
                                                         <outlet property="textField" destination="vBF-W5-0Vf" id="PN9-OG-TCn"/>
+                                                        <outlet property="textfieldLeft" destination="OPT-Fj-HPB" id="9mU-aS-Fg6"/>
                                                     </connections>
                                                 </tableCellView>
                                                 <tableCellView identifier="KMProductCompareTableCell" id="ax6-Po-8DY" customClass="KMProductCompareTableCell" customModule="PDF_Reader_Pro" customModuleProvider="target">
@@ -2152,6 +2164,7 @@ https://www.pdfreaderpro.com/privacy-policy</mutableString>
         <image name="KMImageNameCompareBG" width="970" height="192"/>
         <image name="KMImageNamePurchaseBuy" width="16" height="16"/>
         <image name="MacOSPlatformImage" width="20" height="20"/>
+        <image name="MembershipBenefitsImage" width="20" height="20"/>
         <image name="WindowsPlatformImage" width="20" height="20"/>
         <image name="giftYearAIImage" width="122" height="26"/>
         <image name="iOSPlatformImage" width="20" height="20"/>