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

PDF Office/PDF Master/Class/Common/Base/KMBaseViewController.swift

@@ -52,18 +52,18 @@ class KMBaseViewController: NSViewController {
     }
     
     fileprivate func _reloadAdvancedData() {
-        Task { @MainActor in
-            if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                self.canUseAdvanced = false
-            } else {
-                self.canUseAdvanced = true
-            }
-            if await (KMLightMemberManager.manager.canPayFunction() == false) {
-                self.canPayFunction = false
-            } else {
-                self.canPayFunction = true
-            }
-        }
+//        Task { @MainActor in
+//            if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
+//                self.canUseAdvanced = false
+//            } else {
+//                self.canUseAdvanced = true
+//            }
+//            if (KMLightMemberManager.manager.canPayFunction() == false) {
+//                self.canPayFunction = false
+//            } else {
+//                self.canPayFunction = true
+//            }
+//        }
     }
     
     // Noti

PDF Office/PDF Master/Class/Home/ViewController/KMHomeViewController+Action.swift

@@ -1070,22 +1070,6 @@ extension KMHomeViewController {
     
     func fastTool_MergePDF() {  // MergePDF
         Task { @MainActor in
-//            #if VERSION_DMG
-//            if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-//                let _ = KMComparativeTableViewController.show(window: self.view.window!, .merge)
-//                return
-//            }
-//            #endif
-
-//            if await (KMLightMemberManager.manager.canPayFunction() == false) {
-//                let _ = KMSubscribeWaterMarkWindowController.show(window: self.view.window!, isContinue: true, type: .merge) { isSubscribeSuccess, isWaterMarkExport, isClose in
-//                    if (isClose) {
-//                        return
-//                    }
-//                    self.km_open_pdf_merge()
-//                }
-//                return
-//            }
             self.km_open_pdf_merge()
         }
     }

PDF Office/PDF Master/Class/Home/ViewController/KMHomeViewController+UI.swift

@@ -61,23 +61,6 @@ extension KMHomeViewController {
     
     func showConvertWindow(type: KMPDFConvertType) {
         Task { @MainActor in
-//            #if VERSION_DMG
-//            if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-//                let _ = KMComparativeTableViewController.show(window: self.view.window!, .merge)
-//                return
-//            }
-//            #endif
-
-//            if await (KMLightMemberManager.manager.canPayFunction() == false) {
-//                let _ = KMSubscribeWaterMarkWindowController.show(window: self.view.window!, isContinue: true, type: type.toSubscribeWaterMarkType()) { isSubscribeSuccess, isWaterMarkExport, isClose in
-//                    if (isClose) {
-//                        return
-//                    }
-//                    self.km_secure_openPanel_convert(type: type)
-//                }
-//                return
-//            }
-            
             self.km_secure_openPanel_convert(type: type)
         }
     }

PDF Office/PDF Master/Class/PDFTools/Convert/NewController/KMConvertWindowController.swift

@@ -703,14 +703,6 @@ class KMConvertWindowController: NSWindowController, NSTextFieldDelegate, NSWind
     func beginConvert() {
         var isLimitConvert = false
         
-#if VERSION_DMG
-        Task { @MainActor in
-            if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                let _ = KMComparativeTableViewController.show(window: self.window!, .convert)
-                return
-            }
-        }
-#endif
         if (KMLightMemberManager.manager.canPayFunction() == false) {
             if self.convertType == .PNG ||
                 .JPEG == self.convertType ||

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

@@ -268,17 +268,17 @@ static KMPDFEditAppendWindow *windowController = nil;
         self.limitLable.hidden = YES;
         self.limitTipIv.hidden = YES;
     } else {
-        [KMLightMemberManager.manager canUseAdvancedWithNeedNetworking:NO completionHandler:^(BOOL isLogin) {
-            dispatch_sync(dispatch_get_main_queue(), ^{
-                if (isLogin) {
-                    weakSelf.limitLable.hidden = NO;
-                    weakSelf.limitTipIv.hidden = NO;
-                } else {
-                    weakSelf.limitLable.hidden = YES;
-                    weakSelf.limitTipIv.hidden = YES;
-                }
-            });
-        }];
+//        [KMLightMemberManager.manager canUseAdvancedWithNeedNetworking:NO completionHandler:^(BOOL isLogin) {
+//            dispatch_sync(dispatch_get_main_queue(), ^{
+//                if (isLogin) {
+//                    weakSelf.limitLable.hidden = NO;
+//                    weakSelf.limitTipIv.hidden = NO;
+//                } else {
+//                    weakSelf.limitLable.hidden = YES;
+//                    weakSelf.limitTipIv.hidden = YES;
+//                }
+//            });
+//        }];
     }
 }
 
@@ -502,23 +502,23 @@ static KMPDFEditAppendWindow *windowController = nil;
         self.limitLable.hidden = YES;
         self.limitTipIv.hidden = YES;
     } else {
-#if VERSION_DMG
-        [KMLightMemberManager.manager canUseAdvancedWithNeedNetworking:NO completionHandler:^(BOOL isLogin) {
-            dispatch_sync(dispatch_get_main_queue(), ^{
-                if (isLogin) {
-                    weakSelf.limitLable.hidden = NO;
-                    weakSelf.limitTipIv.hidden = NO;
-                } else {
-                    weakSelf.limitLable.hidden = YES;
-                    weakSelf.limitTipIv.hidden = YES;
-                }
-            });
-        }];
-        
-#else
+//#if VERSION_DMG
+//        [KMLightMemberManager.manager canUseAdvancedWithNeedNetworking:NO completionHandler:^(BOOL isLogin) {
+//            dispatch_sync(dispatch_get_main_queue(), ^{
+//                if (isLogin) {
+//                    weakSelf.limitLable.hidden = NO;
+//                    weakSelf.limitTipIv.hidden = NO;
+//                } else {
+//                    weakSelf.limitLable.hidden = YES;
+//                    weakSelf.limitTipIv.hidden = YES;
+//                }
+//            });
+//        }];
+//        
+//#else
         self.limitLable.hidden = NO;
         self.limitTipIv.hidden = NO;
-#endif
+//#endif
     }
 }
 
