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

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

@@ -85,51 +85,66 @@ extension KMHomeViewController {
         print("fastToolItemAction + \(type.rawValue)")
         switch type {
         case .Batch:
+            FMTrackEventManager.defaultManager.trackEvent(event: "Onbrd", withProperties: ["HP_Tools": "Batch"])
             fastTool_Batch()
             break
         case .OCR:
+            FMTrackEventManager.defaultManager.trackEvent(event: "Onbrd", withProperties: ["HP_Tools": "OCR"])
             fastTool_OCR()
             break
         case .ConvertPDF:
+            FMTrackEventManager.defaultManager.trackEvent(event: "Onbrd", withProperties: ["HP_Tools": "Convert PDF"])
             fastTool_ConvertPDF()
             break
         case .ImageToPDF:
+            FMTrackEventManager.defaultManager.trackEvent(event: "Onbrd", withProperties: ["HP_Tools": "Image to PDF"])
             fastTool_ImageToPDF()
             break
         case .MergePDF:
+            FMTrackEventManager.defaultManager.trackEvent(event: "Onbrd", withProperties: ["HP_Tools": "Merge"])
             fastTool_MergePDF()
             break
         case .Compression:
+            FMTrackEventManager.defaultManager.trackEvent(event: "Onbrd", withProperties: ["HP_Tools": "Compress"])
             fastTool_Compression()
             break
         case .Security:
+            FMTrackEventManager.defaultManager.trackEvent(event: "Onbrd", withProperties: ["HP_Tools": "Security"])
             fastTool_Security()
             break
         case .FileCompare:
+            FMTrackEventManager.defaultManager.trackEvent(event: "Onbrd", withProperties: ["HP_Tools": "Compare"])
             fastTool_FileCompare()
             break
         case .PDFToPPT:
+            FMTrackEventManager.defaultManager.trackEvent(event: "Onbrd", withProperties: ["HP_Tools": "PDF to PPT"])
             fastTool_PDFToPPT()
             break
         case .PDFToExcel:
+            FMTrackEventManager.defaultManager.trackEvent(event: "Onbrd", withProperties: ["HP_Tools": "PDF to Excel"])
             fastTool_PDFToExcel()
             break
         case .PDFToWord:
+            FMTrackEventManager.defaultManager.trackEvent(event: "Onbrd", withProperties: ["HP_Tools": "PDF to Word"])
             fastTool_PDFToWord()
             break
         case .PDFToImage:
             fastTool_PDFToImage()
             break
         case .Watermark:
+            FMTrackEventManager.defaultManager.trackEvent(event: "Onbrd", withProperties: ["HP_Tools": "Watermark"])
             fastTool_Watermark()
             break
         case .Background:
+            FMTrackEventManager.defaultManager.trackEvent(event: "Onbrd", withProperties: ["HP_Tools": "Background"])
             fastTool_Background()
             break
         case .HeaderAndFooter:
+            FMTrackEventManager.defaultManager.trackEvent(event: "Onbrd", withProperties: ["HP_Tools": "Header&Footer"])
             fastTool_HeaderAndFooter()
             break
         case .BatesCode:
+            FMTrackEventManager.defaultManager.trackEvent(event: "Onbrd", withProperties: ["HP_Tools": "Bates Numbers"])
             fastTool_BatesCode()
             break
         case .Print:
@@ -139,9 +154,11 @@ extension KMHomeViewController {
             fastTool_BatchRemove()
             break
         case .Insert:
+            FMTrackEventManager.defaultManager.trackEvent(event: "Onbrd", withProperties: ["HP_Tools": "Insert"])
             fastTool_Insert()
             break
         case .BreakUp:
+            FMTrackEventManager.defaultManager.trackEvent(event: "Onbrd", withProperties: ["HP_Tools": "Split"])
             fastTool_BreakUp()
             break
         case .Extract:
@@ -154,6 +171,7 @@ extension KMHomeViewController {
             fastTool_AutomaticFormRecognition()
             break
         case .PageEdit:
+            FMTrackEventManager.defaultManager.trackEvent(event: "Onbrd", withProperties: ["HP_Tools": "Page Edit"])
             fastTool_PageEdit()
             break
         case .ComparativeTable:
@@ -162,12 +180,15 @@ extension KMHomeViewController {
         case .equity:
             break
         case .PrintMultipage:
+            FMTrackEventManager.defaultManager.trackEvent(event: "Onbrd", withProperties: ["HP_Tools": "Multiple"])
             self.fastTool_printMultple()
             break
         case .PrintPoster:
+            FMTrackEventManager.defaultManager.trackEvent(event: "Onbrd", withProperties: ["HP_Tools": "Poster"])
             self.fastTool_printPoster()
             break
         case .PrintBooklet:
+            FMTrackEventManager.defaultManager.trackEvent(event: "Onbrd", withProperties: ["HP_Tools": "Booklet"])
             self.fastTool_printBooklet()
             break
         }

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

@@ -906,7 +906,12 @@ let kConvertFileSavePath = (kTempSavePath?.stringByAppendingPathComponent("conve
         
         return path!
     }
-    @IBAction func buttonClicked_MoreConvert(_ sender: Any) {
+    @IBAction func buttonClicked_MoreConvert(_ sender: NSButton) {
+        if sender == self.moreButton {
+            FMTrackEventManager.defaultManager.trackEvent(event: "PUW", withProperties: ["PUW_Btn": "Btn_PUW_Converter_Premium_UnlimitedConvertw"])
+        } else if sender == self.upgradeButton {
+            FMTrackEventManager.defaultManager.trackEvent(event: "PUW", withProperties: ["PUW_Btn": "Btn_PUW_Converter_Premium_Upgrade"])
+        }
 #if VERSION_DMG
         if IAPProductsManager.default().isAvailableAllFunction() && !IAPProductsManager.default().isAvailableAdvancedPDFToOffice() {
             let limitWC = KMPurchaseLimitWindowController.currentLimitWC()

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

@@ -252,6 +252,7 @@ var currentWindowController: KMToolCompareWindowController? = nil
             url = URL(string: "https://www.pdfreaderpro.com/zh-cn/store?product_code=product_2&utm_source=MacAppDmg&utm_campaign=OfficeStoreLink&utm_medium=PdfOfficeStore")
         }
         NSWorkspace.shared.open(url!)
+        FMTrackEventManager.defaultManager.trackOnceEvent(event: "PUW", withProperties: ["PUW_Btn":"Btn_PUW_PDFtoOffice_Buy"])
 #endif
     }
     

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/ViewController/PageDisplay/KMPageDisplayPropertiesViewController.swift

@@ -480,12 +480,15 @@ class KMPageDisplayPropertiesButton: NSButton {
             self.mainController?.selectDisplay(display: isContinuPage ? .singlePageContinuous : .singlePage, viewSettingIsReload: false)
         case 1:
             setDisplayMode(.twoPages)
+            FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_PageDisplay", withProperties: ["SubTbr_Btn": "Btn_SubTbr_PageDisplay_ViewSetting_TwoPages"])
             self.mainController?.selectDisplay(display: isContinuPage ? .twoUpContinuous : .twoUp, viewSettingIsReload: false)
         case 2:
             setDisplayMode(.coverPage)
+            FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_PageDisplay", withProperties: ["SubTbr_Btn": "Btn_SubTbr_PageDisplay_ViewSetting_BookMode"])
             self.mainController?.selectDisplay(display: isContinuPage ? .bookContinuous : .bookMode, viewSettingIsReload: false)
         case 3:
 //            readerModeBlock?(isReaderMode)
+            FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_PageDisplay", withProperties: ["SubTbr_Btn": "Btn_SubTbr_PageDisplay_ViewSetting_ReadMode"])
             self.mainController?.selectDisplay(display: isContinuPage ? .readContinuous : .readModel, viewSettingIsReload: false)
         default:
             break
@@ -525,6 +528,7 @@ class KMPageDisplayPropertiesButton: NSButton {
     
     @IBAction private func splitViewButtonAction(_ sender: KMPageDisplayPropertiesButton) {
 //        [[FMTrackEventManager manager] trackEvent:@"SubTbr_PageDisplay" withProperties:@{@"SubTbr_Btn":@"Btn_SubTbr_PageDisplay_ViewSetting_SplitView"}];
+        FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_PageDisplay", withProperties: ["SubTbr_Btn": "Btn_SubTbr_PageDisplay_ViewSetting_SplitView"])
         
         if sender.tag > 0 && IAPProductsManager.default().isAvailableAllFunction() == false {
             KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
@@ -715,6 +719,9 @@ extension KMPageDisplayPropertiesViewController: NSCollectionViewDelegate, NSCol
 
     func collectionView(_ collectionView: NSCollectionView, didSelectItemsAt indexPaths: Set<IndexPath>) {
         let indexPathArr = Array(indexPaths)
+        
+        FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_PageDisplay", withProperties: ["SubTbr_Btn": "Btn_SubTbr_PageDisplay_ViewSetting_Themes"])
+        
         for indexPath in indexPathArr {
             if IAPProductsManager.default().isAvailableAllFunction() == false {
                 if indexPath.item > 0 {

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift

@@ -500,6 +500,7 @@ extension KMEditImagePropertyViewController {
         if self.listView.editingAreas()?.count ?? 0 < 1 {
             return
         }
+        FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_PageEdit", withProperties: ["SubTbr_Btn": "Btn_SubTbr_PageEdit_Rotate"])
         let areas = self.listView.editingAreas()
         if areas!.count == 1 && (areas!.first is CPDFEditImageArea) {
             let imageArea = areas!.first as! CPDFEditImageArea
@@ -519,6 +520,7 @@ extension KMEditImagePropertyViewController {
         if self.listView.editingAreas()?.count ?? 0 < 1 {
             return
         }
+        FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_PageEdit", withProperties: ["SubTbr_Btn": "Btn_SubTbr_PageEdit_Rotate"])
         let areas = self.listView.editingAreas()
         if areas!.count == 1 && (areas!.first is CPDFEditImageArea) {
             self.listView.rotate(with: self.listView.selectImageAreas, rotate: -90)
@@ -539,6 +541,7 @@ extension KMEditImagePropertyViewController {
         if self.listView.editingAreas()?.count ?? 0 < 1 {
             return
         }
+        FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_PageEdit", withProperties: ["SubTbr_Btn": "Btn_SubTbr_PageEdit_Reverse"])
         let areas = self.listView.editingAreas()
         if areas != nil {
             for item in areas! {
@@ -562,6 +565,7 @@ extension KMEditImagePropertyViewController {
         if self.listView.editingAreas()?.count ?? 0 < 1 {
             return
         }
+        FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_PageEdit", withProperties: ["SubTbr_Btn": "Btn_SubTbr_PageEdit_Reverse"])
         let areas = self.listView.editingAreas()
         if areas != nil {
             for item in areas! {
@@ -618,6 +622,7 @@ extension KMEditImagePropertyViewController {
         if self.listView.selectImageAreas == nil {
             return
         }
+        FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_PageEdit", withProperties: ["SubTbr_Btn": "Btn_SubTbr_PageEdit_Replace"])
         let panel = NSOpenPanel()
         panel.allowsMultipleSelection = false
         panel.allowedFileTypes = ["png","jpg"]

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

@@ -657,16 +657,20 @@ extension KMToolbarController: KMToolbarViewControllerDelegate {
             } else {
                 toolbarItem.isSelected = true
                 self.lastItemBox = toolbarItem
-                if toolMode == .editPDF {
-                    FMTrackEventManager.defaultManager.trackEvent(event: "Tbr", withProperties: ["Tbr_Btn" : "Btn_Tbr_EditPDF"])
-                }
+                self.trackEvent(toolType: toolMode)
             }
         } else {
             if(toolMode != self.toolbarType && toolMode != .LeftPanel) {
-                if let item : KMToolbarItemView = (self.mainToolBarView?.toolbarItemFindItemIdentifiers(value: KMDocumentAnnotationToolbarItemIdentifier)) {
-                    item.isSelected = true
-                    self.lastItemBox = item
+                let item : KMToolbarItemView = (self.mainToolBarView?.toolbarItemFindItemIdentifiers(value: KMDocumentAnnotationToolbarItemIdentifier))!
+                item.isSelected = true
+                self.lastItemBox = item
+                if toolMode == .Select {
+                    FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_Tools", withProperties: ["SubTbr_Btn" : "Btn_SubTbr_Tools_ContentSelection"])
+                }
+                if toolMode == .SelectZoom {
+                    FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_Tools", withProperties: ["SubTbr_Btn" : "Btn_SubTbr_Tools_Zoom"])
                 }
+
             } else if (toolMode == .LeftPanel) {
                 if(toolMode == self.toolbarType) {
                     toolbarItem.isSelected = false
@@ -680,6 +684,28 @@ extension KMToolbarController: KMToolbarViewControllerDelegate {
         self.delegate?.mainToolDidClicked?(self, beforeModel, toolMode, toolbarItem, pages)
     }
     
+    func trackEvent(toolType type: KMToolbarViewType) -> Void {
+        if (type == .Annatiton) {
+            FMTrackEventManager.defaultManager.trackEvent(event: "Tbr", withProperties: ["Tbr_Btn" : "Btn_Tbr_Tools"])
+        } else if (type == .editPDF) {
+            FMTrackEventManager.defaultManager.trackEvent(event: "Tbr", withProperties: ["Tbr_Btn" : "Btn_Tbr_EditPDF"])
+        } else if (type == .Page) {
+            FMTrackEventManager.defaultManager.trackEvent(event: "Tbr", withProperties: ["Tbr_Btn" : "Btn_Tbr_PageEdit"])
+        } else if (type == .Conversion) {
+            
+        } else if (type == .Tool) {
+            FMTrackEventManager.defaultManager.trackEvent(event: "Tbr", withProperties: ["Tbr_Btn" : "Btn_Tbr_Editor"])
+        } else if (type == .Conversion) {
+            FMTrackEventManager.defaultManager.trackEvent(event: "Tbr", withProperties: ["Tbr_Btn" : "Btn_Tbr_Converter"])
+        } else if (type == .Form) {
+            FMTrackEventManager.defaultManager.trackEvent(event: "Tbr", withProperties: ["Tbr_Btn" : "Btn_Tbr_Form"])
+        } else if (type == .FillSign) {
+            FMTrackEventManager.defaultManager.trackEvent(event: "Tbr", withProperties: ["Tbr_Btn" : "Btn_Tbr_Fill & Sign"])
+        } else if (type == .redact) {
+            FMTrackEventManager.defaultManager.trackEvent(event: "Tbr", withProperties: ["Tbr_Btn" : "Btn_Tbr_Redact"])
+        }
+    }
+    
     func showPDFLayoutModeAction(show: Bool) {
         self.delegate?.showPDFLayoutModeAction?(show: show)
     }

PDF Office/PDF Master/Class/PDFWindowController/Tools/FMTrackEventManager.swift

@@ -8,7 +8,7 @@
 import Foundation
 import AppCenterAnalytics
 
-class FMTrackEventManager: NSObject{
+@objcMembers class FMTrackEventManager: NSObject{
     static let defaultManager: FMTrackEventManager = {
         let manager = FMTrackEventManager()
        

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

@@ -915,6 +915,7 @@ extension KMMainViewController {
         if self.listView.selectImageAreas == nil {
             return
         }
+        FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_PageEdit", withProperties: ["SubTbr_Btn": "Btn_SubTbr_PageEdit_Replace"])
         let panel = NSOpenPanel()
         panel.allowsMultipleSelection = false
         panel.allowedFileTypes = ["png","jpg"]
@@ -2831,7 +2832,7 @@ extension KMMainViewController {
             KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
             return
         }
-
+        FMTrackEventManager.defaultManager.trackEvent(event: "Tbr", withProperties: ["Tbr_Btn": "Btn_Tbr_OCR"])
         let com = KMOCRPDFWindowController(cpdfDocument: self.listView.document!, pwd: self.listView.document.password)
         self.km_beginSheet(windowC: com)
     }
@@ -3696,7 +3697,7 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
         }
         
         // 埋点
-        self.trackEvent(toolType: type)
+//        self.trackEvent(toolType: type)
         
         if(type != .Page) {
             if (hasEnterPageEdit()) {
@@ -4498,6 +4499,9 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                     let isSelected = toolbarItem.isSelected
                     self.toolbarController.toolbarType = isSelected ? .None : .viewSetting
                     toolbarItem.isSelected = !isSelected
+                    if toolbarItem.isSelected {
+                        FMTrackEventManager.defaultManager.trackEvent(event: "Tbr", withProperties: ["Tbr_Btn": "Btn_Tbr_PageDisplay"])
+                    }
                     self.toolbarController.clickItem(KMToolbarViewSettingIdentifier)
                     let rightItem = self.toolbarController.findItem(KMRightControlToolbarItemIdentifier)
                     if isSelected {
@@ -4519,6 +4523,9 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                 } else if itemID == KMDocumentDigitalSignToolbarItemIdentifier {
                     self.listView.toolMode = .textToolMode
                     toolbarItem.isSelected = !toolbarItem.isSelected
+                    if toolbarItem.isSelected {
+                        FMTrackEventManager.defaultManager.trackEvent(event: "Tbr", withProperties: ["Tbr_Btn": "Btn_Tbr_DigitalSignature"])
+                    }
                     if self.hasShowDigitalSign() {
                         self.exitDigitalSign()
                     } else {
@@ -4547,6 +4554,7 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                     self.km_beginSheet(windowC: windowC)
                 } else if toolbarItem.itemIdentifier == KMToolbarViewSettingIdentifier {
                     toolbarItem.isSelected = !toolbarItem.isSelected
+                    FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_PageDisplay", withProperties: ["SubTbr_Btn": "Btn_SubTbr_PageDisplay_ViewSetting"])
                     rightSideViewController.mainController = self
                     self.rightSideViewController.isHidden = false
                     self.rightSideViewController.subViewType = .ViewSettings
@@ -4554,6 +4562,7 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                 } else if toolbarItem.itemIdentifier == KMToolbarSnapshotIdentifier {
                     self.listView.takeSnapshot(nil)
                 } else if toolbarItem.itemIdentifier == KMToolbarTTSIdentifier {
+                    FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_PageDisplay", withProperties: ["SubTbr_Btn": "Btn_SubTbr_PageDisplay_ViewSetting"])
                     self.showTTSWindow()
                 } else if toolbarItem.itemIdentifier == KMToolbarConversionOCRIdentifier {
                     self.showOCRWindow()
@@ -4942,25 +4951,21 @@ extension KMMainViewController: KMInteractionProviderProtocol {
 extension KMMainViewController {
     func trackEvent(toolType type: KMToolbarViewType) -> Void {
         if (type == .Annatiton) {
-            KMAnalytics.trackEvent(eventName: "Btn_Tbr_Annotation", parameters: [
-                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.tbr,
-                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.tbr_Btn], platform: .AppCenter, appTarget: .all)
+            FMTrackEventManager.defaultManager.trackEvent(event: "Tbr", withProperties: ["Tbr_Btn" : "Btn_Tbr_Tools"])
         } else if (type == .editPDF) {
-            KMAnalytics.trackEvent(eventName: "Btn_Tbr_EditPDF", parameters: [
-                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.tbr,
-                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.tbr_Btn], platform: .AppCenter, appTarget: .all)
+//            KMAnalytics.trackEvent(eventName: "Btn_Tbr_EditPDF", parameters: [
+//                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.tbr,
+//                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.tbr_Btn], platform: .AppCenter, appTarget: .all)
         } else if (type == .Page) {
-            KMAnalytics.trackEvent(eventName: "Btn_Tbr_PageEdit", parameters: [
-                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.tbr,
-                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.tbr_Btn], platform: .AppCenter, appTarget: .all)
+            FMTrackEventManager.defaultManager.trackEvent(event: "Tbr", withProperties: ["Tbr_Btn" : "Btn_Tbr_PageEdit"])
         } else if (type == .Conversion) {
-            KMAnalytics.trackEvent(eventName: "Btn_Tbr_Converter", parameters: [
-                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.tbr,
-                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.tbr_Btn], platform: .AppCenter, appTarget: .all)
+//            KMAnalytics.trackEvent(eventName: "Btn_Tbr_Converter", parameters: [
+//                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.tbr,
+//                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.tbr_Btn], platform: .AppCenter, appTarget: .all)
         } else if (type == .Tool) {
-            KMAnalytics.trackEvent(eventName: "Btn_Tbr_Tools", parameters: [
-                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.tbr,
-                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.tbr_Btn], platform: .AppCenter, appTarget: .all)
+//            KMAnalytics.trackEvent(eventName: "Btn_Tbr_Tools", parameters: [
+//                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.tbr,
+//                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.tbr_Btn], platform: .AppCenter, appTarget: .all)
         }
     }
     
@@ -4990,53 +4995,86 @@ extension KMMainViewController {
     
     func trackEvent(annotationType type: CAnnotationType) -> Void {
         if (type == .highlight) {
-            KMAnalytics.trackEvent(eventName: "Btn_SubTbr_Highlight", parameters: [
-                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.subTbr_annotation,
-                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.subTbr_Btn], platform: .AppCenter, appTarget: .all)
+            FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_Tools", withProperties: ["SubTbr_Btn" : "Btn_SubTbr_Tools_Highlight"])
+//            KMAnalytics.trackEvent(eventName: "Btn_SubTbr_Highlight", parameters: [
+//                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.subTbr_annotation,
+//                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.subTbr_Btn], platform: .AppCenter, appTarget: .all)
         } else if (type == .underline) {
-            KMAnalytics.trackEvent(eventName: "Btn_SubTbr_Underline", parameters: [
-                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.subTbr_annotation,
-                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.subTbr_Btn], platform: .AppCenter, appTarget: .all)
+            FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_Tools", withProperties: ["SubTbr_Btn" : "Btn_SubTbr_Tools_Underline"])
+//            KMAnalytics.trackEvent(eventName: "Btn_SubTbr_Underline", parameters: [
+//                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.subTbr_annotation,
+//                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.subTbr_Btn], platform: .AppCenter, appTarget: .all)
         } else if (type == .strikeOut) {
-            KMAnalytics.trackEvent(eventName: "Btn_SubTbr_Strikethrough", parameters: [
-                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.subTbr_annotation,
-                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.subTbr_Btn], platform: .AppCenter, appTarget: .all)
+            FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_Tools", withProperties: ["SubTbr_Btn" : "Btn_SubTbr_Tools_Strikethrough"])
+//            KMAnalytics.trackEvent(eventName: "Btn_SubTbr_Strikethrough", parameters: [
+//                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.subTbr_annotation,
+//                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.subTbr_Btn], platform: .AppCenter, appTarget: .all)
         } else if (type == .ink) {
-            KMAnalytics.trackEvent(eventName: "Btn_SubTbr_Draw", parameters: [
-                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.subTbr_annotation,
-                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.subTbr_Btn], platform: .AppCenter, appTarget: .all)
+            FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_Tools", withProperties: ["SubTbr_Btn" : "Btn_SubTbr_Tools_Freehand"])
+//            KMAnalytics.trackEvent(eventName: "Btn_SubTbr_Draw", parameters: [
+//                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.subTbr_annotation,
+//                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.subTbr_Btn], platform: .AppCenter, appTarget: .all)
         } else if (type == .freeText) {
-            KMAnalytics.trackEvent(eventName: "Btn_SubTbr_Text", parameters: [
-                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.subTbr_annotation,
-                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.subTbr_Btn], platform: .AppCenter, appTarget: .all)
+            FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_Tools", withProperties: ["SubTbr_Btn" : "Btn_SubTbr_Tools_TextBox"])
+//            KMAnalytics.trackEvent(eventName: "Btn_SubTbr_Text", parameters: [
+//                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.subTbr_annotation,
+//                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.subTbr_Btn], platform: .AppCenter, appTarget: .all)
         } else if (type == .anchored) {
-            KMAnalytics.trackEvent(eventName: "Btn_SubTbr_Note", parameters: [
-                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.subTbr_annotation,
-                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.subTbr_Btn], platform: .AppCenter, appTarget: .all)
+            FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_Tools", withProperties: ["SubTbr_Btn" : "Btn_SubTbr_Tools_AnchoredNote"])
+//            KMAnalytics.trackEvent(eventName: "Btn_SubTbr_Note", parameters: [
+//                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.subTbr_annotation,
+//                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.subTbr_Btn], platform: .AppCenter, appTarget: .all)
         } else if (type == .square) {
-            KMAnalytics.trackEvent(eventName: "Btn_SubTbr_Shape", parameters: [
-                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.subTbr_annotation,
-                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.subTbr_Btn], platform: .AppCenter, appTarget: .all)
+            FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_Tools", withProperties: ["SubTbr_Btn" : "Btn_SubTbr_Tools_Rectangle"])
+//            KMAnalytics.trackEvent(eventName: "Btn_SubTbr_Shape", parameters: [
+//                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.subTbr_annotation,
+//                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.subTbr_Btn], platform: .AppCenter, appTarget: .all)
         } else if (type == .link) {
-            KMAnalytics.trackEvent(eventName: "Btn_SubTbr_Link", parameters: [
-                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.subTbr_annotation,
-                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.subTbr_Btn], platform: .AppCenter, appTarget: .all)
+            FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_Tools", withProperties: ["SubTbr_Btn" : "Btn_SubTbr_Tools_Link"])
+//            KMAnalytics.trackEvent(eventName: "Btn_SubTbr_Link", parameters: [
+//                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.subTbr_annotation,
+//                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.subTbr_Btn], platform: .AppCenter, appTarget: .all)
         } else if (type == .stamp) {
-            KMAnalytics.trackEvent(eventName: "Btn_SubTbr_Stamp", parameters: [
-                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.subTbr_annotation,
-                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.subTbr_Btn], platform: .AppCenter, appTarget: .all)
+            FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_Tools", withProperties: ["SubTbr_Btn" : "Btn_SubTbr_Tools_Stamp"])
+//            KMAnalytics.trackEvent(eventName: "Btn_SubTbr_Stamp", parameters: [
+//                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.subTbr_annotation,
+//                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.subTbr_Btn], platform: .AppCenter, appTarget: .all)
         } else if (type == .signSignature) {
-            KMAnalytics.trackEvent(eventName: "Btn_SubTbr_Sign", parameters: [
-                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.subTbr_annotation,
-                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.subTbr_Btn], platform: .AppCenter, appTarget: .all)
+            FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_Tools", withProperties: ["SubTbr_Btn" : "Btn_SubTbr_Tools_Signature"])
+//            KMAnalytics.trackEvent(eventName: "Btn_SubTbr_Sign", parameters: [
+//                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.subTbr_annotation,
+//                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.subTbr_Btn], platform: .AppCenter, appTarget: .all)
+        } else if (type == .circle) {
+            FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_Tools", withProperties: ["SubTbr_Btn" : "Btn_SubTbr_Tools_Oval"])
+        } else if (type == .arrow) {
+            FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_Tools", withProperties: ["SubTbr_Btn" : "Btn_SubTbr_Tools_Arrow"])
+        } else if (type == .line) {
+            FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_Tools", withProperties: ["SubTbr_Btn" : "Btn_SubTbr_Tools_Line"])
         } else if (type == .addText) {
             KMAnalytics.trackEvent(eventName: "Btn_SubTbr_AddText", parameters: [
                 KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.subTbr_editPDF,
                 KMAnalytics.Parameter.labelKey : KMAnalytics.Label.subTbr_Btn], platform: .AppCenter, appTarget: .all)
         } else if (type == .addImage) {
-            KMAnalytics.trackEvent(eventName: "Btn_SubTbr_AddImage", parameters: [
-                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.subTbr_editPDF,
-                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.subTbr_Btn], platform: .AppCenter, appTarget: .all)
+            FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_Tools", withProperties: ["SubTbr_Btn" : "Btn_SubTbr_Tools_Image"])
+//            KMAnalytics.trackEvent(eventName: "Btn_SubTbr_AddImage", parameters: [
+//                KMAnalytics.Parameter.categoryKey : KMAnalytics.Category.subTbr_editPDF,
+//                KMAnalytics.Parameter.labelKey : KMAnalytics.Label.subTbr_Btn], platform: .AppCenter, appTarget: .all)
+        } else if (type == .textField) {
+            FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_Form", withProperties: ["SubTbr_Btn" : "Btn_SubTbr_Form_TextField"])
+        } else if (type == .checkBox) {
+            FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_Form", withProperties: ["SubTbr_Btn" : "Btn_SubTbr_Form_CheckBox"])
+        } else if (type == .radioButton) {
+            FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_Form", withProperties: ["SubTbr_Btn" : "Btn_SubTbr_Form_RadioButton"])
+        } else if (type == .listMenu) {
+            FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_Form", withProperties: ["SubTbr_Btn" : "Btn_SubTbr_Form_ListBox"])
+        } else if (type == .comboBox) {
+            FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_Form", withProperties: ["SubTbr_Btn" : "Btn_SubTbr_Form_ComboBox"])
+        } else if (type == .actionButton) {
+            FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_Form", withProperties: ["SubTbr_Btn" : "Btn_SubTbr_Form_Button"])
+        } else if (type == .actionButton) {
+            FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_Form", withProperties: ["SubTbr_Btn" : "Btn_SubTbr_Form_Button"])
+        } else if (type == .signature) {
+            FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_Form", withProperties: ["SubTbr_Btn" : "Btn_SubTbr_Form_Signature"])
         } else {
             
         }

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

@@ -132,10 +132,6 @@ extension KMMainViewController: KMToolbarControllerDelegate {
             KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
             return
         }
-
-        if let type = CAnnotationType(rawValue: item.tag) {
-            self.trackEvent(annotationType: type)
-        }
         
         if (self.rightMouseEventing) {
             self.rightMouseEventing = false
@@ -174,6 +170,9 @@ extension KMMainViewController: KMToolbarControllerDelegate {
             self.listView.annotationType = .unkown
             self.closeRightPane()
         } else {
+            if let type = CAnnotationType(rawValue: item.tag) {
+                self.trackEvent(annotationType: type)
+            }
             if self.listView.currentSelection != nil {
               let annotation = self.listView.addAnnotation(with: CAnnotationType(rawValue: item.tag) ?? CAnnotationType.unkown, selection: self.listView.currentSelection, page: self.listView.currentSelection.page, bounds: self.listView.currentSelection.bounds)
                 if((annotation != nil) &&

PDF Office/PDF Master/Class/Purchase/Appstore/KMPurchaseCompareWindowController.m

@@ -337,7 +337,7 @@ static NSString *const KMPurchaseCompareCellIdentifier       = @"KMPurchaseCompa
         if (btn.tag == 10001) {
             if (ActivityStatusNone == [VerificationManager manager].status ||
                 ActivityStatusTrialExpire == [VerificationManager manager].status ) {
-//                [[FMTrackEventManager manager] trackEvent:@"Tbr" withProperties:@{@"Tbr_Btn":@"Btn_Tbr_SecondTrial"}];
+                [[FMTrackEventManager defaultManager] trackEventWithEvent:@"Tbr" withProperties:@{@"Tbr_Btn":@"Btn_Tbr_SecondTrial"}];
                 [[VerificationManager manager] trialForDays:7
                                                       email:email?:[VerificationManager manager].email
                                                        name:name?:[VerificationManager manager].accountName
@@ -371,7 +371,7 @@ static NSString *const KMPurchaseCompareCellIdentifier       = @"KMPurchaseCompa
                 url = [NSURL URLWithString:@"https://www.pdfreaderpro.com/zh-cn/store?utm_source=app_dmg&utm_medium=dmg_puw_free_trial"];
             }
             [[NSWorkspace sharedWorkspace] openURL:url];
-//            [[FMTrackEventManager manager] trackEvent:@"PUW" withProperties:@{@"PUW_Btn":@"PUW_Btn_UpgradeBuyNow"}];
+            [[FMTrackEventManager defaultManager] trackEventWithEvent:@"PUW" withProperties:@{@"PUW_Btn":@"PUW_Btn_UpgradeBuyNow"}];
 #endif
         } else if (btn.tag == 10003) {
 #if VERSION_DMG
@@ -525,6 +525,7 @@ static NSString *const KMPurchaseCompareCellIdentifier       = @"KMPurchaseCompa
 }
 
 - (BOOL)windowShouldClose:(id)sender {
+    [[FMTrackEventManager defaultManager] trackEventWithEvent:@"PUW" withProperties:@{@"PUW_Btn":@"PUW_Btn_Upgrade_Cancel"}];
     [self endModal:sender];
     return YES;
 }
@@ -774,7 +775,7 @@ static NSString *const KMPurchaseCompareCellIdentifier       = @"KMPurchaseCompa
 - (IBAction)buttonItemClicked_Subscribe:(id)sender {
     [[IAPProductsManager defaultManager] makeProduct:[IAPProductsManager defaultManager].newlyMonthProduct];
     [self addWaingView:self.window.contentView];
-     
+    [[FMTrackEventManager defaultManager] trackEventWithEvent:@"PUW" withProperties:@{@"PUW_Btn":@"PUW_Btn_Upgrade_6Mon"}];
 }
 
 - (IBAction)buttonItemClicked_Restore:(id)sender {
@@ -784,7 +785,7 @@ static NSString *const KMPurchaseCompareCellIdentifier       = @"KMPurchaseCompa
 
 - (IBAction)buttonItemClicked_Upgrade:(id)sender {
     [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"macappstore://apps.apple.com/app/id825459243?mt=12"]];
-    
+    [[FMTrackEventManager defaultManager] trackEventWithEvent:@"PUW" withProperties:@{@"PUW_Btn":@"PUW_Btn_Upgrade_Premium"}];
 }
 
 - (IBAction)privacyPolicyAction:(NSButton *)sender {
@@ -798,6 +799,7 @@ static NSString *const KMPurchaseCompareCellIdentifier       = @"KMPurchaseCompa
 - (IBAction)buttonItemClicked_LicenseUpgrade:(id)sender {
     [[IAPProductsManager defaultManager] makeProduct:[IAPProductsManager defaultManager].allAccessProduct];
     [self addWaingView:self.window.contentView];
+    [[FMTrackEventManager defaultManager] trackEventWithEvent:@"PUW" withProperties:@{@"PUW_Btn":@"PUW_Btn_Upgrade_Permanent"}];
 }
 
 

PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseCompareDMGWindowController.m

@@ -580,7 +580,7 @@ static NSString *const KMPurchaseCompareDMGCellIdentifier       = @"KMPurchaseCo
         url = [NSURL URLWithString:@"https://www.pdfreaderpro.com/zh-cn/store?utm_source=app_dmg&utm_medium=dmg_puw_comparison"];
     }
     [[NSWorkspace sharedWorkspace] openURL:url];
-//    [[FMTrackEventManager manager] trackEvent:@"PUW" withProperties:@{@"PUW_Btn":@"PUW_Btn_UpgradeBuyNow"}];
+    [[FMTrackEventManager defaultManager] trackEventWithEvent:@"PUW" withProperties:@{@"PUW_Btn":@"PUW_Btn_UpgradeBuyNow"}];
 #endif
     
 }
@@ -597,7 +597,7 @@ static NSString *const KMPurchaseCompareDMGCellIdentifier       = @"KMPurchaseCo
 //        [vc showWindow:nil];
 //    } else if (ActivityStatusTrialExpire == [VerificationManager manager].status) {
         if ([VerificationManager manager].secondTrialEnabled) {
-//            [[FMTrackEventManager manager] trackEvent:@"Tbr" withProperties:@{@"Tbr_Btn":@"Btn_Tbr_SecondTrial"}];
+            [[FMTrackEventManager defaultManager] trackEventWithEvent:@"Tbr" withProperties:@{@"Tbr_Btn":@"Btn_Tbr_SecondTrial"}];
             [[VerificationManager manager] trialForDays:7
                                                   email:[VerificationManager manager].email
                                                    name:[VerificationManager manager].accountName
@@ -638,7 +638,7 @@ static NSString *const KMPurchaseCompareDMGCellIdentifier       = @"KMPurchaseCo
     NSURL *url = [NSURL URLWithString:kAIStoreServerLink];
     [[NSWorkspace sharedWorkspace] openURL:url];
     
-//    [[FMTrackEventManager manager] trackEvent:@"PUW" withProperties:@{@"PUW_Btn":@"PUW_Btn_BuyAITools"}];
+    [[FMTrackEventManager defaultManager] trackEventWithEvent:@"PUW" withProperties:@{@"PUW_Btn":@"PUW_Btn_BuyAITools"}];
 }
 
 #pragma mark - Noti

PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseFirstTrialWindowController.swift

@@ -412,7 +412,7 @@ import Cocoa
         }
         
         callBack(self,sender,self.emailTextField.stringValue,self.nameTextField.stringValue)
-//        FMTrackEventManager.default().trackOnceEvent("PUW", withProperties: ["PUW_Btn":"Btn_PUW_ActivateTrialNow"])
+        FMTrackEventManager.defaultManager.trackOnceEvent(event: "PUW", withProperties: ["PUW_Btn":"Btn_PUW_ActivateTrialNow"])
     }
     
     @IBAction func buyNowAction(_ sender: HyperLinkButton) {
@@ -420,7 +420,7 @@ import Cocoa
             return
         }
         callBack(self,sender,self.emailTextField.stringValue,self.nameTextField.stringValue)
-//        FMTrackEventManager.default().trackOnceEvent("PUW", withProperties: ["PUW_Btn":"Btn_PUW_BuyNow"])
+        FMTrackEventManager.defaultManager.trackOnceEvent(event: "PUW", withProperties: ["PUW_Btn":"Btn_PUW_BuyNow"])
     }
     
     @IBAction func enterLicenseAction(_ sender: HyperLinkButton) {
@@ -428,7 +428,7 @@ import Cocoa
             return
         }
         callBack(self,sender,self.emailTextField.stringValue,self.nameTextField.stringValue)
-//        FMTrackEventManager.default().trackOnceEvent("PUW", withProperties: ["PUW_Btn":"Btn_PUW_Enter_The_License"])
+        FMTrackEventManager.defaultManager.trackOnceEvent(event: "PUW", withProperties: ["PUW_Btn":"Btn_PUW_Enter_The_License"])
     }
     
     //MARK: NSTextFieldDelegate

PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseLimitWindowController.swift

@@ -163,7 +163,7 @@ class KMPurchaseLimitWindowController: NSWindowController {
             url = URL(string: "https://www.pdfreaderpro.com/zh-cn/store?product_code=product_2&utm_source=MacAppDmg&utm_campaign=OfficeStoreLink&utm_medium=PdfOfficeStore")!
         }
         NSWorkspace.shared.open(url)
-//        FMTrackEventManager.default().trackOnceEvent("PUW", withProperties: ["PUW_Btn":"Btn_PUW_PDFtoOffice_Buy"])
+        FMTrackEventManager.defaultManager.trackOnceEvent(event: "PUW", withProperties: ["PUW_Btn":"Btn_PUW_PDFtoOffice_Buy"])
     }
     
     @IBAction func continueConvertAction(_ sender: Any) {

PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMRepeatTrialAlertController.m

@@ -198,12 +198,12 @@
         if (self.callback) {
             self.callback(0, self);
         }
-//        [[FMTrackEventManager manager] trackOnceEvent:@"PUW" withProperties:@{@"PUW_Btn":@"Btn_PUW_DigitalSignTrial_Start"}];
+        [[FMTrackEventManager defaultManager] trackEventWithEvent:@"PUW" withProperties:@{@"PUW_Btn":@"Btn_PUW_DigitalSignTrial_Start"}];
     } else if ([sender isEqual:self.learnMoreButton]) {
         if (self.callback) {
             self.callback(1, self);
         }
-//        [[FMTrackEventManager manager] trackOnceEvent:@"PUW" withProperties:@{@"PUW_Btn":@"Btn_PUW_DigitalSignTrial_LearnMore"}];
+        [[FMTrackEventManager defaultManager] trackEventWithEvent:@"PUW" withProperties:@{@"PUW_Btn":@"Btn_PUW_DigitalSignTrial_LearnMore"}];
     } else if ([sender isEqual:self.enterLicenseButton]) {
         if (self.callback) {
             self.callback(2, self);

PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMVerificationMessageViewController.m

@@ -383,7 +383,7 @@ NSPopoverDelegate>
                 if (ActivityStatusNone == [VerificationManager manager].status ||
                     ActivityStatusTrialExpire == [VerificationManager manager].status) {
 
-//                    [[FMTrackEventManager manager] trackEvent:@"Tbr" withProperties:@{@"Tbr_Btn":@"Btn_Tbr_SecondTrial"}];
+                    [[FMTrackEventManager defaultManager] trackEventWithEvent:@"Tbr" withProperties:@{@"Tbr_Btn":@"Btn_Tbr_SecondTrial"}];
                     [[VerificationManager manager] trialForDays:7
                                                           email:email?:[VerificationManager manager].email
                                                            name:name?:[VerificationManager manager].accountName
@@ -416,7 +416,7 @@ NSPopoverDelegate>
                     url = [NSURL URLWithString:@"https://www.pdfreaderpro.com/zh-cn/store?utm_source=app_dmg&utm_medium=dmg_puw_free_trial"];
                 }
                 [[NSWorkspace sharedWorkspace] openURL:url];
-//                [[FMTrackEventManager manager] trackEvent:@"PUW" withProperties:@{@"PUW_Btn":@"PUW_Btn_UpgradeBuyNow"}];
+                [[FMTrackEventManager defaultManager] trackEventWithEvent:@"PUW" withProperties:@{@"PUW_Btn":@"PUW_Btn_UpgradeBuyNow"}];
             } else if (btn.tag == 10003) {
                 KMVerificationWindowController *vc = [KMVerificationWindowController verificationWithType:KMVerificationTypeActivate];//KMVerificationTypeActivate
                 [vc showWindow:nil];
@@ -448,7 +448,7 @@ NSPopoverDelegate>
                         url = [NSURL URLWithString:@"https://www.pdfreaderpro.com/zh-cn/store"];
                     }
                     [[NSWorkspace sharedWorkspace] openURL:url];
-//                    [[FMTrackEventManager manager] trackEvent:@"PUW" withProperties:@{@"PUW_Btn":@"Btn_PUW_BuyNow-Expire"}];
+                    [[FMTrackEventManager defaultManager] trackEventWithEvent:@"PUW" withProperties:@{@"PUW_Btn":@"Btn_PUW_BuyNow-Expire"}];
                 }
             };
         self.testVC.mouseEventCall = ^(BOOL mouseEnter) {
@@ -486,7 +486,7 @@ NSPopoverDelegate>
                 url = [NSURL URLWithString:@"https://www.pdfreaderpro.com/zh-cn/store?product_code=product_2"];
             }
             [[NSWorkspace sharedWorkspace] openURL:url];
-//            [[FMTrackEventManager manager] trackEvent:@"Tbr" withProperties:@{@"Tbr_Btn":@"Btn_Tbr_PDFtoOffice"}];
+            [[FMTrackEventManager defaultManager] trackEventWithEvent:@"Tbr" withProperties:@{@"Tbr_Btn":@"Btn_Tbr_PDFtoOffice"}];
         }
     } else {
         if ([VerificationManager manager].needUpgradeLicense) {
@@ -495,7 +495,7 @@ NSPopoverDelegate>
                 url = [NSURL URLWithString:@"https://www.pdfreaderpro.com/zh-cn/store?product_code=product_2"];
             }
             [[NSWorkspace sharedWorkspace] openURL:url];
-//            [[FMTrackEventManager manager] trackEvent:@"Tbr" withProperties:@{@"Tbr_Btn":@"Btn_Tbr_PDFtoOffice"}];
+            [[FMTrackEventManager defaultManager] trackEventWithEvent:@"Tbr" withProperties:@{@"Tbr_Btn":@"Btn_Tbr_PDFtoOffice"}];
         } else {
             KMVerificationWindowController *vc = [KMVerificationWindowController verificationWithType:KMVerificationTypeNormal];
             [vc showWindow:nil];
@@ -544,7 +544,7 @@ NSPopoverDelegate>
 
 - (IBAction)AIButtonAction:(NSButton *)sender {
     __block typeof(self) blockSelf = self;
-
+    [[FMTrackEventManager defaultManager] trackEventWithEvent:@"Tbr" withProperties:@{@"Tbr_Btn":@"Btn_Tbr_AICredit"}];
     [[AIInfoManager defaultManager] fetchAIInfoWithComplention:^(NSDictionary *info, NSError *error) {
             
     }];
@@ -557,6 +557,7 @@ NSPopoverDelegate>
         
         [[AIPurchaseWindowController currentWC] showWindow:nil];
 #endif
+        [[FMTrackEventManager defaultManager] trackEventWithEvent:@"Tbr" withProperties:@{@"Tbr_Btn":@"Btn_Tbr_AICredit_BuyNow"}];
     };
     controller.enterLicenseHandle = ^(AIUserInfoController * _Nonnull vc) {
         KMVerificationWindowController *verifyVC = [KMVerificationWindowController verificationWithType:KMVerificationTypeActivateAIInfo];

PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMVerificationWindowController.m

@@ -251,7 +251,7 @@ static KMVerificationWindowController *_currentWindowController = nil;
             }
             [[NSWorkspace sharedWorkspace] openURL:url];
 #endif
-//            [[FMTrackEventManager manager] trackEvent:@"PUW" withProperties:@{@"PUW_Btn":@"Btn_PUW_BuyNow-Trial"}];
+            [[FMTrackEventManager defaultManager] trackEventWithEvent:@"PUW" withProperties:@{@"PUW_Btn":@"Btn_PUW_BuyNow-Trial"}];
             [blockSelf close];
         };
     }
@@ -323,10 +323,10 @@ static KMVerificationWindowController *_currentWindowController = nil;
             if (clickIndex == 0) {
                 [blockSelf setContentView:blockSelf.activateViewController.view];
             } else if (clickIndex == 1) {
-//                [[FMTrackEventManager manager] trackEvent:@"PUW" withProperties:@{@"PUW_Btn":@"Btn_PUW_SecondTrialExpire_Later"}];
+                [[FMTrackEventManager defaultManager] trackEventWithEvent:@"PUW" withProperties:@{@"PUW_Btn":@"Btn_PUW_SecondTrialExpire_Later"}];
                 [blockSelf close];
             } else if (clickIndex == 2) {
-//                [[FMTrackEventManager manager] trackEvent:@"PUW" withProperties:@{@"PUW_Btn":@"Btn_PUW_SecondTrialExpire_Buy"}];
+                [[FMTrackEventManager defaultManager] trackEventWithEvent:@"PUW" withProperties:@{@"PUW_Btn":@"Btn_PUW_SecondTrialExpire_Buy"}];
                 [blockSelf verificationBuy];
             }
         };