Explorar el Código

【2025】【埋点】旧埋点数据删除

niehaoyu hace 1 semana
padre
commit
7b81bfe93e
Se han modificado 17 ficheros con 45 adiciones y 882 borrados
  1. 1 1
      PDF Office/PDF Master/Class/AIInfo/AIPurchaseWindowController/AIPurchaseWindowController.swift
  2. 0 6
      PDF Office/PDF Master/Class/Account/CancelSubscribe/Window/KMCancelSubscribeCouponsWindowController.swift
  3. 0 23
      PDF Office/PDF Master/Class/Account/CancelSubscribe/Window/KMCancelSubscribeSuccessWindowController.swift
  4. 3 3
      PDF Office/PDF Master/Class/Account/CheckIn/Window/KMCheckInWindowController.swift
  5. 0 4
      PDF Office/PDF Master/Class/Account/NewUserGift/Window/KMNewUserGiftWindowController.swift
  6. 0 183
      PDF Office/PDF Master/Class/Analytics/KMAnalytics+KMExtensions.swift
  7. 4 90
      PDF Office/PDF Master/Class/Analytics/KMAnalytics.swift
  8. 7 9
      PDF Office/PDF Master/Class/GuideInfo/NewUserGuide/Window/KMNewUserGuideWindowController.swift
  9. 3 49
      PDF Office/PDF Master/Class/MemberCenter/Model/KMMemberInfo.swift
  10. 0 2
      PDF Office/PDF Master/Class/MemberCenter/ViewModel/KMProductModel.swift
  11. 13 15
      PDF Office/PDF Master/Class/MemberCenter/WindowsController/KMProductCompareWC.swift
  12. 0 3
      PDF Office/PDF Master/Class/PDFTools/Print/PrintHelper/PrintManage/KMPDFPrintManageWindowController.m
  13. 0 1
      PDF Office/PDF Master/Class/PDFWindowController/TabWindowController/KMTabbingHintWindowController.swift
  14. 6 16
      PDF Office/PDF Master/Class/Purchase/Appstore/KMPurchaseCompareWindowController.m
  15. 1 2
      PDF Office/PDF Master/Class/Purchase/DMG/DMGEmbeddedOldWC.swift
  16. 2 469
      PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseCompareDMGWindowController.m
  17. 5 6
      PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseEmbeddedWindowController.swift

+ 1 - 1
PDF Office/PDF Master/Class/AIInfo/AIPurchaseWindowController/AIPurchaseWindowController.swift

@@ -265,7 +265,7 @@ class AIPurchaseWindowController: NSWindowController, NSWindowDelegate {
             self.reloadData()
             
             if (self.isAIPurchase == true) {
-                self.trackEvent(eventName: self.kEventName, params: self.kEventParams, platform: .firebase)
+
             }
             
             //Appstore购买结束后绑定票据信息

+ 0 - 6
PDF Office/PDF Master/Class/Account/CancelSubscribe/Window/KMCancelSubscribeCouponsWindowController.swift

@@ -139,15 +139,11 @@ class KMCancelSubscribeCouponsWindowController: KMNBaseWindowController {
         winC.orientationType = .lite_Base
 #endif
         winC.openWindow(discountType: .advancedYearSubscribeTrialingCancel)
-        
-        winC.kEventName = "Purchase_Campaign"
-        winC.kEventParams = ["Campaign_NewUser" : "PUW_CancelTrial_Price_Coupon"]
     }
     
     // MARK: - Actions
     
     @objc func closeAction() {
-        trackEvent(eventName: "PUW_2", params: ["PUW_Btn" : "CancelFreeTrial_Price_CancelCouponCode"], platform: .AppCenter)
         
         closeWindow()
     }
@@ -155,8 +151,6 @@ class KMCancelSubscribeCouponsWindowController: KMNBaseWindowController {
     @objc func submitAction() {
         closeWindow()
         
-        trackEvent(eventName: "PUW_2", params: ["PUW_Btn" : "CancelFreeTrial_Price_GetCouponCode"], platform: .AppCenter)
-        
         openCompareWindow()
     }
 }

+ 0 - 23
PDF Office/PDF Master/Class/Account/CancelSubscribe/Window/KMCancelSubscribeSuccessWindowController.swift

@@ -148,8 +148,6 @@ let kKMAdvancedYearSubscribedOfTrial            = "KMAdvancedYearSubscribedOfTri
         } else {
             KMDataManager.ud_set(true, forKey: hasShowKey_)
         }
-        
-        trackEvent(eventName: "PUW_2", params: ["PUW_Exposure" : "PUW_CancelFreeTrial"], platform: .AppCenter)
     }
     
     public func selectType(_ type: KMCancelSubscribeSuccessType) {
@@ -209,9 +207,6 @@ let kKMAdvancedYearSubscribedOfTrial            = "KMAdvancedYearSubscribedOfTri
             return
         }
 #endif
-        
-        trackEvent(eventName: "PUW_2", params: ["PUW_Exposure" : "CancelFreeTrial_Price_CouponCode"], platform: .AppCenter)
-        
         recordCouponsShow()
         recordAppLaunchCountOfCoupons()
         
@@ -317,8 +312,6 @@ let kKMAdvancedYearSubscribedOfTrial            = "KMAdvancedYearSubscribedOfTri
             return
         }
         
-        _trackEvent(type: model.type)
-        
         let modelV = KMIsDMGVersion() ? "Dmg" : "Mac"
         let params: [String : Any] = [
             "model" : modelV,
@@ -345,8 +338,6 @@ let kKMAdvancedYearSubscribedOfTrial            = "KMAdvancedYearSubscribedOfTri
             self.openCouponsWindow()
         }
         
-        trackEvent(eventName: "PUW_2", params: ["PUW_Btn" : "CancelFreeTrial_Cancel"], platform: .AppCenter)
-        
         self.closeWindow()
     }
     
@@ -429,20 +420,6 @@ let kKMAdvancedYearSubscribedOfTrial            = "KMAdvancedYearSubscribedOfTri
         }
     }
     
