综合-阅读页退出、注释删除

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Command.cs

@@ -1247,6 +1247,7 @@ namespace PDF_Master.ViewModels.Tools
                                     case "Link":
                                         PropertyPanel.IsAddLink = true;
                                         GetLink();
+                                        events.GetEvent<LinkAnnotTipCloseEvent>().Publish(new LinkAnnotTipCloseArgs() { UniCode = App.mainWindowViewModel.SelectedItem.Unicode });
                                         break;
                                 }
                             }

PDF Office/ViewModels/ViewContentViewModel.cs

@@ -204,6 +204,7 @@ namespace PDF_Master.ViewModels
         #endregion 文案
 
         #region 属性、变量
+
         public bool IsMultiSelected { get; set; } = false;
         public OpenFileInfo OpenFileInfo = null;
         public CPDFViewer PDFViewer { get; set; }
@@ -1980,7 +1981,8 @@ namespace PDF_Master.ViewModels
             PDFViewer.DisableClearSelectAnnot(false);
             PDFViewer.ClearSelectAnnots();
             PDFViewer.SetMouseMode(MouseModes.PanTool);
-
+            var annotArgs = new SelectToolArgs();
+            PDFViewer.SetToolParam(annotArgs);
             ShowTip(true);
             await Task.Delay(3000);
             //ReadModelTip = Visibility.Collapsed;
@@ -2026,7 +2028,6 @@ namespace PDF_Master.ViewModels
 
         #endregion PDFViewer鼠标滚轮缩放事件
 
-
         #region 方法
 
         /// <summary>
@@ -2172,8 +2173,8 @@ namespace PDF_Master.ViewModels
             CanSave = PDFViewer.UndoManager.CanSave;
             CanUndo = PDFViewer.UndoManager.CanUndo;
             CanRedo = PDFViewer.UndoManager.CanRedo;
-           
-            if(!CheckPassword())
+
+            if (!CheckPassword())
             {
                 return false;
             }
@@ -2182,7 +2183,7 @@ namespace PDF_Master.ViewModels
             PDFViewer.SetFormFieldHighlight(Settings.Default.AppProperties.InitialVIew.HighlightLink);
             PDFViewer.SetBackgroundBrush(new System.Windows.Media.SolidColorBrush(Settings.Default.AppProperties.InitialVIew.BackGround));
             //设置移动注释参考线
-            ComPDFKitViewer.CommonDrawData.MovePen = new System.Windows.Media.Pen((System.Windows.Media.Brush)new BrushConverter().ConvertFromString("#1770F4"),1);
+            ComPDFKitViewer.CommonDrawData.MovePen = new System.Windows.Media.Pen((System.Windows.Media.Brush)new BrushConverter().ConvertFromString("#1770F4"), 1);
             //还原上一次关闭前的视图设置
             GetOpenFileInfo();
 
@@ -2619,7 +2620,7 @@ namespace PDF_Master.ViewModels
         {
             PDFViewer.UndoManager.CanSave = false;
 
-            //从新路径重新加载 
+            //从新路径重新加载
             //用mianviewmodel.openfile的方法会有其他模块的pdfview更新不过来的情况，需要调整成现有的方法
             PDFViewer.CloseDocument();
             PDFViewer.InitDocument(targetPath);