页面编辑-付费锁 更改放置位置

PDF Office/ViewModels/PageEdit/PageEditContentViewModel.cs

@@ -1330,15 +1330,18 @@ namespace PDF_Master.ViewModels.PageEdit
                 {
                     TbPageRange = (listSelecedIndex + 1).ToString();
                     //缩放 平移移动页面，页面大小出现不全的问题
-                    listbox.ScrollIntoView(listbox.SelectedItems[0]);
+                    //listbox.ScrollIntoView(listbox.SelectedItems[0]);
                     //需要刷新 startRefreshIndex 、endRefreshedIndex
                     //NotifyUIToRefresh();
                     //保险起见，暂时只能用这个方法
-                    var itemSize = new Size((listbox.Items[0] as PageEditItem).ItemSize.Width + 32, (listbox.Items[0] as PageEditItem).ItemSize.Height + 30);
-                    Tuple<int, int, int> range = (Tuple<int, int, int>)GetRoughFromView(listbox, itemSize, new Thickness(5, 10, 5, 10));
-                    //RefreshItemImage(range.Item1, range.Item2);
-                    startRefreshedIndex = range.Item1;
-                    endRefreshedIndex = range.Item2;
+                    if (listbox != null)
+                    {
+                        var itemSize = new Size((listbox.Items[0] as PageEditItem).ItemSize.Width + 32, (listbox.Items[0] as PageEditItem).ItemSize.Height + 30);
+                        Tuple<int, int, int> range = (Tuple<int, int, int>)GetRoughFromView(listbox, itemSize, new Thickness(5, 10, 5, 10));
+                        //RefreshItemImage(range.Item1, range.Item2);
+                        startRefreshedIndex = range.Item1;
+                        endRefreshedIndex = range.Item2;
+                    }
                 }
                 else
                 {

PDF Office/Views/PageEdit/PageEditContent.xaml.cs

@@ -721,6 +721,15 @@ namespace PDF_Master.Views.PageEdit
 
                 if (isDragingEnter)
                 {
+                    //不能将付费锁 放到 grid_DragOver，会卡顿
+                    //将付费锁逻辑提前，避免因弹窗显示后导致虚影无法消失问题
+                    if (!ServiceHelper.IAPBeforeFunction())
+                    {
+                        LineInset.Visibility = Visibility.Collapsed;
+                        ImgPicture.Visibility = Visibility.Collapsed;
+                        isDragingEnter = false;
+                        return;
+                    }
                     //注释从外部拖拽插入文件的功能
                     var files = (string[])e.Data.GetData(DataFormats.FileDrop);
                     Array.Reverse(files);
@@ -870,11 +879,6 @@ namespace PDF_Master.Views.PageEdit
                 string[] file = (string[])e.Data.GetData(DataFormats.FileDrop);
                 if (file != null)
                 {
-                    //将付费锁逻辑提前，避免因弹窗显示后导致虚影无法消失问题
-                    if (!ServiceHelper.IAPBeforeFunction())
-                    {
-                        return;
-                    }
                 }
 
                 //滚动后有 位置不准确 要减去滚动偏移量