-    private func _trackEvent(type: KMCancelSubscribeSuccessType) {
-        if type == .unsatisfiedFunctions {
-            trackEvent(eventName: "PUW_2", params: ["PUW_Btn" : "CancelFreeTrial_LackFunction"], platform: .AppCenter)
-        } else if type == .priceInappropriate {
-            trackEvent(eventName: "PUW_2", params: ["PUW_Btn" : "CancelFreeTrial_Price"], platform: .AppCenter)
-        } else if type == .tooManyBugs {
-            trackEvent(eventName: "PUW_2", params: ["PUW_Btn" : "CancelFreeTrial_Bugs"], platform: .AppCenter)
-        } else if type == .accidentallySubscribed {
-            trackEvent(eventName: "PUW_2", params: ["PUW_Btn" : "CancelFreeTrial_AccidentlyPurchase"], platform: .AppCenter)
-        } else if type == .other {
-            trackEvent(eventName: "PUW_2", params: ["PUW_Btn" : "CancelFreeTrial_Others"], platform: .AppCenter)
-        }
-    }
-    
     private func _showCenter(animate: Bool){
         guard let screenFrame = NSScreen.main?.frame else {
             return

+ 3 - 3
PDF Office/PDF Master/Class/Account/CheckIn/Window/KMCheckInWindowController.swift

@@ -260,11 +260,11 @@ class KMCheckInWindowController: KMNBaseWindowController {
     
     private func _trackEvent(dayNum: Int) {
         if dayNum == 1 {
-            trackEvent(eventName: "PUW_2", params: ["PUW_Exposure" : "CumulativeOnline_1Day"], platform: .AppCenter)
+
         } else if dayNum == 3 {
-            trackEvent(eventName: "PUW_2", params: ["PUW_Exposure" : "CumulativeOnline_3Day"], platform: .AppCenter)
+
         } else if dayNum == 7 {
-            trackEvent(eventName: "PUW_2", params: ["PUW_Exposure" : "CumulativeOnline_7Day"], platform: .AppCenter)
+
         }
     }
     

+ 0 - 4
PDF Office/PDF Master/Class/Account/NewUserGift/Window/KMNewUserGiftWindowController.swift

@@ -164,8 +164,6 @@ import Cocoa
     // MARK: - Actions
     
     @objc func submitAction() {
-        trackEvent(eventName: "PUW", params: ["PUW_Btn" : "Welcom_Signin"], platform: .AppCenter)
-        
         saveShowRecord()
         
         closeWindow()
@@ -173,7 +171,6 @@ import Cocoa
     }
     
     @objc func closeAction() {
-        trackEvent(eventName: "PUW", params: ["PUW_Btn" : "Welcom_Cancel"], platform: .AppCenter)
         
         saveShowRecord()
         
@@ -264,7 +261,6 @@ import Cocoa
         _showCenter(animate: false)
         window?.makeKeyAndOrderFront(nil)
         
-        trackEvent(eventName: "PUW", params: ["PUW_Exposure" : "PUW_WelcomGift"], platform: .AppCenter)
     }
     
     public func closeWindow() {

+ 0 - 183
PDF Office/PDF Master/Class/Analytics/KMAnalytics+KMExtensions.swift

@@ -7,186 +7,3 @@
 
 import Foundation
 
-// 数据埋点 Category 参数
-extension KMAnalytics.Parameter.Category {
-    public static let purchase_Tools        = "Purchase_Tools"
-    public static let purchase_PageEdit     = "Purchase_PageEdit"
-    public static let purchase_Editor       = "Purchase_Editor"
-    public static let purchase_Converter    = "Purchase_Converter"
-    
-    public static let purchase_Form         = "Purchase_Form"
-    public static let purchase_Sign         = "Purchase_Sign"
-    public static let purchase_EditPDF      = "Purchase_EditPDF"
-    public static let purchase_Redact       = "Purchase_Redact"
-    
-    public static let purchase_OCR          = "Purchase_OCR"
-    public static let purchase_PageDisplay  = "Purchase_PageDisplay"
-    public static let purchase_Others       = "Purchase_Others"
-}
-
-@objc extension NSViewController {
-    private static var _eventNameKey = "KMEventNameKey"
-    var kEventName: String? {
-        get {
-            return objc_getAssociatedObject(self, &Self._eventNameKey) as? String
-        }
-        set {
-            objc_setAssociatedObject(self, &Self._eventNameKey, newValue, .OBJC_ASSOCIATION_COPY_NONATOMIC)
-        }
-    }
-    
-    private static var _eventParamsKey = "KMEventParamsKey"
-    var kEventParams: [String : Any]? {
-        get {
-            return objc_getAssociatedObject(self, &Self._eventParamsKey) as? [String : Any]
-        }
-        set {
-            objc_setAssociatedObject(self, &Self._eventParamsKey, newValue, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
-        }
-    }
-    
-    private static var _eventTagKey = "KMEventTagKey"
-    var kEventTag: Int {
-        get {
-            return objc_getAssociatedObject(self, &Self._eventTagKey) as? Int ?? 0
-        }
-        set {
-            objc_setAssociatedObject(self, &Self._eventTagKey, newValue, .OBJC_ASSOCIATION_ASSIGN)
-        }
-    }
-    
-    @objc func trackEvent_buyNow_tool(type: CAnnotationType, index: Int) {
-        KMAnalytics._trackEvent_buyNow_tool(type: type, index: index, appTarget: .all)
-    }
-    
-    // MARK: - Track Events Basic
-    
-    @objc func trackEvent(eventName eveN: String, params: [String : Any]?, platform: KMAnalyticsPlatform) {
-        KMAnalytics.trackEvent(eventName: eveN, parameters: params, platform: platform, appTarget: .all)
-    }
-    
-    @objc func trackEvent_dmg(eventName eveN: String, params: [String : Any]?, platform: KMAnalyticsPlatform) {
-        KMAnalytics.trackEvent(eventName: eveN, parameters: params, platform: platform, appTarget: .dmg)
-    }
-    
-    @objc func trackEvent_free(eventName eveN: String, params: [String : Any]?, platform: KMAnalyticsPlatform) {
-        KMAnalytics.trackEvent(eventName: eveN, parameters: params, platform: platform, appTarget: .free)
-    }
-    
-    @objc func trackEvent_pro(eventName eveN: String, params: [String : Any]?, platform: KMAnalyticsPlatform) {
-        KMAnalytics.trackEvent(eventName: eveN, parameters: params, platform: platform, appTarget: .pro)
-    }
-    
-    @objc func trackEvent_appstore(eventName eveN: String, params: [String : Any]?, platform: KMAnalyticsPlatform) {
-        KMAnalytics.trackEvent(eventName: eveN, parameters: params, platform: platform, appTarget: [.free, .pro])
-    }
-    
-    func clearEventData() {
-        self.kEventName = nil
-        self.kEventTag = 0
-        self.kEventParams = nil
-    }
-}
-
-@objc extension NSWindowController {
-    private static var _eventNameKey = "KMEventNameKey"
-    var kEventName: String? {
-        get {
-            return objc_getAssociatedObject(self, &Self._eventNameKey) as? String
-        }
-        set {
-            objc_setAssociatedObject(self, &Self._eventNameKey, newValue, .OBJC_ASSOCIATION_COPY_NONATOMIC)
-        }
-    }
-    
-    private static var _eventParamsKey = "KMEventParamsKey"
-    var kEventParams: [String : Any]? {
-        get {
-            return objc_getAssociatedObject(self, &Self._eventParamsKey) as? [String : Any]
-        }
-        set {
-            objc_setAssociatedObject(self, &Self._eventParamsKey, newValue, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
-        }
-    }
-    
-    private static var _eventTagKey = "KMEventTagKey"
-    var kEventTag: Int {
-        get {
-            return objc_getAssociatedObject(self, &Self._eventTagKey) as? Int ?? 0
-        }
-        set {
-            objc_setAssociatedObject(self, &Self._eventTagKey, newValue, .OBJC_ASSOCIATION_ASSIGN)
-        }
-    }
-    
-    // MARK: - Track Events Basic
-    
-    @objc func trackEvent(eventName eveN: String?, params: [String : Any]?, platform: KMAnalyticsPlatform) {
-        if let data = eveN {
-            KMAnalytics.trackEvent(eventName: data, parameters: params, platform: platform, appTarget: .all)
-        }
-    }
-    
-    @objc func trackEvent_dmg(eventName eveN: String?, params: [String : Any]?, platform: KMAnalyticsPlatform) {
-        if let data = eveN {
-            KMAnalytics.trackEvent(eventName: data, parameters: params, platform: platform, appTarget: .dmg)
-        }
-    }
-    
-    @objc func trackEvent_free(eventName eveN: String?, params: [String : Any]?, platform: KMAnalyticsPlatform) {
-        if let data = eveN {
-            KMAnalytics.trackEvent(eventName: data, parameters: params, platform: platform, appTarget: .free)
-        }
-    }
-    
-    @objc func trackEvent_pro(eventName eveN: String?, params: [String : Any]?, platform: KMAnalyticsPlatform) {
-        if let data = eveN {
-            KMAnalytics.trackEvent(eventName: data, parameters: params, platform: platform, appTarget: .pro)
-        }
-    }
-    
-    @objc func trackEvent_appstore(eventName eveN: String?, params: [String : Any]?, platform: KMAnalyticsPlatform) {
-        if let data = eveN {
-            KMAnalytics.trackEvent(eventName: data, parameters: params, platform: platform, appTarget: [.free, .pro])
-        }
-    }
-    
-    func clearEventData() {
-        self.kEventName = nil
-        self.kEventTag = 0
-        self.kEventParams = nil
-    }
-}
-
-// MARK: - KMAnalytics Private Methods
-
-extension KMAnalytics {
-    fileprivate static func _trackEvent_buyNow_tool(type: CAnnotationType, index: Int, platform: KMAnalyticsPlatform = .firebase, appTarget: AppTarget = [.free]) {
-        if let eventName = KMBuyNowEventNameFromCAnnotationType(type, index: index) {
-            let params: [String : Any]? = [KMAnalytics.Parameter.categoryKey : "Purchase_Tools", KMAnalytics.Parameter.labelKey : "SubTbr_Tools"]
-            KMAnalytics.trackEvent(eventName: eventName, parameters: params, platform: platform, appTarget: appTarget)
-        }
-    }
-}
-
-// MARK: - Pulick Methods
-
-public func KMBuyNowEventNameFromCAnnotationType(_ type: CAnnotationType, index: Int) -> String? {
-    if type == .link {
-        if index == 2 {
-            return "Reading_WebsiteLink_BuyNow"
-        } else if index == 3 {
-            return "Reading_EmailLink_BuyNow"
-        }
-    } else if type == .stamp {
-        if index == 2 {
-            return "Reading_DynamicStamp_BuyNow"
-        } else if index == 3 {
-            return "Reading_CustomStamp_BuyNow"
-        }
-    } else if type == .signature {
-        return "Reading_Signature_BuyNow"
-    }
-    return nil
-}
-

+ 4 - 90
PDF Office/PDF Master/Class/Analytics/KMAnalytics.swift

@@ -13,44 +13,6 @@ import Cocoa
     case firebase
 }
 
-// 数据埋点 Category 参数
-extension KMAnalytics.Parameter.Category {
-    public static let tbr                   = "Tbr"
-    public static let subTbr_annotation     = "SubTbr_Annotation"
-    public static let subTbr_editPDF        = "SubTbr_EditPDF"
-    public static let subTbr_PageEdit       = "SubTbr_PageEdit"
-    public static let subTbr_Converter      = "SubTbr_Converter"
-    public static let subTbr_Tools          = "SubTbr_Tools"
-    public static let home                  = "Home"
-    public static let leftSideBar           = "LeftSideBar"
-    public static let puw                   = "PUW"
-}
-
-// 数据埋点 Label 参数
-extension KMAnalytics.Parameter.Label {
-    public static let tbr_Btn           = "Tbr_Btn"
-    
-    public static let subTbr_Btn        = "SubTbr_Btn"
-    public static let ai_Btn            = "AI_Btn"
-    public static let create_Btn        = "Create_Btn"
-    public static let leftSideBar_Btn   = "LeftSideBar_Btn"
-    public static let sub_PUW           = "Sub_PUW"
-}
-
-// 数据埋点 参数
-extension KMAnalytics.Parameter {
-    public static let categoryKey  = "Category"
-    public static let labelKey     = "Label"
-    
-    public struct Category {
-        
-    }
-    
-    public struct Label {
-        
-    }
-}
-
 // 数据埋点 工具类
 @objc class KMAnalytics: NSObject {
     public struct AppTarget: OptionSet, Codable {
@@ -66,12 +28,9 @@ extension KMAnalytics.Parameter {
 
     }
     
-    public static let Category      = KMAnalytics.Parameter.Category.self
-    public static let Label         = KMAnalytics.Parameter.Label.self
-    
     // 配置
     static func configure() {
-#if DEBUG
+ 
 #if VERSION_FREE
 #if VERSION_DMG
     let appSecret = "fb9d37aa-e3f2-4969-bd06-f65ce529a565"
@@ -80,58 +39,13 @@ extension KMAnalytics.Parameter {
 #endif
 #else
     let appSecret = "54212f10-3ac9-42d9-96c0-5387f4b78d30"
-#endif
-
-#else
-        
-#if VERSION_FREE
-#if VERSION_DMG
-    let appSecret = "fb9d37aa-e3f2-4969-bd06-f65ce529a565"
-#else
-    let appSecret = "8c08296d-ca5c-44da-b68a-b4382f119b1f"
-#endif
-#else
-    let appSecret = "54212f10-3ac9-42d9-96c0-5387f4b78d30"
-#endif
-
 #endif
   
     }
 
     // 发送事件
-    static func trackEvent(eventName: String, parameters: [String : Any]? = nil, platform: KMAnalyticsPlatform = .firebase, appTarget: AppTarget = [.free]) {
-//        Swift.debugPrint("trackEvent: \(eventName)")
-        
-        if (appTarget.contains(.free)) {
-#if VERSION_FREE
-#if VERSION_DMG
-#else
-            self._trackEvent(eventName: eventName, parameters: parameters, platform: platform)
-#endif
-#endif
-        }
-        if (appTarget.contains(.pro)) {
-#if VERSION_FREE
-#else
-            self._trackEvent(eventName: eventName, parameters: parameters, platform: platform)
-#endif
-        }
-        if (appTarget.contains(.dmg)) {
-#if VERSION_DMG
-            self._trackEvent(eventName: eventName, parameters: parameters, platform: platform)
-#endif
-        }
-    }
-    
-    // MARK: - Private Methods
-    // 发送事件
-    fileprivate static func _trackEvent(eventName: String, parameters: [String : Any]? = nil, platform: KMAnalyticsPlatform = .firebase) {
-        if (platform == .firebase) {
-
-        } else if (platform == .AppCenter) {
-            if let data = parameters as? [String : String] {
-                
-            }
-        }
+    static func trackEvent(eventName: String, parameters: [String : Any]? = nil) {
+ 
     }
+     
 }

+ 7 - 9
PDF Office/PDF Master/Class/GuideInfo/NewUserGuide/Window/KMNewUserGuideWindowController.swift

@@ -180,19 +180,19 @@ import Cocoa
     
     private func _trackEvent(type: KMNewUserGuideType) {
         if type == .ai {
-            trackEvent(eventName: "PUW", params: ["PUW_Btn" : "FunctionIntro_AI"], platform: .AppCenter)
+
         } else if type == .note {
-            trackEvent(eventName: "PUW", params: ["PUW_Btn" : "FunctionIntro_AnnotatePDF"], platform: .AppCenter)
+
         } else if type == .editPDF {
-            trackEvent(eventName: "PUW", params: ["PUW_Btn" : "FunctionIntro_EditPDF"], platform: .AppCenter)
+
         } else if type == .pageEdit {
-            trackEvent(eventName: "PUW", params: ["PUW_Btn" : "FunctionIntro_PageEditor"], platform: .AppCenter)
+
         } else if type == .convert {
-            trackEvent(eventName: "PUW", params: ["PUW_Btn" : "FunctionIntro_Convert"], platform: .AppCenter)
+
         } else if type == .ocr {
-            trackEvent(eventName: "PUW", params: ["PUW_Btn" : "FunctionIntro_OCR"], platform: .AppCenter)
+
         } else if type == .fillForms {
-            trackEvent(eventName: "PUW", params: ["PUW_Btn" : "FunctionIntro_Form"], platform: .AppCenter)
+
         }
     }
     
@@ -289,8 +289,6 @@ import Cocoa
         
         selectType(showType)
         saveShowRecord()
-        
-        trackEvent(eventName: "PUW", params: ["PUW_Exposure" : "PUW_FunctionIntro"], platform: .AppCenter)
     }
     
     public func selectType(_ type: KMNewUserGuideType) {

+ 3 - 49
PDF Office/PDF Master/Class/MemberCenter/Model/KMMemberInfo.swift

@@ -1306,37 +1306,14 @@ import Cocoa
                         embeddedWC.showWindow(nil)
                         
                         embeddedWC.isAIPurchase = true
-                        embeddedWC.kEventName = "Purchase_AI"
-                        if(aiConfigType == .ponder) {
-                            embeddedWC.kEventParams = ["AITools":"AIDeepThink_Paid"]
-                        } else if(aiConfigType == .reWriting) {
-                            embeddedWC.kEventParams = ["AITools":"AIRewrite_Paid"]
-                        } else if(aiConfigType == .summarize) {
-                            embeddedWC.kEventParams = ["AITools":"AISummarize_Paid"]
-                        } else if(aiConfigType == .proofreading) {
-                            embeddedWC.kEventParams = ["AITools":"AIProofread_Paid"]
-                        } else if(aiConfigType == .translate) {
-                            embeddedWC.kEventParams = ["AITools":"AITranslate_Paid"]
-                        }
-
+                       
                         embeddedWC.window?.center()
 #else
                         let wc = AIPurchaseWindowController.currentWC()
                         wc.showWindow(nil)
                         
                         wc.isAIPurchase = true
-                        wc.kEventName = "Purchase_AI"
-                        if(aiConfigType == .ponder) {
-                            wc.kEventParams = ["AITools":"AIDeepThink_Paid"]
-                        } else if(aiConfigType == .reWriting) {
-                            wc.kEventParams = ["AITools":"AIRewrite_Paid"]
-                        } else if(aiConfigType == .summarize) {
-                            wc.kEventParams = ["AITools":"AISummarize_Paid"]
-                        } else if(aiConfigType == .proofreading) {
-                            wc.kEventParams = ["AITools":"AIProofread_Paid"]
-                        } else if(aiConfigType == .translate) {
-                            wc.kEventParams = ["AITools":"AITranslate_Paid"]
-                        }
+                     
 
 #endif
                         return false
@@ -1352,18 +1329,6 @@ import Cocoa
                             let embeddedWC = KMPurchaseEmbeddedWindowController.currentCode(KMAISubscriptionMonthCodeKey_DMG)
                             embeddedWC.showWindow(nil)
                             embeddedWC.isAIPurchase = true
-                            embeddedWC.kEventName = "Purchase_AI"
-                            if(aiConfigType == .ponder) {
-                                embeddedWC.kEventParams = ["AITools":"AIDeepThink_Paid"]
-                            } else if(aiConfigType == .reWriting) {
-                                embeddedWC.kEventParams = ["AITools":"AIRewrite_Paid"]
-                            } else if(aiConfigType == .summarize) {
-                                embeddedWC.kEventParams = ["AITools":"AISummarize_Paid"]
-                            } else if(aiConfigType == .proofreading) {
-                                embeddedWC.kEventParams = ["AITools":"AIProofread_Paid"]
-                            } else if(aiConfigType == .translate) {
-                                embeddedWC.kEventParams = ["AITools":"AITranslate_Paid"]
-                            }
                             
                             embeddedWC.window?.center()
 #else
@@ -1371,18 +1336,7 @@ import Cocoa
                             wc.showWindow(nil)
                             
                             wc.isAIPurchase = true
-                            wc.kEventName = "Purchase_AI"
-                            if(aiConfigType == .ponder) {
-                                wc.kEventParams = ["AITools":"AIDeepThink_Paid"]
-                            } else if(aiConfigType == .reWriting) {
-                                wc.kEventParams = ["AITools":"AIRewrite_Paid"]
-                            } else if(aiConfigType == .summarize) {
-                                wc.kEventParams = ["AITools":"AISummarize_Paid"]
-                            } else if(aiConfigType == .proofreading) {
-                                wc.kEventParams = ["AITools":"AIProofread_Paid"]
-                            } else if(aiConfigType == .translate) {
-                                wc.kEventParams = ["AITools":"AITranslate_Paid"]
-                            }
+                           
 #endif
                         }
                     }

+ 0 - 2
PDF Office/PDF Master/Class/MemberCenter/ViewModel/KMProductModel.swift

@@ -1199,8 +1199,6 @@ class KMProductModel: ObservableObject {
             } else if discountType == .advancedYearSubscribeTrialingCancel {
                 embeddedWC.discountCodeId = kKMAdvancedYearSubscribeDiscountCodeId
                 
-                embeddedWC.kEventName = KMProductCompareWC.shared.kEventName
-                embeddedWC.kEventParams = KMProductCompareWC.shared.kEventParams
             } else {
                 embeddedWC.discountCodeId = nil
             }

+ 13 - 15
PDF Office/PDF Master/Class/MemberCenter/WindowsController/KMProductCompareWC.swift

@@ -308,7 +308,7 @@ import Combine
     
     func windowShouldClose(sender:Any) -> Bool {
         if model.isShowSale {
-            trackEvent_free(eventName: "PromotionalOffer", params: ["PUW_Btn":"PUW_7OffUpgrade_Cancel"], platform: .AppCenter)
+
         }
         return true
     }
@@ -325,7 +325,6 @@ import Combine
         
         subscribeType_ = nil
         discountType_ = .none
-        clearEventData()
         
         alertingCodeForRefreshUserInfo_ = nil
         alertingForRefreshUserInfo_ = false
@@ -890,7 +889,7 @@ import Combine
                     self.saleIv.image = image
                     self.saleBox.isHidden = false
                     self.saleIv.isHidden = false
-                    self.trackEvent_free(eventName: "PromotionalOffer", params: ["PUW_Exposure": "PUW_7OffUpgrade"], platform: .AppCenter)
+
                 }
             }
         } else {
@@ -1592,11 +1591,11 @@ import Combine
     
     private func _trackPurchaseCampaignEvent() {
         if self.discountType == .newUserGift {
-            self.trackEvent(eventName: "Purchase_Campaign", params: ["Campaign_NewUser":"Tbr_Coupon"], platform: .firebase)
+
         } else if self.discountType == .freeTrail {
-            self.trackEvent(eventName: "Purchase_Campaign", params: ["Campaign_NewUser":"Tbr_FreeTrial"], platform: .firebase)
+
         } else if self.discountType_ == .advancedYearSubscribeTrialingCancel {
-            self.trackEvent(eventName: self.kEventName, params: self.kEventParams, platform: .firebase)
+
         }
     }
     
@@ -1750,11 +1749,11 @@ import Combine
             
             addWaitingView(to: window?.contentView ?? NSView())
              if model.isShowSale {
-                kEventTag = 1
+                 
                 if model.isPurchaseSwitch {
-                    trackEvent_free(eventName: "PromotionalOffer", params: ["PUW_Btn": "PUW_7OffUpgrade_12Mon"], platform: .AppCenter)
+
                 } else {
-                    trackEvent_free(eventName: "PromotionalOffer", params: ["PUW_Btn": "PUW_7OffUpgrade_6Mon"], platform: .AppCenter)
+
                 }
             }
         }
@@ -1770,7 +1769,7 @@ import Combine
         KMAdvertisementImage.imageWithURL(url: url) { [weak self] image in
             guard let self = self else { return }
             self.removeWaitingView(from: self.window?.contentView ?? NSView())
-            self.trackEvent_free(eventName: "PromotionalOffer", params: ["PUW_Exposure": "PUW_PromotionalOffer"], platform: .AppCenter)
+
             
             let winC = KMDiscountToSaveWindowController(windowNibName: "KMDiscountToSaveWindowController")
             self.discountToSaveWinC = winC
@@ -1782,9 +1781,9 @@ import Combine
                 self.discountToSaveWinC = nil
                 
                 if idx == 2 {
-                    self.trackEvent_free(eventName: "PromotionalOffer", params: ["PUW_Btn": "PUW_PromotionalOffer_Subscribe"], platform: .AppCenter)
+
                 } else if idx == 1 {
-                    self.trackEvent_free(eventName: "PromotionalOffer", params: ["PUW_Btn": "PUW_PromotionalOffer_Cancel"], platform: .AppCenter)
+
                 }
             }
         }
@@ -1811,7 +1810,6 @@ import Combine
         IAPProductsManager.default().make(IAPProductsManager.default().allAccessPackPermanent_lite)
         addWaitingView(to: window?.contentView ?? NSView())
  
-        trackEvent_free(eventName: "ComparisonTableNew", params: ["Btn" : "Btn_ComparisonTable_BuyPermanent"], platform: .AppCenter)
     }
 
     @IBAction func buttonItemClicked_AboutSubscriptions(_ sender: Any) {
@@ -1931,11 +1929,11 @@ import Combine
     // AppStore 免费版本
         if IAPProductsManager.default().fourDevicesAllAccessPackNew6Months_lite.isSubscribed {
             if kEventTag == 1 {
-                trackEvent_free(eventName: "PromotionalOffer", params: ["PUW_Btn": "PUW_7OffUpgrade_6MonthPaid"], platform: .AppCenter)
+
             }
         } else if IAPProductsManager.default().fourDevicesAllAccessPackNew12months_lite.isSubscribed {
             if kEventTag == 1 {
-                trackEvent_free(eventName: "PromotionalOffer", params: ["PUW_Btn": "PUW_7OffUpgrade_12MonthPaid"], platform: .AppCenter)
+
             }
         }
 #endif

+ 0 - 3
PDF Office/PDF Master/Class/PDFTools/Print/PrintHelper/PrintManage/KMPDFPrintManageWindowController.m

@@ -601,7 +601,6 @@ typedef NS_ENUM(NSUInteger, kPageSelectStyle) {
     if (![IAPProductsManager defaultManager].isAvailableAllFunction) {
         [self close];
         NSWindowController *winC = [KMPurchaseCompareWindowController sharedInstance];
-        winC.kEventName = @"MenuBar_PrintPoster_BuyNow";
         [winC showWindow:nil];
         return;
     }
@@ -620,7 +619,6 @@ typedef NS_ENUM(NSUInteger, kPageSelectStyle) {
     if (![IAPProductsManager defaultManager].isAvailableAllFunction) {
         [self close];
         NSWindowController *winC = [KMPurchaseCompareWindowController sharedInstance];
-        winC.kEventName = @"MenuBar_PrintMultiple_BuyNow";
         [winC showWindow:nil];
         return;
     }
@@ -638,7 +636,6 @@ typedef NS_ENUM(NSUInteger, kPageSelectStyle) {
     if (![IAPProductsManager defaultManager].isAvailableAllFunction) {
         [self close];
         NSWindowController *winC = [KMPurchaseCompareWindowController sharedInstance];
-        winC.kEventName = @"MenuBar_PrintBooklet_BuyNow";
         [winC showWindow:nil];
         return;
     }

+ 0 - 1
PDF Office/PDF Master/Class/PDFWindowController/TabWindowController/KMTabbingHintWindowController.swift

@@ -89,7 +89,6 @@ class KMTabbingHintWindowController: NSWindowController{
         if IAPProductsManager.default().isAvailableAllFunction() == false {
             sender.state = NSControl.StateValue.off
             let winC = KMPurchaseCompareWindowController.sharedInstance()
-            winC?.kEventName = "Reading_MultiTab_BuyNow"
             winC?.showWindow(nil)
             return
         }

+ 6 - 16
PDF Office/PDF Master/Class/Purchase/Appstore/KMPurchaseCompareWindowController.m

@@ -597,7 +597,7 @@ static NSString *const KMPurchaseCompareCellIdentifier       = @"KMPurchaseCompa
 
 - (BOOL)windowShouldClose:(id)sender {
     if ([self isShowSale]) {
-        [self trackEvent_freeWithEventName:@"PromotionalOffer" params:@{@"PUW_Btn" : @"PUW_7OffUpgrade_Cancel"} platform:KMAnalyticsPlatformAppCenter];
+
     }
     [self endModal:sender];
     return YES;
@@ -672,8 +672,6 @@ static NSString *const KMPurchaseCompareCellIdentifier       = @"KMPurchaseCompa
                 self.saleIv.image = image;
                 self.saleBox.hidden = false;
                 self.saleIv.hidden = false;
-                
-                [self trackEvent_freeWithEventName:@"PromotionalOffer" params:@{@"PUW_Exposure" : @"PUW_7OffUpgrade"} platform:KMAnalyticsPlatformAppCenter];
             }
         }];
     } else {
@@ -1115,11 +1113,10 @@ static NSString *const KMPurchaseCompareCellIdentifier       = @"KMPurchaseCompa
     [self addWaingView:self.window.contentView];
     
     if ([self isShowSale]) {
-        self.kEventTag = 1;
         if (self.isPurchaseSwitch) {
-            [self trackEvent_freeWithEventName:@"PromotionalOffer" params:@{@"PUW_Btn" : @"PUW_7OffUpgrade_12Mon"} platform:KMAnalyticsPlatformAppCenter];
+
         } else {
-            [self trackEvent_freeWithEventName:@"PromotionalOffer" params:@{@"PUW_Btn" : @"PUW_7OffUpgrade_6Mon"} platform:KMAnalyticsPlatformAppCenter];
+
         }
     }
 }
@@ -1140,8 +1137,6 @@ static NSString *const KMPurchaseCompareCellIdentifier       = @"KMPurchaseCompa
             return;
         }
         
-        [self trackEvent_freeWithEventName:@"PromotionalOffer" params:@{@"PUW_Exposure" : @"PUW_PromotionalOffer"} platform:KMAnalyticsPlatformAppCenter];
-        
         KMDiscountToSaveWindowController *winC = [[KMDiscountToSaveWindowController alloc] initWithWindowNibName:@"KMDiscountToSaveWindowController"];
         weakSelf.discountToSaveWinC = winC;
         [weakSelf.window beginSheet:winC.window completionHandler:^(NSModalResponse returnCode) { }];
@@ -1152,9 +1147,8 @@ static NSString *const KMPurchaseCompareCellIdentifier       = @"KMPurchaseCompa
             weakSelf.discountToSaveWinC = nil;
             if (idx == 2) { // 订阅
                 ////            NSLog(@"buttonItemClicked_Subscribe");
-                [weakSelf trackEvent_freeWithEventName:@"PromotionalOffer" params:@{@"PUW_Btn" : @"PUW_PromotionalOffer_Subscribe"} platform:KMAnalyticsPlatformAppCenter];
             } else if (idx == 1) {
-                [weakSelf trackEvent_freeWithEventName:@"PromotionalOffer" params:@{@"PUW_Btn" : @"PUW_PromotionalOffer_Cancel"} platform:KMAnalyticsPlatformAppCenter];
+
             }
         };
     }];