@@ -1173,72 +1173,72 @@ static KMPDFEditAppendWindow *windowController = nil;
     if (!self.canMerge) {
         return;
     }
-#if VERSION_DMG
-    [KMLightMemberManager.manager canUseAdvancedWithNeedNetworking:NO completionHandler:^(BOOL result) {
-        dispatch_async(dispatch_get_main_queue(), ^{
-            if (result) {
-                [self doAppend];
-            } else {
-                [KMComparativeTableViewController showWithWindow:self.window :KMComparativeInputTypeMerge inputType:KMSubscribeWaterMarkTypeMerge];
-            }
-        });
-    }];
-#else
+//#if VERSION_DMG
+//    [KMLightMemberManager.manager canUseAdvancedWithNeedNetworking:NO completionHandler:^(BOOL result) {
+//        dispatch_async(dispatch_get_main_queue(), ^{
+//            if (result) {
+//                [self doAppend];
+//            } else {
+//                [KMComparativeTableViewController showWithWindow:self.window :KMComparativeInputTypeMerge inputType:KMSubscribeWaterMarkTypeMerge];
+//            }
+//        });
+//    }];
+//#else
     [self doAppend];
-#endif
+//#endif
 }
 
 - (IBAction)doAppend {
-    if (KMLightMemberManager.manager.purchaseState != KMPurchaseManagerStateSubscription && _files.count > 2) {
-//        [KMSubscribeWaterMarkWindowController showWithWindow: self.window isContinue: false limit type:KMSubscribeWaterMarkTypeMerge subscribeDidClick:^{
-//
-//        } completion:^(BOOL isSub, BOOL isWater, BOOL isClose) {
-//
-//        }];
-        [KMSubscribeWaterMarkWindowController showWithWindow:self.window isContinue:false limit:[self mergeCountIsReach]  type:KMSubscribeWaterMarkTypeMerge subscribeDidClick:^{
-                    
-                } completion:^(BOOL, BOOL, BOOL) {
-                    
-                }];
-        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];
-//                });
-//            }
-//        }];
-        BOOL isContinue = YES;
-        BOOL limit = [self mergeCountIsReach];
-        if (limit) {
-            isContinue = NO;
-        }
-        
-        [KMSubscribeWaterMarkWindowController showWithWindow:self.window isContinue:isContinue limit:limit  type:KMSubscribeWaterMarkTypeMerge subscribeDidClick:^{
-                    
-                } completion:^(BOOL isSub, BOOL isWater, BOOL isClose) {
-                    if (isClose) {
-                        return;
-                    }
-                    if (isSub) {
-                        dispatch_async(dispatch_get_main_queue(), ^{
-                            [weakSelf buttonItemClick_Append: nil];
-                        });
-                        return;
-                    }
-                    if (isWater && !limit) {
-                        dispatch_async(dispatch_get_main_queue(), ^{
-                            [weakSelf buttonItemClick_Append: nil];
-                        });
-                        return;
-                    }
-                }];
-        return;
-    }
+//    if (KMLightMemberManager.manager.purchaseState != KMPurchaseManagerStateSubscription && _files.count > 2) {
+////        [KMSubscribeWaterMarkWindowController showWithWindow: self.window isContinue: false limit type:KMSubscribeWaterMarkTypeMerge subscribeDidClick:^{
+////
+////        } completion:^(BOOL isSub, BOOL isWater, BOOL isClose) {
+////
+////        }];
+//        [KMSubscribeWaterMarkWindowController showWithWindow:self.window isContinue:false limit:[self mergeCountIsReach]  type:KMSubscribeWaterMarkTypeMerge subscribeDidClick:^{
+//                    
+//                } completion:^(BOOL, BOOL, BOOL) {
+//                    
+//                }];
+//        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];
+////                });
+////            }
+////        }];
+//        BOOL isContinue = YES;
+//        BOOL limit = [self mergeCountIsReach];
+//        if (limit) {
+//            isContinue = NO;
+//        }
+//        
+//        [KMSubscribeWaterMarkWindowController showWithWindow:self.window isContinue:isContinue limit:limit  type:KMSubscribeWaterMarkTypeMerge subscribeDidClick:^{
+//                    
+//                } completion:^(BOOL isSub, BOOL isWater, BOOL isClose) {
+//                    if (isClose) {
+//                        return;
+//                    }
+//                    if (isSub) {
+//                        dispatch_async(dispatch_get_main_queue(), ^{
+//                            [weakSelf buttonItemClick_Append: nil];
+//                        });
+//                        return;
+//                    }
+//                    if (isWater && !limit) {
+//                        dispatch_async(dispatch_get_main_queue(), ^{
+//                            [weakSelf buttonItemClick_Append: nil];
+//                        });
+//                        return;
+//                    }
+//                }];
+//        return;
+//    }
     
     [self buttonItemClick_Append: nil];
 }

