Skip to content

Commit b19c19d

Browse files
committed
优化日志
1 parent feb3fad commit b19c19d

File tree

2 files changed

+6
-30
lines changed

2 files changed

+6
-30
lines changed

Ink Canvas/Helpers/InkRecognitionManager.cs

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,16 @@ private void Initialize()
5050
_modernProcessor = new ModernInkProcessor();
5151
_modernAnalyzer = new ModernInkAnalyzer();
5252
_isModernSystemAvailable = true;
53-
LogHelper.WriteLogToFile(
54-
$"墨迹识别管理器:使用现代化墨迹识别系统 (WinRT) - 进程64位: {Environment.Is64BitProcess}, OS64位: {Environment.Is64BitOperatingSystem}");
5553
}
5654
catch (Exception ex)
5755
{
58-
LogHelper.WriteLogToFile("WinRT API不可用,回退到IACore: " + ex.Message, LogHelper.LogType.Warning);
56+
LogHelper.WriteLogToFile("WinRT 墨迹初始化失败: " + ex.Message, LogHelper.LogType.Warning);
5957
_isModernSystemAvailable = false;
6058
_modernProcessor = null;
6159
_modernAnalyzer = null;
6260
}
6361
}
6462

65-
if (!_isModernSystemAvailable)
66-
LogHelper.WriteLogToFile("墨迹识别管理器:使用IACore墨迹识别系统");
67-
6863
_isInitialized = true;
6964
}
7065
catch (Exception ex)
@@ -86,7 +81,7 @@ public Task<InkShapeRecognitionResult> RecognizeShapeAsync(
8681
if (ShapeRecognitionRouter.ResolveUseWinRt(mode)
8782
&& WinRtInkShapeRecognizer.IsApiAvailable)
8883
{
89-
return RunWinRtOrLogAsync(strokes);
84+
return RecognizeShapeWinRtOnDispatcherContext(strokes);
9085
}
9186

9287
var legacy = InkRecognizeHelper.RecognizeShapeIACore(strokes);
@@ -99,17 +94,10 @@ public Task<InkShapeRecognitionResult> RecognizeShapeAsync(
9994
}
10095
}
10196

102-
private static async Task<InkShapeRecognitionResult> RunWinRtOrLogAsync(StrokeCollection strokes)
97+
private static async Task<InkShapeRecognitionResult> RecognizeShapeWinRtOnDispatcherContext(
98+
StrokeCollection strokes)
10399
{
104-
try
105-
{
106-
return await WinRtInkShapeRecognizer.RecognizeShapeAsync(strokes).ConfigureAwait(true);
107-
}
108-
catch (Exception ex)
109-
{
110-
LogHelper.WriteLogToFile("WinRT 墨迹形状识别异常: " + ex, LogHelper.LogType.Error);
111-
return InkShapeRecognitionResult.Empty;
112-
}
100+
return await WinRtInkShapeRecognizer.RecognizeShapeAsync(strokes).ConfigureAwait(true);
113101
}
114102

115103
public Task<StrokeCollection> CorrectInkAsync(

Ink Canvas/Helpers/WinRtInkShapeRecognizer.cs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,27 +67,16 @@ internal static async Task<InkShapeRecognitionResult> RecognizeShapeAsync(Stroke
6767
}
6868

6969
if (added == 0)
70-
{
71-
LogHelper.WriteLogToFile(
72-
"WinRT 形状识别:未能从 WPF 笔迹生成 InkStroke(检查 StylusPoints/DrawingAttributes)。",
73-
LogHelper.LogType.Warning);
7470
return InkShapeRecognitionResult.Empty;
75-
}
7671

7772
await analyzer.AnalyzeAsync().AsTask().ConfigureAwait(true);
7873

7974
var drawing = FindPrimaryDrawing(analyzer);
8075
if (drawing == null)
81-
{
82-
LogHelper.WriteLogToFile("WinRT 形状识别:分析完成但未找到 InkAnalysisInkDrawing 节点。", LogHelper.LogType.Trace);
8376
return InkShapeRecognitionResult.Empty;
84-
}
8577

8678
if (drawing.DrawingKind == global::Windows.UI.Input.Inking.Analysis.InkAnalysisDrawingKind.Drawing)
87-
{
88-
LogHelper.WriteLogToFile("WinRT 形状识别:结果为 Drawing(未识别为规则形状)。", LogHelper.LogType.Trace);
8979
return InkShapeRecognitionResult.Empty;
90-
}
9180

9281
var name = MapDrawingKindToShapeName(drawing.DrawingKind);
9382
if (string.IsNullOrEmpty(name) || name == "Drawing")
@@ -105,9 +94,8 @@ internal static async Task<InkShapeRecognitionResult> RecognizeShapeAsync(Stroke
10594

10695
return new InkShapeRecognitionResult(name, centroid, hot, w, h, toRemove);
10796
}
108-
catch (Exception ex)
97+
catch (Exception)
10998
{
110-
LogHelper.WriteLogToFile("WinRtInkShapeRecognizer 异常: " + ex, LogHelper.LogType.Error);
11199
return InkShapeRecognitionResult.Empty;
112100
}
113101
}

0 commit comments

Comments
 (0)