@@ -1364,13 +1358,9 @@ static NSString *const KMPurchaseCompareCellIdentifier       = @"KMPurchaseCompa
     [self reloadData];
     
     if (IAPProductsManager.defaultManager.allAccessPackNew6months_lite.isSubscribed) {
-        if (self.kEventTag == 1) {
-            [self trackEvent_freeWithEventName:@"PromotionalOffer" params:@{@"PUW_Btn" : @"PUW_7OffUpgrade_6MonthPaid"} platform:KMAnalyticsPlatformAppCenter];
-        }
+        
     } else if (IAPProductsManager.defaultManager.allAccessPack12months_lite.isSubscribed) {
-        if (self.kEventTag == 1) {
-            [self trackEvent_freeWithEventName:@"PromotionalOffer" params:@{@"PUW_Btn" : @"PUW_7OffUpgrade_12MonthPaid"} platform:KMAnalyticsPlatformAppCenter];
-        }
+        
     }
 }
 

+ 1 - 2
PDF Office/PDF Master/Class/Purchase/DMG/DMGEmbeddedOldWC.swift

@@ -254,7 +254,6 @@ class DMGEmbeddedOldWC: NSWindowController {
     override func close() {
         super.close()
         
-        self.clearEventData()
     }
     
     // MARK: UI
@@ -1419,7 +1418,7 @@ class DMGEmbeddedOldWC: NSWindowController {
     }
     
     private func _trackEvent_paid() {
-        self.trackEvent_dmg(eventName: self.kEventName, params: self.kEventParams, platform: .AppCenter)
+
     }
     
     private let tabDict: [ProductType: String] = [

+ 2 - 469
PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseCompareDMGWindowController.m

@@ -596,9 +596,7 @@ static NSString *const KMPurchaseCompareDMGCellIdentifier       = @"KMPurchaseCo
 - (void)close {
     [super close];
     
-    // 清空埋点的数据
-    self.kEventName = nil;
-    self.kEventTag = 0;
+    // 清空埋点的数据 
     
     [self endModal:nil];
 }
@@ -649,16 +647,6 @@ static NSString *const KMPurchaseCompareDMGCellIdentifier       = @"KMPurchaseCo
 
 - (IBAction)buttonItemClicked_Buy:(id)sender {
 #if VERSION_DMG
-    [self trackEvent_buyNow];
-    NSString *paidEventName = [self _buyNowEventToPaidEventName];
-    NSDictionary *paidEventParams = [self _getPaidEventParamsWith:paidEventName];
-    
-    NSString *thePaidEventName = paidEventParams.allKeys.firstObject;
-    NSDictionary *thePaidEventParams = nil;
-    if (paidEventName != nil && paidEventParams.allValues.firstObject != nil) {
-        thePaidEventParams = @{paidEventParams.allValues.firstObject : paidEventName};
-    }
-    
     [self close];
     
     NSString *productID = @"";
@@ -668,8 +656,6 @@ static NSString *const KMPurchaseCompareDMGCellIdentifier       = @"KMPurchaseCo
         productID = KMStandardAnnualSubscriptionCodeKey_DMG;
     }
     KMPurchaseEmbeddedWindowController *embeddedWC = [KMPurchaseEmbeddedWindowController currentCode:productID];
-    embeddedWC.kEventName = thePaidEventName;
-    embeddedWC.kEventParams = thePaidEventParams;
     [embeddedWC showWindow:nil];
     [[embeddedWC window] center];
 #endif
@@ -721,20 +707,10 @@ static NSString *const KMPurchaseCompareDMGCellIdentifier       = @"KMPurchaseCo
 //    NSURL *url = [NSURL URLWithString:Swift_oc_Tool.AIProduct_Link_OC];
 //    [[NSWorkspace sharedWorkspace] openURL:url];
 //    
-    [self trackEvent_buyNow];
-    NSString *paidEventName = [self _buyNowEventToPaidEventName];
-    NSDictionary *paidEventParams = [self _getPaidEventParamsWith:paidEventName];
-    NSString *thePaidEventName = paidEventParams.allKeys.firstObject;
-    NSDictionary *thePaidEventParams = nil;
-    if (paidEventName != nil && paidEventParams.allValues.firstObject != nil) {
-        thePaidEventParams = @{paidEventParams.allValues.firstObject : paidEventName};
-    }
-    
+
     [self close];
 #if VERSION_DMG
     KMPurchaseEmbeddedWindowController *embeddedWC = [KMPurchaseEmbeddedWindowController currentCode:KMAISubscriptionMonthCodeKey_DMG];
-    embeddedWC.kEventName = thePaidEventName;
-    embeddedWC.kEventParams = thePaidEventParams;
     [embeddedWC showWindow:nil];
     [[embeddedWC window] center];
 #endif
@@ -762,448 +738,5 @@ static NSString *const KMPurchaseCompareDMGCellIdentifier       = @"KMPurchaseCo
 
 @implementation KMPurchaseCompareDMGWindowController (KMAnalytic)
 
-- (void)trackEvent_buyNow {
-    NSDictionary *params = [self _getBuyNowEventParams];
-    NSString *theEventName = params.allKeys.firstObject;
-    NSDictionary *theParams = nil;
-    if (self.kEventName != nil && params.allValues.firstObject != nil) {
-        theParams = @{params.allValues.firstObject : self.kEventName};
-    }
-    
-    [self trackEvent_dmgWithEventName:theEventName params:theParams platform:KMAnalyticsPlatformAppCenter];
-}
-
-- (NSDictionary *)_getBuyNowEventParams {
-    NSString *eveN = self.kEventName;
-    if (eveN == nil || eveN.length == 0) {
-        return nil;
-    }
-    
-    if ([eveN isEqual:@"Reading_WebsiteLink_BuyNow"] ||
-        [eveN isEqual:@"Reading_EmailLink_BuyNow"] ||
-        [eveN isEqual:@"Reading_DynamicStamp_BuyNow"] ||
-        [eveN isEqual:@"Reading_CustomStamp_BuyNow"] ||
-        [eveN isEqual:@"Reading_Signature_BuyNow"] ||
-        [eveN isEqual:@"Reading_Table_BuyNow"]) {
-        return @{@"Purchase_Tools" : @"SubTbr_Tools"};
-    } else if ([eveN isEqual:@"Reading_InsertBlankPage_BuyNow"] ||
-               [eveN isEqual:@"Reading_InsertPDF_BuyNow"] ||
-               [eveN isEqual:@"Reading_InsertSacnner_BuyNow"] ||
-               [eveN isEqual:@"Reading_InsertImage_BuyNow"] ||
-               [eveN isEqual:@"Reading_InsertClipboard_BuyNow"] ||
-               [eveN isEqual:@"Reading_Replace_BuyNow"] ||
-               [eveN isEqual:@"Reading_Extract_BuyNow"] ||
-               [eveN isEqual:@"Reading_Split_BuyNow"] ||
-               ([eveN isEqual:@"Reading_Rotate_BuyNow"] && self.kEventTag == 0) ||
-               [eveN isEqual:@"Reading_Reverse_BuyNow"] ||
-               [eveN isEqual:@"Reading_Copy_BuyNow"] ||
-               [eveN isEqual:@"Reading_Delete_BuyNow"] ||
-               [eveN isEqual:@"Reading_Merge_BuyNow"]) {
-        return @{@"Purchase_PageEdit" : @"SubTbr_PageEdit"};
-    } else if ([eveN isEqual:@"Onbrd_EditPage_BuyNow"] ||
-               [eveN isEqual:@"Onbrd_Merge_BuyNow"]) {
-        return @{@"Purchase_PageEdit" : @"Home_PageEdit"};
-    } else if ([eveN isEqual:@"Reading_RemoveSecurity_BuyNow"] ||
-               [eveN isEqual:@"Reading_Compare_BuyNow"] ||
-               [eveN isEqual:@"Reading_AddWatermark_BuyNow"] ||
-               [eveN isEqual:@"Reading_RemoveWatermark_BuyNow"] ||
-               [eveN isEqual:@"Reading_AddBackground_BuyNow"] ||
-               [eveN isEqual:@"Reading_RemoveBackground_BuyNow"] ||
-               [eveN isEqual:@"Reading_AddHeaderFooter_BuyNow"] ||
-               [eveN isEqual:@"Reading_RemoveHeaderFooter_BuyNow"] ||
-               [eveN isEqual:@"Reading_AddBates_BuyNow"] ||
-               [eveN isEqual:@"Reading_RemoveBates_BuyNow"] ||
-               [eveN isEqual:@"Reading_Measure_BuyNow"]) {
-        return @{@"Purchase_Editor" : @"SubTbr_Editor"};
-    } else if ([eveN isEqual:@"Onbrd_Compare_BuyNow"] ||
-               [eveN isEqual:@"Onbrd_Background_BuyNow"] ||
-               [eveN isEqual:@"Onbrd_Watermard_BuyNow"] ||
-               [eveN isEqual:@"Onbrd_HeaderFooter_BuyNow"] ||
-               [eveN isEqual:@"Onbrd_Bates_BuyNow"] ||
-               [eveN isEqual:@"Onbrd_Security_BuyNow"]) {
-        return @{@"Purchase_Editor" : @"Home_Editor"};
-    } else if ([eveN isEqual:@"Reading_PDFtoWord_BuyNow"] ||
-              [eveN isEqual:@"Reading_PDFtoExcel_BuyNow"] ||
-              [eveN isEqual:@"Reading_PDFtoPPT_BuyNow"] ||
-              [eveN isEqual:@"Reading_PDFtoRTF_BuyNow"] ||
-              [eveN isEqual:@"Reading_PDFtoCSV_BuyNow"] ||
-              [eveN isEqual:@"Reading_PDFtoText_BuyNow"] ||
-              [eveN isEqual:@"Reading_PDFtoImage_BuyNow"] ||
-              [eveN isEqual:@"Reading_ExtractImage_BuyNow"]) {
-       return @{@"Purchase_Converter" : @"SubTbr_Converter"};
-    } else if ([eveN isEqual:@"Onbrd_ConvertPDF_BuyNow"] ||
-               [eveN isEqual:@"Onbrd_PDFtoWord_BuyNow"] ||
-               [eveN isEqual:@"Onbrd_PDFtoExcel_BuyNow"] ||
-               [eveN isEqual:@"Onbrd_PDFtoPPT_BuyNow"] ||
-               [eveN isEqual:@"Onbrd_ImagetoPDF_BuyNow"]) {
-        return @{@"Purchase_Converter" : @"Home_Converter"};
-    } else if ([eveN isEqual:@"Reading_TextField_BuyNow"] ||
-               [eveN isEqual:@"Reading_CheckBox_BuyNow"] ||
-               [eveN isEqual:@"Reading_RadioButton_BuyNow"] ||
-               [eveN isEqual:@"Reading_ListBox_BuyNow"] ||
-               [eveN isEqual:@"Reading_ComboBox_BuyNow"] ||
-               [eveN isEqual:@"Reading_Button_BuyNow"]) {
-        return @{@"Purchase_Form" : @"SubTbr_Forms"};
-    } else if ([eveN isEqual:@"Reading_FillSign_Signature_BuyNow"] ||
-               [eveN isEqual:@"Reading_DigitalSign_BuyNow"] ||
-               [eveN isEqual:@"Reading_ElectronicSign_BuyNow"]) {
-        return @{@"Purchase_Sign" : @"SunTbr_Signature"};
-    } else if ([eveN isEqual:@"Reading_EditPDF_BuyNow"] ||
-                [eveN isEqual:@"Reading_ReplaceText_BuyNow"]) {
-         return @{@"Purchase_EditPDF" : @"Tbr_Edit PDF"};
-    } else if ([eveN isEqual:@"Reading_Redact_BuyNow"]) {
-        return @{@"Purchase_Redact" : @"Tbr_Redact"};
-    } else if ([eveN isEqual:@"Reading_OCR_BuyNow"] ||
-               [eveN isEqual:@"Reading_Convert_OCR_BuyNow"] ||
-               [eveN isEqual:@"Onbrd_OCR_BuyNow"]) {
-        return @{@"Purchase_OCR" : @"SubTbr_OCR"};
-    } else if ([eveN isEqual:@"Reading_SplitView_BuyNow"] ||
-               [eveN isEqual:@"Reading_Rotate_BuyNow"] ||
-               [eveN isEqual:@"Reading_Theme_BuyNow"] ||
-               [eveN isEqual:@"Reading_MultiTab_BuyNow"]) {
-        return @{@"Purchase_PageDisplay" : @"SubTbr_PageDisplay"};
-    } else if ([eveN isEqual:@"Onbrd_PrintPoster_BuyNow"] ||
-               [eveN isEqual:@"Onbrd_PrintMultiple_BuyNow"] ||
-               [eveN isEqual:@"Onbrd_PrintBooklet_BuyNow"]) {
-        return @{@"Purchase_Others" : @"Home_Others"};
-    } else if ([eveN isEqual:@"Reading_Flatten_BuyNow"]) {
-        return @{@"Purchase_Others" : @"SubTbr_Others"};
-    } else if ([eveN isEqual:@"MenuBar_PrintPoster_BuyNow"] ||
-               [eveN isEqual:@"MenuBar_PrintMultiple_BuyNow"] ||
-               [eveN isEqual:@"MenuBar_PrintBooklet_BuyNow"]) {
-        return @{@"Purchase_Others" : @"MenuBar_Others"};
-    }
-    return nil;
-}
-
-- (NSString *)_buyNowEventToPaidEventName {
-    NSString *eveN = self.kEventName;
-    if (eveN == nil || eveN.length == 0) {
-        return nil;
-    }
-
-    // Paid_Tools
-    if ([eveN isEqual:@"Reading_WebsiteLink_BuyNow"]) {
-        return @"Reading_WebsiteLink_Paid";
-    } else if ([eveN isEqual:@"Reading_EmailLink_BuyNow"]) {
-        return @"Reading_EmailLink_Paid";
-    } else if ([eveN isEqual:@"Reading_DynamicStamp_BuyNow"]) {
-        return @"Reading_DynamicStamp_Paid";
-    } else if ([eveN isEqual:@"Reading_CustomStamp_BuyNow"]) {
-        return @"Reading_CustomStamp_Paid";
-    } else if ([eveN isEqual:@"Reading_Signature_BuyNow"]) {
-        return @"Reading_Signature_Paid";
-    } else if ([eveN isEqual:@"Reading_Table_BuyNow"]) {
-        return @"Reading_Table_Paid";
-    }
-    // Paid_PageEdit SubTbr_PageEdit
-    else if ([eveN isEqual:@"Reading_InsertBlankPage_BuyNow"]) {
-        return @"Reading_InsertBlankPage_Paid";
-    } else if ([eveN isEqual:@"Reading_InsertPDF_BuyNow"]) {
-        return @"Reading_InsertPDF_Paid";
-    } else if ([eveN isEqual:@"Reading_InsertSacnner_BuyNow"]) {
-        return @"Reading_InsertSacnner_Paid";
-    } else if ([eveN isEqual:@"Reading_InsertImage_BuyNow"]) {
-        return @"Reading_InsertImage_Paid";
-    } else if ([eveN isEqual:@"Reading_InsertClipboard_BuyNow"]) {
-        return @"Reading_InsertClipboard_Paid";
-    } else if ([eveN isEqual:@"Reading_Replace_BuyNow"]) {
-        return @"Reading_Replace_Paid";
-    } else if ([eveN isEqual:@"Reading_Extract_BuyNow"]) {
-        return @"Reading_Extract_Paid";
-    } else if ([eveN isEqual:@"Reading_Split_BuyNow"]) {
-        return @"Reading_Split_Paid";
-    } else if ([eveN isEqual:@"Reading_Rotate_BuyNow"]) {
-        return @"Reading_Rotate_Paid";
-    } else if ([eveN isEqual:@"Reading_Reverse_BuyNow"]) {
-        return @"Reading_Reverse_Paid";
-    } else if ([eveN isEqual:@"Reading_Copy_BuyNow"]) {
-        return @"Reading_Copy_Paid";
-    } else if ([eveN isEqual:@"Reading_Delete_BuyNow"]) {
-        return @"Reading_Delete_Paid";
-    } else if ([eveN isEqual:@"Reading_Merge_BuyNow"]) {
-        return @"Reading_Merge_Paid";
-    }
-    // Paid_PageEdit Home_PageEdit
-    else if ([eveN isEqual:@"Onbrd_EditPage_BuyNow"]) {
-        return  @"Onbrd_EditPage_Paid";
-    } else if ([eveN isEqual:@"Onbrd_Merge_BuyNow"]) {
-        return  @"Onbrd_Merge_Paid";
-    }
-    // Paid_Editor SubTbr_Editor
-    else if ([eveN isEqual:@"Reading_RemoveSecurity_BuyNow"]) {
-        return @"Reading_RemoveSecurity_Paid";
-    } else if ([eveN isEqual:@"Reading_Compare_BuyNow"]) {
-        return @"Reading_Compare_Paid";
-    } else if ([eveN isEqual:@"Reading_AddWatermark_BuyNow"]) {
-        return @"Reading_AddWatermark_Paid";
-    } else if ([eveN isEqual:@"Reading_RemoveWatermark_BuyNow"]) {
-        return @"Reading_RemoveWatermark_Paid";
-    } else if ([eveN isEqual:@"Reading_AddBackground_BuyNow"]) {
-        return @"Reading_AddBackground_Paid";
-    } else if ([eveN isEqual:@"Reading_RemoveBackground_BuyNow"]) {
-        return @"Reading_RemoveBackground_Paid";
-    } else if ([eveN isEqual:@"Reading_AddHeaderFooter_BuyNow"]) {
-        return @"Reading_AddHeaderFooter_Paid";
-    } else if ([eveN isEqual:@"Reading_RemoveHeaderFooter_BuyNow"]) {
-        return @"Reading_RemoveHeaderFooter_Paid";
-    } else if ([eveN isEqual:@"Reading_AddBates_BuyNow"]) {
-        return @"Reading_AddBates_Paid";
-    } else if ([eveN isEqual:@"Reading_RemoveBates_BuyNow"]) {
-        return @"Reading_RemoveBates_Paid";
-    } else if ([eveN isEqual:@"Reading_Measure_BuyNow"]) {
-        return @"Reading_Measure_Paid";
-    }
-    // Paid_Editor Home_Editor
-    else if ([eveN isEqual:@"Onbrd_Compare_BuyNow"]) {
-        return @"Onbrd_Compare_Paid";
-    } else if ([eveN isEqual:@"Onbrd_Background_BuyNow"]) {
-        return @"Onbrd_Background_Paid";
-    } else if ([eveN isEqual:@"Onbrd_Watermard_BuyNow"]) {
-        return @"Onbrd_Watermard_Paid";
-    } else if ([eveN isEqual:@"Onbrd_HeaderFooter_BuyNow"]) {
-        return @"Onbrd_HeaderFooter_Paid";
-    } else if ([eveN isEqual:@"Onbrd_Bates_BuyNow"]) {
-        return @"Onbrd_Bates_Paid";
-    } else if ([eveN isEqual:@"Onbrd_Security_BuyNow"]) {
-        return @"Onbrd_Security_Paid";
-    }
-    // Paid_Converter SubTbr_Converte
-    else if ([eveN isEqual:@"Reading_PDFtoWord_BuyNow"]) {
-        return @"Reading_PDFtoWord_Paid";
-    } else if ([eveN isEqual:@"Reading_PDFtoExcel_BuyNow"]) {
-        return @"Reading_PDFtoExcel_Paid";
-    } else if ([eveN isEqual:@"Reading_PDFtoPPT_BuyNow"]) {
-        return @"Reading_PDFtoPPT_Paid";
-    } else if ([eveN isEqual:@"Reading_PDFtoRTF_BuyNow"]) {
-        return @"Reading_PDFtoRTF_Paid";
-    } else if ([eveN isEqual:@"Reading_PDFtoCSV_BuyNow"]) {
-        return @"Reading_PDFtoCSV_Paid";
-    } else if ([eveN isEqual:@"Reading_PDFtoText_BuyNow"]) {
-        return @"Reading_PDFtoText_Paid";
-    } else if ([eveN isEqual:@"Reading_PDFtoImage_BuyNow"]) {
-        return @"Reading_PDFtoImage_Paid";
-    } else if ([eveN isEqual:@"Reading_ExtractImage_BuyNow"]) {
-        return @"Reading_ExtractImage_Paid";
-    }
-    // Paid_Converter Home_Converter
-    else if ([eveN isEqual:@"Onbrd_ConvertPDF_BuyNow"]) {
-        return @"Onbrd_ConvertPDF_Paid";
-    } else if ([eveN isEqual:@"Onbrd_PDFtoWord_BuyNow"]) {
-        return @"Onbrd_PDFtoWord_Paid";
-    } else if ([eveN isEqual:@"Onbrd_PDFtoExcel_BuyNow"]) {
-        return @"Onbrd_PDFtoExcel_Paid";
-    } else if ([eveN isEqual:@"Onbrd_PDFtoPPT_BuyNow"]) {
-        return @"Onbrd_PDFtoPPT_Paid";
-    } else if ([eveN isEqual:@"Onbrd_ImagetoPDF_BuyNow"]) {
-        return @"Onbrd_ImagetoPDF_Paid";
-    }
-    // Paid_Form SubTbr_Forms
-    else if ([eveN isEqual:@"Reading_TextField_BuyNow"]) {
-        return @"Reading_TextField_Paid";
-    } else if ([eveN isEqual:@"Reading_CheckBox_BuyNow"]) {
-        return @"Reading_CheckBox_Paid";
-    } else if ([eveN isEqual:@"Reading_RadioButton_BuyNow"]) {
-        return @"Reading_RadioButton_Paid";
-    } else if ([eveN isEqual:@"Reading_ListBox_BuyNow"]) {
-        return @"Reading_ListBox_Paid";
-    } else if ([eveN isEqual:@"Reading_ComboBox_BuyNow"]) {
-        return @"Reading_ComboBox_Paid";
-    } else if ([eveN isEqual:@"Reading_Button_BuyNow"]) {
-        return @"Reading_Button_Paid";
-    }
-    // Paid_Sign SunTbr_Signature
-    else if ([eveN isEqual:@"Reading_FillSign_Signature_BuyNow"]) {
-        return @"Reading_FillSign_Signature_Paid";
-    } else if ([eveN isEqual:@"Reading_DigitalSign_BuyNow"]) {
-        return @"Reading_DigitalSign_Paid";
-    } else if ([eveN isEqual:@"Reading_ElectronicSign_BuyNow"]) {
-        return @"Reading_ElectronicSign_Paid";
-    }
-    // Paid_EditPDF Tbr_Edit PDF
-    else if ([eveN isEqual:@"Reading_EditPDF_BuyNow"]) {
-        return @"Reading_EditPDF_Paid";
-    } else if ([eveN isEqual:@"Reading_ReplaceText_BuyNow"]) {
-        return @"Reading_ReplaceText_Paid";
-    }
-    // Paid_Redact Tbr_Redact
-    else if ([eveN isEqual:@"Reading_Redact_BuyNow"]) {
-        return @"Reading_Redact_Paid";
-    }
-    // Paid_OCR SubTbr_OCR
-    else if ([eveN isEqual:@"Reading_OCR_BuyNow"]) {
-        return @"Reading_OCR_Paid";
-    } else if ([eveN isEqual:@"Reading_Convert_OCR_BuyNow"]) {
-        return @"Reading_Convert_OCR_Paid";
-    } else if ([eveN isEqual:@"Onbrd_OCR_BuyNow"]) {
-        return @"Onbrd_OCR_Paid";
-    }
-    // Paid_PageDisplay SubTbr_Page Display
-    else if ([eveN isEqual:@"Reading_SplitView_BuyNow"]) {
-        return @"Reading_SplitView_Paid";
-    } else if ([eveN isEqual:@"Reading_Rotate_BuyNow"]) {
-        return @"Reading_Rotate_Paid";
-    } else if ([eveN isEqual:@"Reading_Theme_BuyNow"]) {
-        return @"Reading_Theme_Paid";
-    } else if ([eveN isEqual:@"Reading_MultiTab_BuyNow"]) {
-        return @"Reading_MultiTab_Paid";
-    }
-    //  Home_Others
-    else if ([eveN isEqual:@"Onbrd_PrintPoster_BuyNow"]) {
-        return @"Onbrd_PrintPoster_Paid";
-    } else if ([eveN isEqual:@"Onbrd_PrintMultiple_BuyNow"]) {
-        return @"Onbrd_PrintMultiple_Paid";
-    } else if ([eveN isEqual:@"Onbrd_PrintBooklet_BuyNow"]) {
-        return @"Onbrd_PrintBooklet_Paid";
-    }
-    // Paid_Others SubTbr_Others
-    else if ([eveN isEqual:@"Reading_Flatten_BuyNow"]) {
-        return @"Reading_Flatten_Paid";
-    }
-    // Paid_Others MenuBar_Others
-    else if ([eveN isEqual:@"MenuBar_PrintPoster_BuyNow"]) {
-        return @"MenuBar_PrintPoster_Paid";
-    } else if ([eveN isEqual:@"MenuBar_PrintMultiple_BuyNow"]) {
-        return @"MenuBar_PrintMultiple_Paid";
-    } else if ([eveN isEqual:@"MenuBar_PrintBooklet_BuyNow"]) {
-        return @"MenuBar_PrintBooklet_Paid";
-    }
-    return nil;
-}
-
-- (NSDictionary *)_getPaidEventParamsWith:(NSString *)eventN {
-    NSString *eveN = eventN;
-    if (eveN == nil || eveN.length == 0) {
-        return nil;
-    }
-    
-    // Paid_Tools SubTbr_Tools
-    if ([eveN isEqual:@"Reading_WebsiteLink_Paid"] ||
-        [eveN isEqual:@"Reading_EmailLink_Paid"] ||
-        [eveN isEqual:@"Reading_DynamicStamp_Paid"] ||
-        [eveN isEqual:@"Reading_CustomStamp_Paid"] ||
-        [eveN isEqual:@"Reading_Signature_Paid"] ||
-        [eveN isEqual:@"Reading_Table_Paid"]) {
-        return @{@"Paid_Tools" : @"SubTbr_Tools"};
-    }
-    // Paid_PageEdit SubTbr_PageEdit
-    else if ([eveN isEqual:@"Reading_InsertBlankPage_Paid"] ||
-             [eveN isEqual:@"Reading_InsertPDF_Paid"] ||
-             [eveN isEqual:@"Reading_InsertSacnner_Paid"] ||
-             [eveN isEqual:@"Reading_InsertImage_Paid"] ||
-             [eveN isEqual:@"Reading_InsertClipboard_Paid"] ||
-             [eveN isEqual:@"Reading_Replace_Paid"] ||
-             [eveN isEqual:@"Reading_Extract_Paid"] ||
-             [eveN isEqual:@"Reading_Split_Paid"] ||
-             [eveN isEqual:@"Reading_Rotate_Paid"] ||
-             [eveN isEqual:@"Reading_Reverse_Paid"] ||
-             [eveN isEqual:@"Reading_Copy_Paid"] ||
-             [eveN isEqual:@"Reading_Delete_Paid"] ||
-             [eveN isEqual:@"Reading_Merge_Paid"]) {
-        return @{@"Paid_PageEdit" : @"SubTbr_PageEdit"};
-    }
-    // Paid_PageEdit Home_PageEdit
-    else if ([eveN isEqual:@"Onbrd_EditPage_Paid"] ||
-             [eveN isEqual:@"Onbrd_Merge_Paid"]) {
-        return @{@"Paid_PageEdit" : @"Home_PageEdit"};
-    }
-    // Paid_Editor SubTbr_Editor
-    else if ([eveN isEqual:@"Reading_RemoveSecurity_Paid"] ||
-             [eveN isEqual:@"Reading_Compare_Paid"] ||
-             [eveN isEqual:@"Reading_AddWatermark_Paid"] ||
-             [eveN isEqual:@"Reading_RemoveWatermark_Paid"] ||
-             [eveN isEqual:@"Reading_AddBackground_Paid"] ||
-             [eveN isEqual:@"Reading_RemoveBackground_Paid"] ||
-             [eveN isEqual:@"Reading_AddHeaderFooter_Paid"] ||
-             [eveN isEqual:@"Reading_RemoveHeaderFooter_Paid"] ||
-             [eveN isEqual:@"Reading_AddBates_Paid"] ||
-             [eveN isEqual:@"Reading_RemoveBates_Paid"] ||
-             [eveN isEqual:@"Reading_Measure_Paid"]) {
-        return @{@"" : @""};
-    }
-    // Paid_Editor Home_Editor
-    else if ([eveN isEqual:@"Onbrd_Compare_Paid"] ||
-             [eveN isEqual:@"Onbrd_Background_Paid"] ||
-             [eveN isEqual:@"Onbrd_Watermard_Paid"] ||
-             [eveN isEqual:@"Onbrd_HeaderFooter_Paid"] ||
-             [eveN isEqual:@"Onbrd_Bates_Paid"] ||
-             [eveN isEqual:@"Onbrd_Security_Paid"]) {
-        return @{@"Paid_Editor" : @"Home_Editor"};
-    }
-    // Paid_Converter SubTbr_Converter
-    else if ([eveN isEqual:@"Reading_PDFtoWord_Paid"] ||
-             [eveN isEqual:@"Reading_PDFtoExcel_Paid"] ||
-              [eveN isEqual:@"Reading_PDFtoPPT_Paid"] ||
-              [eveN isEqual:@"Reading_PDFtoRTF_Paid"] ||
-              [eveN isEqual:@"Reading_PDFtoCSV_Paid"] ||
-              [eveN isEqual:@"Reading_PDFtoText_Paid"] ||
-              [eveN isEqual:@"Reading_PDFtoImage_Paid"] ||
-              [eveN isEqual:@"Reading_ExtractImage_Paid"]) {
-        return @{@"Paid_Converter" : @"SubTbr_Converter"};
-    }
-    // Paid_Converter Home_Converter
-    else if ([eveN isEqual:@"Onbrd_ConvertPDF_Paid"] ||
-             [eveN isEqual:@"Onbrd_PDFtoWord_Paid"] ||
-             [eveN isEqual:@"Onbrd_PDFtoExcel_Paid"] ||
-              [eveN isEqual:@"Onbrd_PDFtoPPT_Paid"] ||
-              [eveN isEqual:@"Onbrd_ImagetoPDF_Paid"]) {
-        return @{@"Paid_Converter" : @"Home_Converter"};
-    }
-    // Paid_Form SubTbr_Forms
-    else if ([eveN isEqual:@"Reading_TextField_Paid"] ||
-             [eveN isEqual:@"Reading_CheckBox_Paid"] ||
-             [eveN isEqual:@"Reading_RadioButton_Paid"] ||
-             [eveN isEqual:@"Reading_ListBox_Paid"] ||
-             [eveN isEqual:@"Reading_ComboBox_Paid"] ||
-             [eveN isEqual:@"Reading_Button_Paid"]) {
-        return @{@"Paid_Form" : @"SubTbr_Forms"};
-    }
-    // Paid_Sign SunTbr_Signature
-    else if ([eveN isEqual:@"Reading_FillSign_Signature_Paid"] ||
-             [eveN isEqual:@"Reading_DigitalSign_Paid"] ||
-             [eveN isEqual:@"Reading_ElectronicSign_Paid"]) {
-        return @{@"Paid_Sign" : @"SunTbr_Signature"};
-    }
-    // Paid_EditPDF Tbr_Edit PDF
-    else if ([eveN isEqual:@"Reading_EditPDF_Paid"] ||
-             [eveN isEqual:@"Reading_ReplaceText_Paid"]) {
-        return @{@"Paid_EditPDF" : @"Tbr_Edit PDF"};
-    }
-    // Paid_Redact Tbr_Redact
-    else if ([eveN isEqual:@"Reading_Redact_Paid"]) {
-        return @{@"Paid_Redact" : @"Tbr_Redact"};
-    }
-    // Paid_OCR SubTbr_OCR
-    else if ([eveN isEqual:@"Reading_OCR_Paid"] ||
-             [eveN isEqual:@"Reading_Convert_OCR_Paid"] ||
-             [eveN isEqual:@"Onbrd_OCR_Paid"]) {
-        return @{@"Paid_OCR" : @"SubTbr_OCR"};
-    }
-    // Paid_PageDisplay SubTbr_Page Display
-    else if ([eveN isEqual:@"Reading_SplitView_Paid"] ||
-             [eveN isEqual:@"Reading_Rotate_Paid"] ||
-             [eveN isEqual:@"Reading_Theme_Paid"] ||
-             [eveN isEqual:@"Reading_MultiTab_Paid"]) {
-        return @{@"Paid_PageDisplay" : @"SubTbr_Page Display"};
-    }
-    //  Home_Others
-    else if ([eveN isEqual:@"Onbrd_PrintPoster_Paid"] ||
-             [eveN isEqual:@"Onbrd_PrintMultiple_Paid"] ||
-             [eveN isEqual:@"Onbrd_PrintBooklet_Paid"]) {
-        return @{@"Paid_Others" : @"Home_Others"};
-    }
-    // Paid_Others SubTbr_Others
-    else if ([eveN isEqual:@"Reading_Flatten_Paid"]) {
-        return @{@"Paid_Others" : @"SubTbr_Others"};
-    }
-    // Paid_Others MenuBar_Others
-    else if ([eveN isEqual:@"MenuBar_PrintPoster_Paid"] ||
-             [eveN isEqual:@"MenuBar_PrintMultiple_Paid"] ||
-             [eveN isEqual:@"MenuBar_PrintBooklet_Paid"]) {
-        return @{@"Paid_Others" : @"MenuBar_Others"};
-    }
-    return nil;
-}
-
 
 @end

+ 5 - 6
PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseEmbeddedWindowController.swift

@@ -286,7 +286,6 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
     override func close() {
         super.close()
         
-        self.clearEventData()
     }
     
     override func showWindow(_ sender: Any?) {
@@ -1523,20 +1522,20 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
     }
     
     private func _trackEvent_paid() {
-        self.trackEvent_dmg(eventName: self.kEventName, params: self.kEventParams, platform: .AppCenter)
+
     }
     
     private func _trackPurchaseCampaignEvent() {
         if self.discountType_ == .newUserGift {
-            self.trackEvent(eventName: "Purchase_Campaign", params: ["Campaign_NewUser":"Tbr_Coupon"], platform: .firebase)
+
         } else if self.discountType_ == .freeTrail {
-            self.trackEvent(eventName: "Purchase_Campaign", params: ["Campaign_NewUser":"Tbr_FreeTrial"], platform: .firebase)
+
         } else if self.discountType_ == .advancedYearSubscribeTrialingCancel {
-            self.trackEvent(eventName: self.kEventName, params: self.kEventParams, platform: .firebase)
+
         }
         
         if (isAIPurchase) {
-            self.trackEvent(eventName: self.kEventName, params: self.kEventParams, platform: .firebase)
+
         }
     }