按钮埋点-调整至比较表之前

PDF Office/ViewModels/PageEdit/PageEditContentViewModel.cs

@@ -728,7 +728,7 @@ namespace PDF_Master.ViewModels.PageEdit
         /// </summary>
         private async void ReplaceCommandEvent()
         {
-            
+            DataTrackingHelper.SendEvent(DataTrackingHelper.EventType.SubTbr_PageEdit, "SubTbr_Btn", "Btn_SubTbr_Replace");
             //支持插入格式：PDF、图片、Office格式文件
             string allfiles = Pdf + Txt + Word + Excel + Ppt + Image + Html;
 
@@ -834,7 +834,6 @@ namespace PDF_Master.ViewModels.PageEdit
                         ReloadAfterOption(true, false, Tuple.Create(insertIndex - 1, insertIndex + pageCount));
                     }
                 }
-                DataTrackingHelper.SendEvent(DataTrackingHelper.EventType.SubTbr_PageEdit, "SubTbr_Btn", "Btn_SubTbr_Replace");
                 IsLoading = Visibility.Collapsed;
             }
         }
@@ -844,6 +843,7 @@ namespace PDF_Master.ViewModels.PageEdit
         /// </summary>
         private void SplitCommandEvent()
         {
+            DataTrackingHelper.SendEvent(DataTrackingHelper.EventType.SubTbr_PageEdit, "SubTbr_Btn", "Btn_SubTbr_Split");
             DialogParameters valuePairs = new DialogParameters();
             valuePairs.Add(ParameterNames.PDFViewer, PDFViewer);
             valuePairs.Add(ParameterNames.PageEditSelectedIndex, ListSelectedIndex);
@@ -857,7 +857,6 @@ namespace PDF_Master.ViewModels.PageEdit
                     {
                         return;
                     }
-                    DataTrackingHelper.SendEvent(DataTrackingHelper.EventType.SubTbr_PageEdit, "SubTbr_Btn", "Btn_SubTbr_Split");
                     var model = e.Parameters.GetValue<HomePageSplitDialogModel>(ParameterNames.DataModel);
                     DoSplitPages(model);
                 }
@@ -869,6 +868,7 @@ namespace PDF_Master.ViewModels.PageEdit
         /// </summary>
         private void ExtractCommandEvent()
         {
+            DataTrackingHelper.SendEvent(DataTrackingHelper.EventType.SubTbr_PageEdit, "SubTbr_Btn", "Btn_SubTbr_Extract");
             DialogParameters keyValuePairs = new DialogParameters();
 
             //因无法删除所有页面，若选中所有页面提取，则需要将「提取后删除页面」复选项置灰
@@ -889,7 +889,6 @@ namespace PDF_Master.ViewModels.PageEdit
                     {
                         return;
                     }
-                    DataTrackingHelper.SendEvent(DataTrackingHelper.EventType.SubTbr_PageEdit, "SubTbr_Btn", "Btn_SubTbr_Extract");
                     var model = e.Parameters.GetValue<ExtractModel>(ParameterNames.DataModel);
                     DoExtractPages(model.IsEveryPageToFile, model.IsDeleteAfterExtract);
                 }
@@ -901,6 +900,7 @@ namespace PDF_Master.ViewModels.PageEdit
         /// </summary>
         private async void InsertCommandEvent(object type)
         {
+            DataTrackingHelper.SendEvent(DataTrackingHelper.EventType.SubTbr_PageEdit, "SubTbr_Btn", "Btn_SubTbr_Insert");
             if ((string)type == null)
             {
                 return;
@@ -973,7 +973,6 @@ namespace PDF_Master.ViewModels.PageEdit
                 await Task.Delay(10);
                 //选中插入的页面
                 ListSelectedIndex = insertIndex;
-                DataTrackingHelper.SendEvent(DataTrackingHelper.EventType.SubTbr_PageEdit, "SubTbr_Btn", "Btn_SubTbr_Insert");
             }
 
             #endregion 插入空白页面
@@ -1233,6 +1232,7 @@ namespace PDF_Master.ViewModels.PageEdit
         /// </summary>
         private async void DeleteCommandEvent()
         {
+            DataTrackingHelper.SendEvent(DataTrackingHelper.EventType.SubTbr_PageEdit, "SubTbr_Btn", "Btn_SubTbr_Delete");
             AlertsMessage alertsMessage = new AlertsMessage();
             alertsMessage.ShowDialog("", T_DeleteLook, App.ServiceLoader.GetString("Text_no"), App.ServiceLoader.GetString("Text_ok"));
             
@@ -1275,7 +1275,6 @@ namespace PDF_Master.ViewModels.PageEdit
                 //通知Xaml删除后 选中的页面，从VM设置选中项会有问题
                 NotifyUIToRefresh(new List<int>() { index });
                 IsLoading = Visibility.Collapsed;
-                DataTrackingHelper.SendEvent(DataTrackingHelper.EventType.SubTbr_PageEdit, "SubTbr_Btn", "Btn_SubTbr_Delete");
             }
         }
 
