【会员系统】会员系统UI优化

PDF Office/PDF Master/MemberCenter/Assets/en.lproj/MemberCenterLocalizable.strings

@@ -41,6 +41,8 @@
 "OK" = "OK";
 "Personal Account" = "Personal Account";
 "Membership Benefits" = "Membership Benefits";
+"devices" = "devices";
+"device" = "device";
 "%d devices" = "%d devices";
 "All-platform Available" = "All-platform Available";
 "Upgrade Now" = "Upgrade Now";

PDF Office/PDF Master/MemberCenter/Assets/zh-Hans.lproj/MemberCenterLocalizable.strings

@@ -40,6 +40,8 @@
 "OK" = "确认";
 "Personal Account" = "个人账号";
 "Membership Benefits" = "会员权益 ";
+"devices" = "设备";
+"device" = "设备";
 "%d devices" = "%d 设备";
 "All-platform Available" = "全平台通用";
 "Upgrade Now" = "立即升级";

PDF Office/PDF Master/MemberCenter/Assets/zh-Hant.lproj/MemberCenterLocalizable.strings

@@ -40,6 +40,8 @@
 "Personal Account" = "個人帳戶";
 "Membership Benefits" = "會員權益";
 "%d devices" = "%d 设备";
+"device" = "设备";
+"devices" = "设备";
 "All-platform Available" = "全平台通用";
 "Upgrade Now" = "立即升级";
 "Account Center" = "使用者中心";

PDF Office/PDF Master/MemberCenter/ViewController/KMUserInfoViewController.swift

