From 4e4ce36e76d263f661b1f11861937f5cf2ced9f9 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Mon, 21 Jul 2025 17:28:52 +0800
Subject: [PATCH] =?UTF-8?q?add:=E9=B8=BF=E5=90=88=E5=B1=8F=E5=B9=95?=
 =?UTF-8?q?=E4=B9=A6=E5=86=99=E6=9F=A5=E6=9D=80=E5=90=8E=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5=E6=89=B9=E6=B3=A8=20#38?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow.xaml                    |   9 +++++++++
 Ink Canvas/MainWindow_cs/MW_Settings.cs       |   6 ++++++
 Ink Canvas/MainWindow_cs/MW_Timer.cs          |   4 ++++
 Ink Canvas/Resources/Settings.cs              |   3 +++
 ...vasForClass.csproj.AssemblyReference.cache | Bin 35374 -> 35237 bytes
 .../InkCanvasForClass_MarkupCompile.cache     |   2 +-
 6 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index fb6f1c0f..22fc9ca9 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -2262,6 +2262,15 @@
                                                          IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
                                                          Toggled="ToggleSwitchAutoKillHiteAnnotation_Toggled" />
                                     </ui:SimpleStackPanel>
+                                    <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                        <TextBlock Foreground="#fafafa" Text="鸿合屏幕书写查杀后自动进入批注" VerticalAlignment="Center"
+                                                   FontSize="14" Margin="0,0,16,0" />
+                                        <ui:ToggleSwitch OnContent="" OffContent=""
+                                                         Name="ToggleSwitchAutoEnterAnnotationAfterKillHite"
+                                                         IsOn="False" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
+                                                         Toggled="ToggleSwitchAutoEnterAnnotationAfterKillHite_Toggled" />
+                                    </ui:SimpleStackPanel>
+
                                     <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                         <Image Source="/Resources/Icons-png/VComYouJiao.png" Margin="0,0,6,0"
                                                Width="28"
diff --git a/Ink Canvas/MainWindow_cs/MW_Settings.cs b/Ink Canvas/MainWindow_cs/MW_Settings.cs
index 624ad77c..23838114 100644
--- a/Ink Canvas/MainWindow_cs/MW_Settings.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_Settings.cs	
@@ -2183,5 +2183,11 @@ namespace Ink_Canvas {
             Settings.PowerPointSettings.IsAlwaysGoToFirstPageOnReenter = ToggleSwitchAlwaysGoToFirstPageOnReenter.IsOn;
             SaveSettingsToFile();
         }
+
+        private void ToggleSwitchAutoEnterAnnotationAfterKillHite_Toggled(object sender, RoutedEventArgs e) {
+            if (!isLoaded) return;
+            Settings.Automation.IsAutoEnterAnnotationAfterKillHite = ToggleSwitchAutoEnterAnnotationAfterKillHite.IsOn;
+            SaveSettingsToFile();
+        }
     }
 }
diff --git a/Ink Canvas/MainWindow_cs/MW_Timer.cs b/Ink Canvas/MainWindow_cs/MW_Timer.cs
index 1f4cda1d..0e028b9e 100644
--- a/Ink Canvas/MainWindow_cs/MW_Timer.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_Timer.cs	
@@ -150,6 +150,10 @@ namespace Ink_Canvas {
                     if (arg.Contains("HiteAnnotation")) {
                         Dispatcher.Invoke(() => {
                             ShowNotification("“鸿合屏幕书写”已自动关闭");
+                            if (Settings.Automation.IsAutoKillHiteAnnotation && Settings.Automation.IsAutoEnterAnnotationAfterKillHite) {
+                                // 自动进入批注状态
+                                EnterAnnotationMode();
+                            }
                         });
                     }
 
diff --git a/Ink Canvas/Resources/Settings.cs b/Ink Canvas/Resources/Settings.cs
index 1c4065f3..32a6a9eb 100644
--- a/Ink Canvas/Resources/Settings.cs	
+++ b/Ink Canvas/Resources/Settings.cs	
@@ -378,6 +378,9 @@ namespace Ink_Canvas
         
         [JsonProperty("isSaveFullPageStrokes")]
         public bool IsSaveFullPageStrokes = false;
+
+        [JsonProperty("isAutoEnterAnnotationAfterKillHite")]
+        public bool IsAutoEnterAnnotationAfterKillHite { get; set; } = false;
     }
 
     public class Advanced
diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache
index 4af914e22079d93b58f0e03491291464a0dba41e..007dd88682c1e146a5e6a6e4853914122d4656c7 100644
GIT binary patch
delta 23
ecmZ2Cg=y(zCJr`6T?PgQ#>B~j@}V1JJvsqL(gqX&

delta 70
zcmZ2FnQ7e=CJr`6Jq88_#>B~j@}V1JJvt{RD27kAm*kqv$IYhXte29L!^j9!!0^EF
X#&?CQ93Zt^WhQzCdd3FEhL#KfgtieT

diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache
index f4d9f6d1..3fd0ce8b 100644
--- a/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache	
+++ b/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache	
@@ -16,5 +16,5 @@ E:\ICC CE\ICC CE main\community\Ink Canvas\App.xaml
 471037513499
 Helpers\Plugins\BuiltIn\SuperLauncher\LauncherSettingsControl.xaml;Helpers\Plugins\BuiltIn\SuperLauncher\LauncherWindow.xaml;MainWindow.xaml;MainWindow_cs\MW_Eraser.xaml;Resources\DrawShapeImageDictionary.xaml;Resources\IconImageDictionary.xaml;Resources\SeewoImageDictionary.xaml;Resources\Styles\Dark.xaml;Resources\Styles\Light.xaml;Windows\AddCustomIconWindow.xaml;Windows\AddPickNameBackgroundWindow.xaml;Windows\CountdownTimerWindow.xaml;Windows\CustomIconWindow.xaml;Windows\CycleProcessBar.xaml;Windows\HasNewUpdateWindow.xaml;Windows\ManagePickNameBackgroundsWindow.xaml;Windows\NamesInputWindow.xaml;Windows\OperatingGuideWindow.xaml;Windows\PluginSettingsWindow.xaml;Windows\RandWindow.xaml;Windows\YesOrNoNotificationWindow.xaml;
 
-False
+True