解决多个引用冲突问题，修复触摸写字时画笔设置面板不自动隐藏的问题，3.2.6.1

STBBRD · Nov 17, 2024 · 7be3b11 · 7be3b11
1 parent 417b5df
commit 7be3b11
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/ZongziTEK_Blackboard_Sticker/MainWindow.xaml.cs b/ZongziTEK_Blackboard_Sticker/MainWindow.xaml.cs
@@ -30,6 +30,7 @@
 using System.Windows.Interop;
 using iNKORE.UI.WPF.Controls;
 using ScrollViewerBehavior = ZongziTEK_Blackboard_Sticker.Helpers.ScrollViewerBehavior;
+using Sentry;
 
 namespace ZongziTEK_Blackboard_Sticker
 {
@@ -560,6 +561,8 @@ private void touchGrid_ManipulationDelta(object sender, ManipulationDeltaEventAr
 
         private void inkCanvas_PreviewTouchDown(object sender, TouchEventArgs e)
         {
+            HideColorPicker();
+
             dec.Add(e.TouchDevice.Id);
             //设备1个的时候，记录中心点
             if (dec.Count == 1)

diff --git a/ZongziTEK_Blackboard_Sticker/Properties/AssemblyInfo.cs b/ZongziTEK_Blackboard_Sticker/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.2.6.0")]
-[assembly: AssemblyFileVersion("3.2.6.0")]
+[assembly: AssemblyVersion("3.2.6.1")]
+[assembly: AssemblyFileVersion("3.2.6.1")]
diff --git a/ZongziTEK_Blackboard_Sticker/ZongziTEK_Blackboard_Sticker.csproj b/ZongziTEK_Blackboard_Sticker/ZongziTEK_Blackboard_Sticker.csproj
@@ -416,7 +416,10 @@
       <Version>13.0.3</Version>
     </PackageReference>
     <PackageReference Include="Sentry">
-      <Version>4.12.1</Version>
+      <Version>4.13.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Text.Json">
+      <Version>9.0.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>