代码优化

Ink Canvas/Helpers/InkRecognizeHelper.cs

@@ -48,13 +48,17 @@ namespace Ink_Canvas.Helpers
                             break;
                     }
                     if (alternates.Count > 0)
-                        analysisAlternate = alternates[0];
+                    {
+                        var altFinal = alternates[0];
+                        if (altFinal?.AlternateNodes != null && altFinal.AlternateNodes.Count > 0)
+                            analysisAlternate = altFinal;
+                    }
                 }
             }
 
             analyzer.Dispose();
 
-            if (analysisAlternate != null && analysisAlternate.AlternateNodes.Count > 0)
+            if (analysisAlternate != null && analysisAlternate.AlternateNodes != null && analysisAlternate.AlternateNodes.Count > 0)
             {
                 var node = analysisAlternate.AlternateNodes[0] as InkDrawingNode;
                 if (node == null)

Ink Canvas/Helpers/SoftwareLauncher.cs

@@ -49,16 +49,13 @@ namespace Ink_Canvas.Helpers
             if (string.IsNullOrWhiteSpace(softwareName))
                 return null;
 
-            // 64 位进程默认只枚举 64 位注册表视图；32 位希沃常写在 WOW6432Node 下，需一并扫描。
-            string[] uninstallRoots =
+            // 须用 OpenBaseKey + RegistryView 显式指定视图：Registry.LocalMachine.OpenSubKey 跟随进程位数，
+            // 32 位进程下无法靠拼接 WOW6432Node 路径进入 64 位视图，会找不到 64 位安装的展台。
+            const string uninstallSubKey = @"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall";
+            foreach (RegistryView view in new[] { RegistryView.Registry64, RegistryView.Registry32 })
             {
-                @"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall",
-                @"SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall",
-            };
-
-            foreach (string root in uninstallRoots)
-            {
-                using (RegistryKey key = Registry.LocalMachine.OpenSubKey(root))
+                using (RegistryKey baseKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, view))
+                using (RegistryKey key = baseKey.OpenSubKey(uninstallSubKey))
                 {
                     if (key == null) continue;
                     string found = FindInUninstallKey(key, softwareName);

Ink Canvas/Helpers/TimeMachine.cs

@@ -100,8 +100,8 @@ namespace Ink_Canvas.Helpers
             var item = _currentStrokeHistory[_currentIndex];
             item.StrokeHasBeenCleared = !item.StrokeHasBeenCleared;
             _currentIndex--;
-            OnUndoStateChanged?.Invoke(_currentIndex > -1);
-            OnRedoStateChanged?.Invoke(_currentStrokeHistory.Count - _currentIndex - 1 > 0);
+            OnUndoStateChanged?.Invoke(CanUndo);
+            OnRedoStateChanged?.Invoke(CanRedo);
             return item;
         }
 
@@ -137,8 +137,8 @@ namespace Ink_Canvas.Helpers
         }
         private void NotifyUndoRedoState()
         {
-            OnUndoStateChanged?.Invoke(_currentIndex > -1);
-            OnRedoStateChanged?.Invoke(_currentStrokeHistory.Count - _currentIndex - 1 > 0);
+            OnUndoStateChanged?.Invoke(CanUndo);
+            OnRedoStateChanged?.Invoke(CanRedo);
         }
 
         /// <summary>当前历史是否允许撤销。</summary>

Ink Canvas/Helpers/WinRtHandwritingRecognizer.cs

@@ -40,7 +40,9 @@ namespace Ink_Canvas.Helpers
                 {
                     try
                     {
-                        await RecognizeHandwritingAsync(new StrokeCollection()).ConfigureAwait(true);
+                        await RecognizeHandwritingAsync(
+                            WinRtInkShapeRecognizer.CreateMinimalWarmupStrokeCollection(),
+                            verboseTrace: false).ConfigureAwait(true);
                     }
                     catch
                     {
@@ -59,12 +61,15 @@ namespace Ink_Canvas.Helpers
         /// 再对每一分词用 <see cref="WinRtInk.InkRecognizerContainer"/> 取 <c>GetTextCandidates</c>（与当前 SDK 中部分版本的
         /// <see cref="WinRtInk.InkRecognitionResult"/> 未暴露笔画映射的局限兼容）。
         /// </summary>
-        public static async Task<HandwritingRecognitionResult> RecognizeHandwritingAsync(StrokeCollection strokes)
+        /// <param name="verboseTrace">为 false 时跳过详细识别日志（用于 <see cref="Warmup"/> 等）。</param>
+        public static async Task<HandwritingRecognitionResult> RecognizeHandwritingAsync(
+            StrokeCollection strokes,
+            bool verboseTrace = true)
         {
             if (!IsApiAvailable || strokes == null || strokes.Count == 0)
                 return HandwritingRecognitionResult.Empty;
 
-            var traceRecognition = strokes.Count > 0;
+            var traceRecognition = verboseTrace;
 
             try
             {

Ink Canvas/Helpers/WinRtInkShapeRecognizer.cs

@@ -28,7 +28,8 @@ namespace Ink_Canvas.Helpers
                 {
                     try
                     {
-                        await RecognizeShapeAsync(new StrokeCollection());
+                        // 空 StrokeCollection 在 RecognizeShapeAsync 入口会直接返回，无法预热 WinRT InkAnalyzer。
+                        await RecognizeShapeAsync(CreateMinimalWarmupStrokeCollection()).ConfigureAwait(true);
                     }
                     catch
                     {
@@ -99,6 +100,23 @@ namespace Ink_Canvas.Helpers
             }
         }
 
+        /// <summary>
+        /// 极短合成笔画，供 <see cref="Warmup"/> 等场景走完整 WinRT 转换与分析管线（空集合在入口处会被直接返回）。
+        /// </summary>
+        internal static StrokeCollection CreateMinimalWarmupStrokeCollection()
+        {
+            var da = new DrawingAttributes { Color = Colors.Black, Width = 2, Height = 2 };
+            var pts = new StylusPointCollection
+            {
+                new StylusPoint(8, 8),
+                new StylusPoint(14, 10),
+                new StylusPoint(20, 8),
+            };
+            var col = new StrokeCollection();
+            col.Add(new Stroke(pts, da));
+            return col;
+        }
+
         /// <summary>供 WinRT 手写等模块复用：将 WPF <see cref="Stroke"/> 转为 WinRT <see cref="global::Windows.UI.Input.Inking.InkStroke"/>。</summary>
         internal static global::Windows.UI.Input.Inking.InkStroke CreateInkStrokeFromWpf(Stroke stroke)
         {