Merge branch 'develop_v1.2' of git.kdan.cc:Mac_PDF/PDF_Office into develop_v1.2

PDF Office/PDF Master/Class/KMLightMember/Controller/AccountInfo/View/KMAccountInfoView.swift

@@ -25,6 +25,7 @@ class KMAccountInfoView: KMBaseXibView {
     @IBOutlet weak var statusTitleLabel: NSTextField!
     @IBOutlet weak var statusLabel: NSTextField!
     @IBOutlet weak var tagLabel: NSTextField!
+    @IBOutlet weak var tagContentView: NSView!
     @IBOutlet weak var statusTimeLabel: NSTextField!
     @IBOutlet weak var purchaseInfoButton: NSButton!
     @IBOutlet weak var lineView: NSView!
@@ -109,8 +110,9 @@ class KMAccountInfoView: KMBaseXibView {
         
         self.tagLabel.font = NSFont.SFProTextRegular(12)
         self.tagLabel.textColor = NSColor(hex: "#252629")
-        self.tagLabel.backgroundColor(NSColor(hex: "#F7F8FA"))
-        self.tagLabel.border(NSColor(hex: "#DFE1E5"), 1, 4)
+        
+        self.tagContentView.border(NSColor(hex: "#DFE1E5"), 1, 4)
+        self.tagContentView.backgroundColor(NSColor(hex: "#F7F8FA"))
         
         self.lineView.backgroundColor(NSColor(hex: "#ECECEC"))
         self.updateMoreButtonState(select: false)

PDF Office/PDF Master/Class/KMLightMember/Controller/AccountInfo/View/KMAccountInfoView.xib

@@ -24,7 +24,8 @@
                 <outlet property="statusTitleLabel" destination="QSv-Q9-wi2" id="pcQ-1L-Zjt"/>
                 <outlet property="subscribeButton" destination="6uz-0m-698" id="Dlq-ns-XT2"/>
                 <outlet property="subscribeButtonContentView" destination="l6v-gx-NaZ" id="LUP-wd-tnT"/>
-                <outlet property="tagLabel" destination="RfD-v6-uJu" id="N9T-ta-Ccs"/>
+                <outlet property="tagContentView" destination="ABe-Ge-8Kf" id="3Fp-U5-gMV"/>
+                <outlet property="tagLabel" destination="dUy-Xz-Fsv" id="C28-5w-9yP"/>
                 <outlet property="titleLabel" destination="wzN-5h-FkM" id="e2e-2a-3Lx"/>
             </connections>
         </customObject>
@@ -207,24 +208,32 @@ Trial expires</string>
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="RfD-v6-uJu">
-                                    <rect key="frame" x="53" y="15" width="100" height="20"/>
+                                <customView translatesAutoresizingMaskIntoConstraints="NO" id="ABe-Ge-8Kf">
+                                    <rect key="frame" x="55" y="15" width="124" height="20"/>
+                                    <subviews>
+                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dUy-Xz-Fsv">
+                                            <rect key="frame" x="12" y="2" width="100" height="16"/>
+                                            <textFieldCell key="cell" lineBreakMode="clipping" title="  Auto-renewal  " id="NKq-uS-TUg">
+                                                <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 firstAttribute="height" constant="20" id="9to-P6-EJO"/>
+                                        <constraint firstAttribute="height" constant="20" id="1eC-Ga-7L7"/>
+                                        <constraint firstAttribute="width" secondItem="dUy-Xz-Fsv" secondAttribute="width" multiplier="1.29167" id="WaV-Hg-Mwv"/>
+                                        <constraint firstItem="dUy-Xz-Fsv" firstAttribute="centerY" secondItem="ABe-Ge-8Kf" secondAttribute="centerY" id="edK-lC-TYV"/>
+                                        <constraint firstItem="dUy-Xz-Fsv" firstAttribute="centerX" secondItem="ABe-Ge-8Kf" secondAttribute="centerX" id="vpa-Ik-yop"/>
                                     </constraints>
-                                    <textFieldCell key="cell" lineBreakMode="clipping" title="  Auto-renewal  " id="KeK-ki-I4m">
-                                        <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>
+                                </customView>
                             </subviews>
                             <constraints>
                                 <constraint firstItem="xqM-Bi-zV4" firstAttribute="centerY" secondItem="1pg-8T-wNz" secondAttribute="centerY" id="1Uu-r0-Q04"/>
+                                <constraint firstItem="ABe-Ge-8Kf" firstAttribute="centerY" secondItem="xqM-Bi-zV4" secondAttribute="centerY" id="3JP-mc-W3l"/>
                                 <constraint firstItem="xqM-Bi-zV4" firstAttribute="leading" secondItem="1pg-8T-wNz" secondAttribute="leading" id="F3R-oN-U5B"/>
-                                <constraint firstItem="RfD-v6-uJu" firstAttribute="leading" secondItem="xqM-Bi-zV4" secondAttribute="trailing" constant="8" id="Gpr-kE-1dD"/>
+                                <constraint firstItem="ABe-Ge-8Kf" firstAttribute="leading" secondItem="xqM-Bi-zV4" secondAttribute="trailing" constant="8" id="SSj-pe-e3T"/>
                                 <constraint firstItem="hNa-H6-poH" firstAttribute="centerY" secondItem="1pg-8T-wNz" secondAttribute="centerY" id="WLL-Zz-HhA"/>
-                                <constraint firstItem="RfD-v6-uJu" firstAttribute="centerY" secondItem="xqM-Bi-zV4" secondAttribute="centerY" id="j3J-NY-obP"/>
                                 <constraint firstAttribute="trailing" secondItem="hNa-H6-poH" secondAttribute="trailing" id="jGS-Qa-jZA"/>
                             </constraints>
                         </customView>

PDF Office/PDF Master/Class/KMLightMember/Model/KMLightMemberUserInfo.swift

@@ -17,6 +17,7 @@ class KMLightMemberUserInfo: NSObject, Codable {
     var accountType: Int = 0
     var createdAt: String = ""
     var validFlag: String = "" // 0是已注销 5是注销中
+//    var subscriptionInfoList: [KMLightMemberUserSubscriptionInfo] = []
     
 //    var companyId: String = ""
 //    var fullName: String = ""
@@ -39,6 +40,15 @@ class KMLightMemberUserInfo: NSObject, Codable {
 //    var subscriptionInfoList: String = ""
 }
 
+class KMLightMemberUserSubscriptionInfo: NSObject, Codable {
+    var price: CGFloat = 0.00
+    var subscriptionPlan: Int = 2
+    var endDate: String = ""
+    var paymentMethod: String = ""
+    var productName: String = ""
+    var productId: String = ""
+}
+
 extension KMLightMemberUserInfo {
     //MARK: data
     /**