@@ -45,6 +45,8 @@ class KMUserInfoViewController: NSViewController {
     @IBOutlet weak var icon10ImageView: NSImageView!
     @IBOutlet weak var number3Label: NSTextField!
     @IBOutlet weak var number4Label: NSTextField!
+    @IBOutlet weak var number4_1Label: NSTextField!
+
     @IBOutlet weak var number5Label: NSTextField!
     
     @IBOutlet weak var buyBox: NSBox!
@@ -127,10 +129,12 @@ class KMUserInfoViewController: NSViewController {
             closeAccountLabel.stringValue = NSLocalizedString("Remove Account", tableName: "MemberCenterLocalizable", comment: "")
         }
         if KMMemberInfo.shared.vip_maxDeviceNum == 1 {
-            number4Label.stringValue = String.localizedStringWithFormat(NSLocalizedString("%d devices", tableName: "MemberCenterLocalizable", comment: ""), KMMemberInfo.shared.vip_maxDeviceNum)
+            number4Label.stringValue = NSLocalizedString("device", tableName: "MemberCenterLocalizable", comment: "")
         } else {
-            number4Label.stringValue = String.localizedStringWithFormat(NSLocalizedString("%d devices", tableName: "MemberCenterLocalizable", comment: ""), KMMemberInfo.shared.vip_maxDeviceNum)
+            number4Label.stringValue = NSLocalizedString("devices", tableName: "MemberCenterLocalizable", comment: "")
         }
+        number4_1Label.stringValue = String(KMMemberInfo.shared.vip_maxDeviceNum)
+
         if KMMemberInfo.shared.vip_levels == "2" {
             number1Label.stringValue = NSLocalizedString("", tableName: "MemberCenterLocalizable", comment: "")
             number2Label.stringValue = NSLocalizedString("Standard Version", tableName: "MemberCenterLocalizable", comment: "")
@@ -241,6 +245,7 @@ class KMUserInfoViewController: NSViewController {
             number2Label.textColor = NSColor(hex:"42464D")
             number3Label.textColor =  NSColor(hex:"42464D")
             number4Label.textColor = NSColor(hex: "42464D")
+            number4_1Label.textColor = NSColor(hex: "42464D")
             number5Label.textColor = NSColor(hex: "42464D")
 
             if KMMemberInfo.shared.userScenarioType == .lite_type1 ||
@@ -271,6 +276,7 @@ class KMUserInfoViewController: NSViewController {
             number2Label.textColor = NSColor(hex: "FCFDFF")
             number3Label.textColor =  NSColor(hex:"FCFDFF")
             number4Label.textColor = NSColor(hex: "FCFDFF")
+            number4_1Label.textColor = NSColor(hex: "FCFDFF")
             number5Label.textColor = NSColor(hex: "FCFDFF")
 
             lockedImageView.image = NSImage(named: "UpgradeImage2")
@@ -293,6 +299,7 @@ class KMUserInfoViewController: NSViewController {
             number2Label.textColor = NSColor(hex:"42464D")
             number3Label.textColor =  NSColor(hex:"42464D")
             number4Label.textColor = NSColor(hex: "42464D")
+            number4_1Label.textColor = NSColor(hex: "42464D")
             number5Label.textColor = NSColor(hex: "42464D")
             
             lockedImageView.image = NSImage(named: "LockedImage")
@@ -312,6 +319,7 @@ class KMUserInfoViewController: NSViewController {
             number2Label.textColor = NSColor(hex: "FCFDFF")
             number3Label.textColor =  NSColor(hex:"FCFDFF")
             number4Label.textColor = NSColor(hex: "FCFDFF")
+            number4_1Label.textColor = NSColor(hex: "FCFDFF")
             number5Label.textColor = NSColor(hex: "FCFDFF")
             
             lockedImageView.image = NSImage(named: "UpgradeImage2")

PDF Office/PDF Master/MemberCenter/ViewController/KMUserInfoViewController.xib

@@ -56,6 +56,7 @@
                 <outlet property="number2Label" destination="1xg-TB-Y3K" id="5Y7-gd-Lkh"/>
                 <outlet property="number3Label" destination="IbY-zZ-3eY" id="fzG-y7-GG3"/>
                 <outlet property="number4Label" destination="cjO-qk-Gbb" id="sFD-84-9Q5"/>
+                <outlet property="number4_1Label" destination="TDh-Xw-OR7" id="EoX-JV-v12"/>
                 <outlet property="number5Label" destination="MZb-0e-sV1" id="iPE-8R-wHm"/>
                 <outlet property="productLabel" destination="VM1-Vy-v3Z" id="3D7-F0-rQa"/>
                 <outlet property="rightsBox" destination="i59-vk-E69" id="9oI-bw-M4l"/>
@@ -712,19 +713,44 @@
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="TaO-xx-WfY">
                             <rect key="frame" x="0.0" y="42" width="77" height="36"/>
                             <subviews>
-                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cjO-qk-Gbb">
-                                    <rect key="frame" x="20" y="10" width="37" height="16"/>
-                                    <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="0a3-kx-4jm">
-                                        <font key="font" usesAppearanceFont="YES"/>
-                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                    </textFieldCell>
-                                </textField>
+                                <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="bdt-qZ-ixY">
+                                    <rect key="frame" x="21" y="9" width="35" height="19"/>
+                                    <view key="contentView" id="0am-hY-Afp">
+                                        <rect key="frame" x="0.0" y="0.0" width="35" height="19"/>
+                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                        <subviews>
+                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TDh-Xw-OR7">
+                                                <rect key="frame" x="-2" y="0.0" width="14" height="19"/>
+                                                <textFieldCell key="cell" lineBreakMode="clipping" title="2" id="HNY-qj-sOt">
+                                                    <font key="font" metaFont="system" size="16"/>
+                                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                </textFieldCell>
+                                            </textField>
+                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cjO-qk-Gbb">
+                                                <rect key="frame" x="10" y="1" width="27" height="16"/>
+                                                <textFieldCell key="cell" lineBreakMode="clipping" title="dev" id="0a3-kx-4jm">
+                                                    <font key="font" metaFont="system"/>
+                                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                </textFieldCell>
+                                            </textField>
+                                        </subviews>
+                                        <constraints>
+                                            <constraint firstItem="TDh-Xw-OR7" firstAttribute="top" secondItem="0am-hY-Afp" secondAttribute="top" id="7XV-QF-bHg"/>
+                                            <constraint firstAttribute="trailing" secondItem="cjO-qk-Gbb" secondAttribute="trailing" id="ESM-T6-ELI"/>
+                                            <constraint firstItem="TDh-Xw-OR7" firstAttribute="leading" secondItem="0am-hY-Afp" secondAttribute="leading" id="f43-Fi-1AY"/>
+                                            <constraint firstAttribute="bottom" secondItem="TDh-Xw-OR7" secondAttribute="bottom" id="fY6-qk-rMI"/>
+                                            <constraint firstItem="cjO-qk-Gbb" firstAttribute="centerY" secondItem="0am-hY-Afp" secondAttribute="centerY" id="m8c-R9-afb"/>
+                                            <constraint firstItem="cjO-qk-Gbb" firstAttribute="leading" secondItem="TDh-Xw-OR7" secondAttribute="trailing" constant="2" id="sPU-PE-WBb"/>
+                                        </constraints>
+                                    </view>
+                                </box>
                             </subviews>
                             <constraints>
+                                <constraint firstItem="bdt-qZ-ixY" firstAttribute="centerY" secondItem="TaO-xx-WfY" secondAttribute="centerY" id="Wa2-pK-A2q"/>
+                                <constraint firstItem="bdt-qZ-ixY" firstAttribute="centerX" secondItem="TaO-xx-WfY" secondAttribute="centerX" id="bec-p0-3nG"/>
                                 <constraint firstAttribute="height" constant="36" id="kdl-6X-3WB"/>
-                                <constraint firstItem="cjO-qk-Gbb" firstAttribute="centerX" secondItem="TaO-xx-WfY" secondAttribute="centerX" id="m9I-9f-cuD"/>
-                                <constraint firstItem="cjO-qk-Gbb" firstAttribute="centerY" secondItem="TaO-xx-WfY" secondAttribute="centerY" id="s7i-hK-XML"/>
                             </constraints>
                         </customView>
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="O6K-wF-0oc">