@@ -1284,7 +1283,7 @@ namespace PDF_Master.ViewModels.PageEdit
         /// </summary>
         private void LeftRotateCommandEvent()
         {
-           
+            DataTrackingHelper.SendEvent(DataTrackingHelper.EventType.SubTbr_PageEdit, "SubTbr_Btn", "Btn_SubTbr_Rotate");
             List<int> pageitems = new List<int>();
             if (IsMouseRightButtonDown)
             {
@@ -1302,7 +1301,6 @@ namespace PDF_Master.ViewModels.PageEdit
             {
                 RotateSelectedPages(false);
             }
-            DataTrackingHelper.SendEvent(DataTrackingHelper.EventType.SubTbr_PageEdit, "SubTbr_Btn", "Btn_SubTbr_Rotate");
         }
 
         /// <summary>
@@ -1310,7 +1308,7 @@ namespace PDF_Master.ViewModels.PageEdit
         /// </summary>
         private void RightRotateCommandEvent()
         {
-            
+            DataTrackingHelper.SendEvent(DataTrackingHelper.EventType.SubTbr_PageEdit, "SubTbr_Btn", "Btn_SubTbr_Rotate");
             List<int> pageitems = new List<int>();
             if (IsMouseRightButtonDown)
             {
@@ -1328,7 +1326,6 @@ namespace PDF_Master.ViewModels.PageEdit
             {
                 RotateSelectedPages();
             }
-            DataTrackingHelper.SendEvent(DataTrackingHelper.EventType.SubTbr_PageEdit, "SubTbr_Btn", "Btn_SubTbr_Rotate");
         }
 
         /// <summary>
@@ -1336,6 +1333,7 @@ namespace PDF_Master.ViewModels.PageEdit
         /// </summary>
         private async void ReverseCommandEvent()
         {
+            DataTrackingHelper.SendEvent(DataTrackingHelper.EventType.SubTbr_PageEdit, "SubTbr_Btn", "Btn_SubTbr_Reverse");
             IsLoading = Visibility.Visible;
             await Task.Delay(3);
             List<int> pages = new List<int>();
@@ -1347,7 +1345,6 @@ namespace PDF_Master.ViewModels.PageEdit
                 }
             }
             DoReverse(pages);
-            DataTrackingHelper.SendEvent(DataTrackingHelper.EventType.SubTbr_PageEdit, "SubTbr_Btn", "Btn_SubTbr_Reverse");
             IsLoading = Visibility.Collapsed;
         }
 
@@ -1891,11 +1888,11 @@ namespace PDF_Master.ViewModels.PageEdit
         /// </summary>
         private void copy()
         {
+            DataTrackingHelper.SendEvent(DataTrackingHelper.EventType.SubTbr_PageEdit, "SubTbr_Btn", "Btn_SubTbr_Copy");
             if (!ServiceHelper.IAPBeforeFunction())
             {
                 return;
             }
-            DataTrackingHelper.SendEvent(DataTrackingHelper.EventType.SubTbr_PageEdit, "SubTbr_Btn", "Btn_SubTbr_Copy");
             if (viewContentViewModel.CheckPermissionBeforeOption())
             {
                 int pageIndex = 0;

PDF Office/ViewModels/ViewContentViewModel.cs

@@ -2176,7 +2176,7 @@ namespace PDF_Master.ViewModels
             }
         }
         /// <summary>
-        /// 选项卡切换事件
+        /// 选项卡切换事件埋点
         /// </summary>
         /// <param name="e"></param>
         private void TabControlSelectonDataTracking(string currentBar)