【合并】新增次数限制

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

@@ -86,6 +86,8 @@ class KMSubscribeWaterMarkWindowController: NSWindowController {
     
     override func awakeFromNib() {
         super.awakeFromNib()
+        
+//        self.waterMarkView.subscribeLabel.stringValue = ""
     }
     
     //MARK: 打开文件
@@ -170,7 +172,11 @@ class KMSubscribeWaterMarkWindowController: NSWindowController {
                 subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("Save with Watermark", comment: "")
             } else {
                 if type == .merge {
-                    subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("Delete From the File List", comment: "")
+                    if (limit) {
+                        subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("Later", comment: "")
+                    } else {
+                        subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("Delete From the File List", comment: "")
+                    }
                 } else if type.isConvertType() {
                     if (limit) {
                         subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("Later", comment: "")

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

@@ -144,7 +144,7 @@ class KMSubscribeWaterMarkView: KMBaseXibView {
             self.collectionContentViewHeightConstraint.constant = 368
             self.collectionViewContentTopConstraint.constant = 28
             self.titleLabel.stringValue = NSLocalizedString("Subscription Benefits", comment: "")
-            self.waterExportButton.title = NSLocalizedString("Save with Watermark", comment: "")
+//            self.waterExportButton.title = NSLocalizedString("Save with Watermark", comment: "")
             self.subscribeLabel.stringValue = NSLocalizedString("Upgrade Now", comment: "")
         } else {
             self.subTitleContentView.isHidden = false

PDF Office/PDF Master/Class/Merge/OCPart/KMPDFEditAppendWindow.m

@@ -1174,12 +1174,30 @@ static KMPDFEditAppendWindow *windowController = nil;
 //                });
 //            }
 //        }];
-        [KMSubscribeWaterMarkWindowController showWithWindow:self.window isContinue:false limit:[self mergeCountIsReach]  type:KMSubscribeWaterMarkTypeMerge subscribeDidClick:^{
+        BOOL isContinue = YES;
+        BOOL limit = [self mergeCountIsReach];
+        if (limit) {
+            isContinue = NO;
+        }
+        
+        [KMSubscribeWaterMarkWindowController showWithWindow:self.window isContinue:isContinue limit:limit  type:KMSubscribeWaterMarkTypeMerge subscribeDidClick:^{
                     
-                } completion:^(BOOL, BOOL, BOOL) {
-                    dispatch_async(dispatch_get_main_queue(), ^{
-                        [weakSelf buttonItemClick_Append: sender];
-                    });
+                } completion:^(BOOL isSub, BOOL isWater, BOOL isClose) {
+                    if (isClose) {
+                        return;
+                    }
+                    if (isSub) {
+                        dispatch_async(dispatch_get_main_queue(), ^{
+                            [weakSelf buttonItemClick_Append: sender];
+                        });
+                        return;
+                    }
+                    if (isWater && !limit) {
+                        dispatch_async(dispatch_get_main_queue(), ^{
+                            [weakSelf buttonItemClick_Append: sender];
+                        });
+                        return;
+                    }
                 }];
         return;
     }