【订阅】登录权益，未登录时合并与转档跳转逻辑调整

PDF Office/PDF Master/Class/KMLightMember/Controller/SubscriptionView/WaterMark/KMSubscribeWaterMarkWindowController.swift

@@ -54,6 +54,7 @@ typealias KMSubscribeWaterMarkWindowControllerWatermarkExportAction = (_ control
 typealias KMSubscribeWaterMarkWindowControllerSubscribeAction = (_ controller: KMSubscribeWaterMarkWindowController) -> Void
 
 var tempType: KMSubscribeWaterMarkType = .none
+var tempLimit: Bool = false
 class KMSubscribeWaterMarkWindowController: NSWindowController {
 
     @IBOutlet weak var waterMarkView: KMSubscribeWaterMarkView!
@@ -99,7 +100,7 @@ class KMSubscribeWaterMarkWindowController: NSWindowController {
             return KMSubscribeWaterMarkWindowController()
         }
         #endif
-        
+        tempLimit = limit
         tempType = type
         var isAI = false
         if type == .aiCorrect ||
@@ -253,7 +254,7 @@ class KMSubscribeWaterMarkWindowController: NSWindowController {
     }
     
     func reloadData() {
-        if KMLightMemberManager.manager.isLogin() || tempType == .save {
+        if KMSubscribeWaterMarkWindowController.canShowLoginBenefits() {
             self.waterViewHeightConstrain.constant = 462
         } else {
             self.waterViewHeightConstrain.constant = 563
@@ -271,6 +272,10 @@ class KMSubscribeWaterMarkWindowController: NSWindowController {
         }
         return KMSubscribeWaterMarkWindowController()
     }
+    
+    static func canShowLoginBenefits() -> Bool {
+        return KMLightMemberManager.manager.isLogin() || tempType == .save || ((tempType.isConvertType() || tempType == .merge) && tempLimit)
+    }
 }
 
 // MARK: - Analytics (埋点)

PDF Office/PDF Master/Class/KMLightMember/Controller/SubscriptionView/WaterMark/View/KMSubscribeWaterMarkView.swift

@@ -163,7 +163,7 @@ class KMSubscribeWaterMarkView: KMBaseXibView {
     }
     
     override func updateLanguage() {
-        if KMLightMemberManager.manager.isLogin() || type == .save {
+        if KMSubscribeWaterMarkWindowController.canShowLoginBenefits() {
             self.subTitleContentView.isHidden = true
             self.subtitleContentHeightConstraint.constant = 0
             self.collectionContentViewHeightConstraint.constant = 368
@@ -191,7 +191,7 @@ class KMSubscribeWaterMarkView: KMBaseXibView {
     }
 
     override func reloadData() {
-        if KMLightMemberManager.manager.isLogin() || type == .save {
+        if KMSubscribeWaterMarkWindowController.canShowLoginBenefits() {
             self.dataArray = afterLoginDataArray
         } else {
             self.dataArray = beforeLoginDataArray