【订阅】比较表页面跳转类型完善

PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/KMComparativeTableViewController.swift

@@ -13,10 +13,23 @@ typealias KMComparativeTableViewControllerSignUpAction = (_ controller: KMCompar
 var comparativeController: KMComparativeTableViewController?
 var comparativeMainWindow: NSWindow?
 
+enum KMComparativeInputType: Int {
+    case unknown = 0
+    case login = 1 //登录界面
+    case register = 2 //注册界面
+    case resetPassword = 3 //重置密码
+    case verificationCode = 4 //验证码
+    case registerSuccess = 5 //注册成功
+    case loginInputPassword = 6 //登录密码输入
+    case accountInfo = 7 //用户信息
+    
+    //后续添加
+}
+
 class KMComparativeTableViewController: NSWindowController {
 
     @IBOutlet weak var comparativeTableView: KMComparativeTableView!
-    var inputType: DataNavigationViewButtonActionType?
+    var inputType: KMComparativeInputType?
     
     var loginAction: KMComparativeTableViewControllerLoginAction?
     var signUpAction: KMComparativeTableViewControllerSignUpAction?
@@ -31,7 +44,7 @@ class KMComparativeTableViewController: NSWindowController {
      @param window 弹出window
      @param type 从什么页面跳转到比较表 默认batch
      */
-    static func show(window: NSWindow, _ type: DataNavigationViewButtonActionType = .Batch) -> KMComparativeTableViewController {
+    static func show(window: NSWindow, _ type: KMComparativeInputType = .unknown) -> KMComparativeTableViewController {
         let controller: KMComparativeTableViewController = KMComparativeTableViewController.init(windowNibName: "KMComparativeTableViewController")
         controller.inputType = type
 

PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/View/KMLoginLeftImageView.swift

@@ -8,6 +8,7 @@
 import Cocoa
 
 typealias KMLoginLeftImageViewCancelAction = (_ view: KMLoginLeftImageView) -> Void
+typealias KMLoginLeftImageViewSubscriptionAction = (_ view: KMLoginLeftImageView) -> Void
 class KMLoginLeftImageView: KMBaseXibView {
 
     @IBOutlet weak var closeButton: NSButton!

PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/View/KMLoginLeftImageView.xib

@@ -24,11 +24,25 @@
                             <rect key="frame" x="0.0" y="0.0" width="282" height="460"/>
                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="image_login" id="ZVR-ob-TIM"/>
                         </imageView>
+                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XyW-Vk-S88">
+                            <rect key="frame" x="186" y="16" width="80" height="80"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="80" id="T3p-Vf-5dM"/>
+                                <constraint firstAttribute="width" constant="80" id="TZN-Md-Uu8"/>
+                            </constraints>
+                            <buttonCell key="cell" type="square" title="订阅" bezelStyle="shadowlessSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="jSq-9I-9tm">
+                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                <font key="font" size="13" name=".PingFangSC-Regular"/>
+                            </buttonCell>
+                            <color key="contentTintColor" name="systemRedColor" catalog="System" colorSpace="catalog"/>
+                        </button>
                     </subviews>
                     <constraints>
                         <constraint firstItem="MOY-Rt-B5e" firstAttribute="top" secondItem="7xs-D0-Xel" secondAttribute="top" id="LJI-lq-UcP"/>
                         <constraint firstItem="MOY-Rt-B5e" firstAttribute="leading" secondItem="7xs-D0-Xel" secondAttribute="leading" id="WME-XU-0Qa"/>
                         <constraint firstAttribute="trailing" secondItem="MOY-Rt-B5e" secondAttribute="trailing" id="bfV-RG-OZR"/>
+                        <constraint firstAttribute="trailing" secondItem="XyW-Vk-S88" secondAttribute="trailing" constant="16" id="epI-3h-t7y"/>
+                        <constraint firstAttribute="bottom" secondItem="XyW-Vk-S88" secondAttribute="bottom" constant="16" id="mTL-v1-5zT"/>
                         <constraint firstAttribute="bottom" secondItem="MOY-Rt-B5e" secondAttribute="bottom" id="u4a-Af-t9S"/>
                     </constraints>
                 </customView>

PDF Office/PDF Master/Class/KMLightMember/Manager/KMSubscriptionManager.swift

@@ -9,8 +9,10 @@ import Cocoa
 
 enum KMSubscriptionState: String, CaseIterable {
     case unknow = "unknow"
-    case advanced = "advanced"
-    
+    case trial = "Trial"
+    case trialExpired = "Trial Expired"
+    case subscription = "Subscription"
+    case subscriptionExpired = "Subscription Expired"
 }
 
 class KMSubscriptionManager: NSObject {