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

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

@@ -144,12 +144,16 @@ class KMSubscribeWaterMarkWindowController: NSWindowController {
             
             if isContinue {
                 if type == .merge {
-                    subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("Delete from the file list.", comment: "")
+                    subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("Save with Watermark", comment: "")
                 } else {
                     subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("Save and Continue", comment: "")
                 }
             } else {
-                subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("Save with Watermark", comment: "")
+                if type == .merge {
+                    subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("Delete from the file list.", comment: "")
+                } else {
+                    subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("Save with Watermark", comment: "")
+                }
             }
             
             subscribeWaterMarkController = subscribeWaterMarkWindowController

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

@@ -196,7 +196,7 @@ extension KMLightMemberManager {
     func canPayFunction(needNetworking: Bool = false) async -> Bool {
         var result: Bool = false
         //先确认可以使用高级功能，再确认是否已经订阅
-        if await self.canUseAdvanced() && (self.purchaseState == .subscription || self.purchaseState == .trial) {
+        if await self.canUseAdvanced(needNetworking: needNetworking) && (self.purchaseState == .subscription || self.purchaseState == .trial) {
             result = true
         }
         return result

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

@@ -1113,14 +1113,30 @@ static KMPDFEditAppendWindow *windowController = nil;
     }
     
     if (KMLightMemberManager.manager.purchaseState != KMPurchaseManagerStateSubscription && _files.count > 2) {
-        [KMSubscribeWaterMarkWindowController showWithWindow: self.window isContinue:true type:KMSubscribeWaterMarkTypeMerge subscribeDidClick:^{
+        [KMSubscribeWaterMarkWindowController showWithWindow: self.window isContinue: false type:KMSubscribeWaterMarkTypeMerge subscribeDidClick:^{
             
         } completion:^(BOOL isSub, BOOL isWater, BOOL isClose) {
             
         }];
         return;
+    } else if (KMLightMemberManager.manager.purchaseState != KMPurchaseManagerStateSubscription && _files.count <= 2) {
+        __weak typeof(self) weakSelf = self;
+        [KMSubscribeWaterMarkWindowController showWithWindow: self.window isContinue:true type:KMSubscribeWaterMarkTypeMerge subscribeDidClick:^{
+            
+        } completion:^(BOOL isSub, BOOL isWater, BOOL isClose) {
+            if (isWater) {
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    [weakSelf buttonItemClick_Append: sender];
+                });
+            }
+        }];
+        return;
     }
     
+    [self buttonItemClick_Append: sender];
+}
+
+- (void)buttonItemClick_Append:(id)sender {
     KMImageTitleButton *customSizeButton = self.customSizeButton.subviews.lastObject;
     if (customSizeButton.state == NSControlStateValueOn) {
         NSInteger widthFloat = [self.pageSizeWidthTextField.stringValue integerValue];