PDF Office/PDF Master/Class/PDFTools/PageEdit/Controller/KMPDFEditViewController_dmg.swift

@@ -34,8 +34,8 @@ class KMPDFEditViewController_dmg: KMPDFEditViewController {
                     return
                 }
                 
-                if let data = self?.canUseAdvanced, data == false {
-                    let _ = KMComparativeTableViewController.show(window: self!.kmCurrentWindowC!.window!, .pageEdit)
+                if IAPProductsManager.default().isAvailableAllFunction() == false {
+                    KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
                     return
                 }
                 
@@ -110,27 +110,8 @@ class KMPDFEditViewController_dmg: KMPDFEditViewController {
             self.toolBar.unSelectItem(for: KMToolbarPageEditSplitItemIdentifier)
             
             self.showSplitWindow { [unowned self] splitWindowC, model in
-                if (!self.canUseAdvanced){
-                    _ = KMComparativeTableViewController.show(window: splitWindowC.window!)
-                    return
-                }
-
-                if (!self.canPayFunction) {
-                    _ = KMSubscribeWaterMarkWindowController.show(window: splitWindowC.window!, type: .split) { isSubscribeSuccess, isWaterMarkExport, isClose in
-                        if (isClose) {
-                            return
-                        }
-                        if (isSubscribeSuccess) {
-                            self.km_endSheet()
-                            self.splitMethod(windowC: splitWindowC, model: model)
-                            return
-                        }
-                        if (isWaterMarkExport) {
-                            self.km_endSheet()
-                            self.splitMethod(windowC: splitWindowC, model: model, limit: true)
-                            return
-                        }
-                    }
+                if IAPProductsManager.default().isAvailableAllFunction() == false {
+                    KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
                     return
                 }
                 
@@ -156,18 +137,19 @@ class KMPDFEditViewController_dmg: KMPDFEditViewController {
                 }
             }
         } completionBlock: { [unowned self] documents in
-            if !self.canUseAdvanced {
-                _ = KMComparativeTableViewController.show(window: self.view.window!)
+            if IAPProductsManager.default().isAvailableAllFunction() == false {
+                KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
                 return
             }
+            
             self.replacePages(of: self.thumbnailView.selectionIndexPaths, with: documents)
         }
     }
     
     override func replacePages(of targetIndexpaths: Set<IndexPath>, with documents: [CPDFDocument]) {
         Task { @MainActor in
-            if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                let _ = KMComparativeTableViewController.show(window: self.view.window!)
+            if IAPProductsManager.default().isAvailableAllFunction() == false {
+                KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
                 return
             }
             
@@ -216,28 +198,11 @@ class KMPDFEditViewController_dmg: KMPDFEditViewController {
             let extractAfterDelete = settingView.extractAfterDeletePageValue
             
             Task { @MainActor in
-                if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                    _ = KMComparativeTableViewController.show(window: _windowC.window!)
-                    return
-                }
-                if await (KMLightMemberManager.manager.canPayFunction() == false) {
-                    let _ = KMSubscribeWaterMarkWindowController.show(window: _windowC.window!, type: .extract) { isSubscribeSuccess, isWaterMarkExport, isClose in
-                        if (isClose) {
-                            return
-                        }
-                        if (isSubscribeSuccess) {
-                            self?.km_endSheet()
-                            callback(.ok, oneDocumentPerPage, extractAfterDelete)
-                            return
-                        }
-                        if (isWaterMarkExport) {
-                            self?.km_endSheet()
-                            callback(.ok, oneDocumentPerPage, extractAfterDelete)
-                            return
-                        }
-                    }
+                if IAPProductsManager.default().isAvailableAllFunction() == false {
+                    KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
                     return
                 }
+                
                 self?.km_endSheet()
                 callback(.ok, oneDocumentPerPage, extractAfterDelete)
             }
@@ -248,8 +213,8 @@ class KMPDFEditViewController_dmg: KMPDFEditViewController {
         self.trackEvent(type: .reverse)
         
         Task { @MainActor in
-            if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                let _ = KMComparativeTableViewController.show(window: self.view.window!, .pageEdit)
+            if IAPProductsManager.default().isAvailableAllFunction() == false {
+                KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
                 return
             }
 
@@ -260,8 +225,8 @@ class KMPDFEditViewController_dmg: KMPDFEditViewController {
     
     override func leftRotateIndexpaths(indexpaths: Set<IndexPath>) {
         Task { @MainActor in
-            if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                let _ = KMComparativeTableViewController.show(window: self.view.window!)
+            if IAPProductsManager.default().isAvailableAllFunction() == false {
+                KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
                 return
             }
 
@@ -271,8 +236,8 @@ class KMPDFEditViewController_dmg: KMPDFEditViewController {
     
     override func rightRotateIndexpaths(indexpaths: Set<IndexPath>) {
         Task { @MainActor in
-            if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                let _ = KMComparativeTableViewController.show(window: self.view.window!)
+            if IAPProductsManager.default().isAvailableAllFunction() == false {
+                KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
                 return
             }
 
@@ -282,8 +247,8 @@ class KMPDFEditViewController_dmg: KMPDFEditViewController {
     
     override func insertBlankPage(size: NSSize, at index: Int) {
         Task { @MainActor in
-            if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                let _ = KMComparativeTableViewController.show(window: self.view.window!)
+            if IAPProductsManager.default().isAvailableAllFunction() == false {
+                KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
                 return
             }
 
@@ -322,10 +287,11 @@ class KMPDFEditViewController_dmg: KMPDFEditViewController {
                 }
             }
             
-            if (!self.canUseAdvanced) {
-                let _ = KMComparativeTableViewController.show(window: self.view.window!)
+            if IAPProductsManager.default().isAvailableAllFunction() == false {
+                KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
                 return
             }
+            
             self.insertPages(pages: pages, at: indexs)
         }
     }
@@ -337,8 +303,8 @@ class KMPDFEditViewController_dmg: KMPDFEditViewController {
         }
         
         Task { @MainActor in
-            if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                let _ = KMComparativeTableViewController.show(window: self.view.window!)
+            if IAPProductsManager.default().isAvailableAllFunction() == false {
+                KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
                 return
             }
 
@@ -348,8 +314,8 @@ class KMPDFEditViewController_dmg: KMPDFEditViewController {
     
     override func cutAction() {
         Task { @MainActor in
-            if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                let _ = KMComparativeTableViewController.show(window: self.view.window!)
+            if IAPProductsManager.default().isAvailableAllFunction() == false {
+                KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
                 return
             }
 
@@ -359,8 +325,8 @@ class KMPDFEditViewController_dmg: KMPDFEditViewController {
     
     override func copyAction() {
         Task { @MainActor in
-            if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                let _ = KMComparativeTableViewController.show(window: self.view.window!)
+            if IAPProductsManager.default().isAvailableAllFunction() == false {
+                KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
                 return
             }
 
@@ -370,8 +336,8 @@ class KMPDFEditViewController_dmg: KMPDFEditViewController {
     
     override func pasteAction() {
         Task { @MainActor in
-            if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                let _ = KMComparativeTableViewController.show(window: self.view.window!)
+            if IAPProductsManager.default().isAvailableAllFunction() == false {
+                KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
                 return
             }
 
@@ -382,8 +348,8 @@ class KMPDFEditViewController_dmg: KMPDFEditViewController {
 
 extension KMPDFEditViewController_dmg {
     override func thumbnailView(thumbanView: KMThumbnailView, shouldAcceptDrop draggingInfo: NSDraggingInfo, indexPath: IndexPath, dropOperation: NSCollectionView.DropOperation) -> Bool {
-        if (!self.canUseAdvanced) {
-            let _ = KMComparativeTableViewController.show(window: self.view.window!, .pageEdit)
+        if IAPProductsManager.default().isAvailableAllFunction() == false {
+            KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
             return false
         }
         
@@ -391,15 +357,13 @@ extension KMPDFEditViewController_dmg {
     }
     
     override func thumbnailView(thumbanView: KMThumbnailView, shouldPasteboardWriterForItemAt indexPath: IndexPath) -> Bool {
-        if (!self.canUseAdvanced) {
-            DispatchQueue.main.async {
-                let _ = KMComparativeTableViewController.show(window: self.view.window!, .pageEdit)
-            }
-            return false
-        }
-        if (!self.canPayFunction) {
+        if IAPProductsManager.default().isAvailableAllFunction() == false {
+            KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
             return false
         }
+//        if (!self.canPayFunction) {
+//            return false
+//        }
         
         return true
     }

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/KMLeftSideViewController.swift

@@ -330,6 +330,13 @@ class KMLeftSideViewController: KMSideViewController {
                     self.displayNoteViewAnimating(false)
                 }
             } else if (segIndex == 3) {
+                if self.type.methodType == .snapshot {
+                    self.leftView.segmentedControl.selectedSegment = UInt8.max
+                    self.refreshMethodType(methodType: .None)
+                    return
+                }
+                
+                self.refreshMethodType(methodType: .snapshot)
                 self.toolButtonBox.contentView = self.snapshotNormalView
                 self.updateSnapshotFilterPredicate()
                 self.displaySnapshotViewAnimating(false)

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Thumbnail/KMThumbnailViewController.swift

@@ -472,13 +472,6 @@ class KMThumbnailViewController: KMBaseViewController {
     
     @IBAction func rotatePageItemAction(menu:NSMenuItem) {
         Task { @MainActor in
-            #if VERSION_DMG
-            if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                let _ = KMComparativeTableViewController.show(window: self.view.window!)
-                return
-            }
-            #endif
-
             let indexs = self.thumbnailView.collectionView.selectionIndexes
             let indexPaths = self.thumbnailView.collectionView.selectionIndexPaths
             if indexs.count >= 0 {
@@ -510,13 +503,6 @@ class KMThumbnailViewController: KMBaseViewController {
     
     @IBAction func leftRotatePageItemAction(menu:NSMenuItem) {
         Task { @MainActor in
-            #if VERSION_DMG
-            if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                let _ = KMComparativeTableViewController.show(window: self.view.window!)
-                return
-            }
-            #endif
-
             let indexs = self.thumbnailView.collectionView.selectionIndexes
             let indexPaths = self.thumbnailView.collectionView.selectionIndexPaths
             if indexs.count >= 0 {
@@ -586,13 +572,6 @@ class KMThumbnailViewController: KMBaseViewController {
     
     @IBAction func deletePageItemAction(menu:NSMenuItem) {
         Task { @MainActor in
-            #if VERSION_DMG
-            if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                let _ = KMComparativeTableViewController.show(window: self.view.window!)
-                return
-            }
-            #endif
-
             let indexs = self.thumbnailView.collectionView.selectionIndexes
             if indexs.count > 0 {
                 self.deletePageItemWithIndexs(indexs: indexs)
@@ -637,13 +616,6 @@ class KMThumbnailViewController: KMBaseViewController {
     
     @IBAction func copyItemAction(menu:NSMenuItem) {
         Task { @MainActor in
-            #if VERSION_DMG
-            if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                let _ = KMComparativeTableViewController.show(window: self.view.window!)
-                return
-            }
-            #endif
-            
             KMThumbnailManager.manager.copyPages.removeAll()
             let indexs = self.thumbnailView.collectionView.selectionIndexes
             //文件存储用于跨文件page处理
@@ -661,13 +633,6 @@ class KMThumbnailViewController: KMBaseViewController {
     
     @IBAction func cutItemAction(menu:NSMenuItem) {
         Task { @MainActor in
-            #if VERSION_DMG
-            if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                let _ = KMComparativeTableViewController.show(window: self.view.window!)
-                return
-            }
-            #endif
-
             KMThumbnailManager.manager.copyPages.removeAll()
             let indexs = self.thumbnailView.collectionView.selectionIndexes
             _ = KMThumbnailManager.manager.copyPages(document: self.thumbnailView.document!, indexs: indexs)
@@ -688,13 +653,6 @@ class KMThumbnailViewController: KMBaseViewController {
     
     @IBAction func pastePageItemAction(menu:NSMenuItem) {
         Task { @MainActor in
-            #if VERSION_DMG
-            if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                let _ = KMComparativeTableViewController.show(window: self.view.window!)
-                return
-            }
-            #endif
-
             let copyPages = KMThumbnailManager.manager.copyPages
             let page = copyPages.first
             if page?.document  == self.thumbnailView.document {
@@ -812,29 +770,10 @@ extension KMThumbnailViewController : KMThumbnailViewDelegate {
     }
 
     func thumbnailView(thumbanView: KMThumbnailView, shouldAcceptDrop draggingInfo: NSDraggingInfo, indexPath: IndexPath, dropOperation: NSCollectionView.DropOperation) -> Bool {
-        #if VERSION_DMG
-        if (!self.canUseAdvanced) {
-            let _ = KMComparativeTableViewController.show(window: self.view.window!, .thumb)
-            return false
-        }
-        #endif
-
         return true
     }
     
     func thumbnailView(thumbanView: KMThumbnailView, shouldPasteboardWriterForItemAt indexPath: IndexPath) -> Bool {
-        #if VERSION_DMG
-        if (!self.canUseAdvanced) {
-            DispatchQueue.main.async {
-                let _ = KMComparativeTableViewController.show(window: self.view.window!, .thumb)
-            }
-            return false
-        }
-        #endif
-        if (!self.canPayFunction) {
-            return false
-        }
-
         return true
     }
     

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarController.swift

@@ -597,14 +597,6 @@ extension KMToolbarController: KMToolbarViewControllerDelegate {
         
         // 高级功能
         Task { @MainActor in
-            #if VERSION_DMG
-            if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                let _ = KMComparativeTableViewController.show(window: self.view.window!)
-                let boxItem = item.clickObject as? KMToolbarItemView
-                boxItem?.isSelected = false
-                return
-            }
-            #endif
             //文字编辑 图片编辑 选中按钮逻辑(只能同时选中其中一个)
             if type == .addText || type == .addImage {
                 let boxItem = item.clickObject as? KMToolbarItemView

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift

@@ -191,13 +191,6 @@ class KMToolbarViewController: NSViewController, NSTextFieldDelegate {
         let tag = KMToolbarViewType(rawValue: item.tag) ?? .None
         if tag == .editPDF {
             Task { @MainActor in
-                #if VERSION_DMG
-                if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                    let _ =  KMComparativeTableViewController.show(window: self.view.window!)
-                    return
-                }
-                #endif
-
                 self.delegate?.toolbarViewController?(self, clickMode: tag, toolbar: item.clickObject as! KMToolbarItemView, [])
             }
         } else {

PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift

@@ -1152,11 +1152,6 @@ extension KMMainViewController {
         self.toolbarController.selectItem(KMToolbarLinkAnnotationItemIdentifier)
         DispatchQueue.main.async {
             Task { @MainActor in
-                #if VERSION_DMG
-                if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                    return
-                }
-                #endif
                 let annotation = self.listView.addAnnotation(with: annotationType, selection: selection, page: selection?.page, bounds: selection!.bounds)
                 self.listView.currentSelection = nil;
                 if (annotation != nil) {
@@ -1180,14 +1175,13 @@ extension KMMainViewController {
     
     @objc func menuItemAnnotationClick_addStype(sender: NSMenuItem) {
         Task { @MainActor in
-            #if VERSION_DMG
-            if (sender.tag == 7 || sender.tag == 8 || sender.tag == 9) {
-                if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                    let _ = KMComparativeTableViewController.show(window: self.view.window!)
+            let idx = sender.tag
+            if idx == 10 {
+                if IAPProductsManager.default().isAvailableAllFunction() == false {
+                    KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
                     return
                 }
             }
-            #endif
 
             var point = mouseRightMenuEvent?.locationInWindow
             if (point == nil) {
@@ -2323,12 +2317,16 @@ extension KMMainViewController {
     @objc func openLeftPane() -> Void {
         leftPanelOpen = true
         applyLeftSideWidth(panelWidth+functionWidth, rightSideWidth: lastRightPanWidth)
+        
+        self.toolbarController.findItem(KMLeftControlToolbarItemIdentifier)?.isSelected = true
     }
     
     // 关闭左边栏
     @objc func closeLeftPane() -> Void {
         leftPanelOpen = false
         applyLeftSideWidth(functionWidth, rightSideWidth: lastRightPanWidth)
+        
+        self.toolbarController.findItem(KMLeftControlToolbarItemIdentifier)?.isSelected = false
     }
     
     // 开启/关闭右边栏
@@ -3449,35 +3447,11 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
     }
     
     func toolbarViewController(_ viewController: KMToolbarViewController, shareFlatten item: NSMenuItem) {
-//        if (!self.saveWatermarkFlag) {
-//            self.shareFlatten(sender: viewController)
-//            return
-//        }
-        Task { @MainActor in
-#if VERSION_DMG
-            if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                let _ = KMComparativeTableViewController.show(window: self.view.window!, .shareFlatten)
-                return
-            }
-#endif
-            if await (KMLightMemberManager.manager.canPayFunction() == false) {
-                KMSubscribeWaterMarkWindowController.show(window: self.view.window!, isContinue: true) { isSubscribeSuccess, isWaterMarkExport, isClose in
-                    if (isClose) {
-                        return
-                    }
-                    if (isSubscribeSuccess) {
-                        self.shareFlatten(sender: viewController)
-                        return
-                    }
-                    if (isWaterMarkExport) {
-                        self.shareFlatten(sender: viewController, limit: true)
-                        return
-                    }
-                }
-                return
-            }
-            self.shareFlatten(sender: viewController)
+        if IAPProductsManager.default().isAvailableAllFunction() == false {
+            KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
+            return
         }
+        self.shareFlatten(sender: viewController)
     }
     
     func toolbarViewController(_ viewController: KMToolbarViewController, shareOriginalPDF item: NSMenuItem) {
@@ -3661,26 +3635,6 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                     identifier = KMToolbarConversionImageItemIdentifier
                 }
                 
-                #if VERSION_DMG
-//                if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-//                    if (identifier != nil) {
-//                        self.toolbarController.cancelSelected(identifier!)
-//                    }
-                    
-//                    let _ = KMComparativeTableViewController.show(window: self.view.window!, .convert)
-//                    return
-//                }
-                #endif
-
-                
-//                if await (KMLightMemberManager.manager.canPayFunction() == false) {
-//                    guard let _url =  KMTools.saveWatermarkDocumentToTemp(document: self.listView.document, secureOptions: self.secureOptions, removePWD: self.removeSecureFlag) else {
-//                        return
-//                    }
-//                    self.showConvertWindow(type: type, documentUrl: _url, identifier: identifier)
-//                    return
-//                }
-                
                 if (self.needSaveDocument()) {
                     self.saveDocumentWithProgressAlert {  [unowned self] params in
                         self.showConvertWindow(type: type, identifier: identifier)

PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+MenuAction.swift

@@ -235,20 +235,7 @@ extension KMMainViewController {
     // rotate
     
     @IBAction func menuItemAction_rotateLeft(_ sender: Any) {
-        Task { @MainActor in
-            #if VERSION_DMG
-            if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                let _ = KMComparativeTableViewController.show(window: self.view.window!)
-                return
-            }
-            #endif
-
-            let page : CPDFPage = self.listView?.currentPage() ?? CPDFPage()
-            let rotation = page.rotation
-            page.leftRotate()
-            
-            self.rotatePageItems(pageItems: [KMThumbnailPageItem(page: page, rotate: page.rotation, oldRotate: rotation)])
-        }
+        self.rotateLeft(sender)
     }
     
     func rotatePageItems(pageItems: [KMThumbnailPageItem]) {
@@ -271,61 +258,15 @@ extension KMMainViewController {
     }
 
     @IBAction func menuItemAction_rotateRight(_ sender: Any) {
-        Task { @MainActor in
-            #if VERSION_DMG
-            if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                let _ = KMComparativeTableViewController.show(window: self.view.window!)
-                return
-            }
-            #endif
-            
-            let page : CPDFPage = self.listView?.currentPage() ?? CPDFPage()
-            let rotation = page.rotation
-            page.rightRotate()
-            
-            self.rotatePageItems(pageItems: [KMThumbnailPageItem(page: page, rotate: page.rotation, oldRotate: rotation)])
-        }
+        self.rotateRight(sender)
     }
 
     @IBAction func menuItemAction_rotateAllPageLeft(_ sender: Any) {
-        Task { @MainActor in
-            #if VERSION_DMG
-            if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                let _ = KMComparativeTableViewController.show(window: self.view.window!)
-                return
-            }
-            #endif
-            
-            var pageItems: [KMThumbnailPageItem] = []
-            for index in 0 ... self.listView.document.pageCount - 1 {
-                let page: CPDFPage = self.listView.document.page(at: index)
-                let rotation = page.rotation
-                page.leftRotate()
-                pageItems.append(KMThumbnailPageItem(page: page, rotate: page.rotation, oldRotate: rotation))
-            }
-
-            self.rotatePageItems(pageItems: pageItems)
-        }
+        self.rotateAllLeft(sender)
     }
 
     @IBAction func menuItemAction_rotateAllPageRight(_ sender: Any) {
-        Task { @MainActor in
-            #if VERSION_DMG
-            if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                let _ = KMComparativeTableViewController.show(window: self.view.window!)
-                return
-            }
-            #endif
-            
-            var pageItems: [KMThumbnailPageItem] = []
-            for index in 0 ... self.listView.document.pageCount - 1 {
-                let page : CPDFPage = self.listView.document.page(at: index)
-                let rotation = page.rotation
-                page.rightRotate()
-                pageItems.append(KMThumbnailPageItem(page: page, rotate: page.rotation, oldRotate: rotation))
-            }
-            self.rotatePageItems(pageItems: pageItems)
-        }
+        self.rotateAllRight(sender)
     }
     
     // split screen
@@ -1241,6 +1182,11 @@ extension KMMainViewController: KMSystemToolMenuProtocol {
     }
     
     func rotateLeft(_ sender: Any?) {
+        if IAPProductsManager.default().isAvailableAllFunction() == false {
+            KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
+            return
+        }
+        
         Task { @MainActor in
             let page : CPDFPage = self.listView?.currentPage() ?? CPDFPage()
             let rotation = page.rotation
@@ -1252,6 +1198,11 @@ extension KMMainViewController: KMSystemToolMenuProtocol {
     }
     
     func rotateRight(_ sender: Any?) {
+        if IAPProductsManager.default().isAvailableAllFunction() == false {
+            KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
+            return
+        }
+        
         Task { @MainActor in
             let page : CPDFPage = self.listView?.currentPage() ?? CPDFPage()
             let rotation = page.rotation
@@ -1263,6 +1214,11 @@ extension KMMainViewController: KMSystemToolMenuProtocol {
     }
     
     func rotateAllLeft(_ sender: Any?) {
+        if IAPProductsManager.default().isAvailableAllFunction() == false {
+            KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
+            return
+        }
+        
         Task { @MainActor in
             var pageItems: [KMThumbnailPageItem] = []
             for index in 0 ... self.listView.document.pageCount - 1 {
@@ -1278,6 +1234,11 @@ extension KMMainViewController: KMSystemToolMenuProtocol {
     }
     
     func rotateAllRight(_ sender: Any?) {
+        if IAPProductsManager.default().isAvailableAllFunction() == false {
+            KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
+            return
+        }
+        
         Task { @MainActor in
             var pageItems: [KMThumbnailPageItem] = []
             for index in 0 ... self.listView.document.pageCount - 1 {

PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController.swift

@@ -247,9 +247,9 @@ let LOCKED_KEY  = "locked"
         self.updateNextAndPreViousButtonState()
         
         KMLightMemberManager.manager.canShowAdvancedView = false
-        Task { @MainActor in
-            await KMLightMemberManager.manager.canUseAdvanced(needNetworking: true)
-        }
+//        Task { @MainActor in
+//            await KMLightMemberManager.manager.canUseAdvanced(needNetworking: true)
+//        }
 //        self.addEventMonitor()
         
         self.view.window?.makeFirstResponder(self.listView)

PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -558,13 +558,13 @@
             filePath = "PDF Master/Class/PDFWindowController/Side/LeftSide/KMLeftSideViewController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1101"
-            endingLineNumber = "1101"
+            startingLineNumber = "1108"
+            endingLineNumber = "1108"
             landmarkName = "_themeChanged(_:)"
             landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "877893A4-191F-4DC0-B4BA-6AD764BA2605 - 3e436c85ec6693d0"
+                  uuid = "877893A4-191F-4DC0-B4BA-6AD764BA2605 - 3e436c85ec6692fb"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -574,12 +574,12 @@
                   urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/LeftSide/KMLeftSideViewController.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "1101"
-                  endingLineNumber = "1101"
+                  startingLineNumber = "1108"
+                  endingLineNumber = "1108"
                   offsetFromSymbolStart = "277">
                </Location>
                <Location
-                  uuid = "877893A4-191F-4DC0-B4BA-6AD764BA2605 - b06821624ed6e2ad"
+                  uuid = "877893A4-191F-4DC0-B4BA-6AD764BA2605 - b06821624ed6e3c4"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -589,8 +589,8 @@
                   urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/LeftSide/KMLeftSideViewController.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "1102"
-                  endingLineNumber = "1102"
+                  startingLineNumber = "1109"
+                  endingLineNumber = "1109"
                   offsetFromSymbolStart = "22">
                </Location>
             </Locations>
@@ -644,5 +644,21 @@
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "DBCBBBFF-C66E-4A6B-9E6C-ED9E07D6C9CF"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/Home/ViewController/KMHomeViewController+Action.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "396"
+            endingLineNumber = "396"
+            landmarkName = "openFile(withFilePath:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>