From f6056bf4e92e745fc9b472ffc915075bdf282de9 Mon Sep 17 00:00:00 2001
From: Aigio Liu <lysoft.pw@foxmail.com>
Date: Wed, 22 Mar 2023 13:40:55 +0800
Subject: [PATCH] Misc

---
 .gitignore                                       |  3 +++
 .../BD.WTTS.Client.Avalonia.App.csproj           |  2 +-
 src/BD.WTTS.Client.Avalonia.App/Info.plist       |  2 +-
 .../Properties/AssemblyInfo.Xaml.cs              |  4 ++--
 src/BD.WTTS.Client.Avalonia.App/UI/App.axaml.cs  |  9 ++++++++-
 .../UI/Styling/CustomTheme.axaml.cs              |  4 ----
 .../UI/Views/Pages/MainView.axaml.cs             | 14 ++++++++++----
 .../UI/Views/Windows/CoreWindow.props.cs         |  2 --
 .../UI/Views/Windows/MainWindow.axaml.cs         | 16 ++++++++++------
 src/BD.WTTS.Client/App/IApplication.Log.cs       | 11 +++++++++--
 src/BD.WTTS.Client/BD.WTTS.Client.csproj         |  2 ++
 src/ImplicitUsings.Avalonia.cs                   | 11 ++++++++++-
 12 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4f8c770b4..9b8a57e11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -574,6 +574,9 @@ iOSInjectionProject/
 *.out
 *.app
 
+# macOS
+.DS_Store
+
 # WTTS
 .idea
 /pkg
diff --git a/src/BD.WTTS.Client.Avalonia.App/BD.WTTS.Client.Avalonia.App.csproj b/src/BD.WTTS.Client.Avalonia.App/BD.WTTS.Client.Avalonia.App.csproj
index 44933b550..8ff29d791 100644
--- a/src/BD.WTTS.Client.Avalonia.App/BD.WTTS.Client.Avalonia.App.csproj
+++ b/src/BD.WTTS.Client.Avalonia.App/BD.WTTS.Client.Avalonia.App.csproj
@@ -5,7 +5,7 @@
 		<OutputType>Exe</OutputType>
 		<RootNamespace>BD.WTTS</RootNamespace>
 		<DefineConstants>AVALONIA;$(DefineConstants)</DefineConstants>
-		<ApplicationId>net.steampp.app.v3</ApplicationId>
+		<ApplicationId>net.steampp.app</ApplicationId>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="$(TargetFramework.StartsWith('net3')) OR $(TargetFramework.StartsWith('net4')) OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
diff --git a/src/BD.WTTS.Client.Avalonia.App/Info.plist b/src/BD.WTTS.Client.Avalonia.App/Info.plist
index 4af3a783e..daa11ea91 100644
--- a/src/BD.WTTS.Client.Avalonia.App/Info.plist
+++ b/src/BD.WTTS.Client.Avalonia.App/Info.plist
@@ -25,6 +25,6 @@
 	<key>XSAppIconAssets</key>
 	<string>Assets.xcassets/AppIcon.appiconset</string>
 	<key>CFBundleIdentifier</key>
-	<string>net.steampp.app.v3</string>
+	<string>net.steampp.app</string>
 </dict>
 </plist>
diff --git a/src/BD.WTTS.Client.Avalonia.App/Properties/AssemblyInfo.Xaml.cs b/src/BD.WTTS.Client.Avalonia.App/Properties/AssemblyInfo.Xaml.cs
index aa2bd09ce..05eac21f3 100644
--- a/src/BD.WTTS.Client.Avalonia.App/Properties/AssemblyInfo.Xaml.cs
+++ b/src/BD.WTTS.Client.Avalonia.App/Properties/AssemblyInfo.Xaml.cs
@@ -1,11 +1,11 @@
-//steampp
+// steampp
 [assembly: XmlnsDefinition("https://steampp.net/ui", "BD.WTTS.UI.Views")]
 [assembly: XmlnsDefinition("https://steampp.net/ui", "BD.WTTS.UI.Styling")]
 [assembly: XmlnsDefinition("https://steampp.net/ui", "BD.WTTS.UI.Views.Controls")]
 [assembly: XmlnsDefinition("https://steampp.net/ui", "BD.WTTS.UI.Views.Pages")]
 [assembly: XmlnsDefinition("https://steampp.net/ui", "BD.WTTS.UI.Views.Windows")]
 
-//FluentAvaloniaUI
+// FluentAvaloniaUI
 [assembly: XmlnsDefinition("https://github.com/amwx/FluentAvalonia", "FluentAvalonia.UI.Controls")]
 [assembly: XmlnsDefinition("https://github.com/amwx/FluentAvalonia", "FluentAvalonia.UI.Windowing")]
 [assembly: XmlnsDefinition("https://github.com/amwx/FluentAvalonia", "FluentAvalonia.UI.Controls.Primitives")]
\ No newline at end of file
diff --git a/src/BD.WTTS.Client.Avalonia.App/UI/App.axaml.cs b/src/BD.WTTS.Client.Avalonia.App/UI/App.axaml.cs
index ff1db135a..d03a1172c 100644
--- a/src/BD.WTTS.Client.Avalonia.App/UI/App.axaml.cs
+++ b/src/BD.WTTS.Client.Avalonia.App/UI/App.axaml.cs
@@ -8,7 +8,14 @@ public sealed partial class App : Application
 
     public override void Initialize()
     {
-        AvaloniaXamlLoader.Load(this);
+        try
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+        catch (Exception ex)
+        {
+            Log.Error(TAG, ex, "load Xaml fail.");
+        }
     }
 
     public override void RegisterServices()
diff --git a/src/BD.WTTS.Client.Avalonia.App/UI/Styling/CustomTheme.axaml.cs b/src/BD.WTTS.Client.Avalonia.App/UI/Styling/CustomTheme.axaml.cs
index d3297de20..71d638e13 100644
--- a/src/BD.WTTS.Client.Avalonia.App/UI/Styling/CustomTheme.axaml.cs
+++ b/src/BD.WTTS.Client.Avalonia.App/UI/Styling/CustomTheme.axaml.cs
@@ -1,7 +1,3 @@
-using Avalonia.Markup.Xaml.Styling;
-using FluentAvalonia.Interop;
-using FluentAvalonia.Styling;
-
 namespace BD.WTTS.UI.Styling;
 
 /// <summary>
diff --git a/src/BD.WTTS.Client.Avalonia.App/UI/Views/Pages/MainView.axaml.cs b/src/BD.WTTS.Client.Avalonia.App/UI/Views/Pages/MainView.axaml.cs
index 6cc1ffe3d..920a0d3cf 100644
--- a/src/BD.WTTS.Client.Avalonia.App/UI/Views/Pages/MainView.axaml.cs
+++ b/src/BD.WTTS.Client.Avalonia.App/UI/Views/Pages/MainView.axaml.cs
@@ -1,10 +1,9 @@
-using Avalonia.Controls;
-using FluentAvalonia.UI.Controls;
-
 namespace BD.WTTS.UI.Views.Pages;
 
 public partial class MainView : UserControl
 {
+    const string TAG = "MainView";
+
     public MainView()
     {
         InitializeComponent();
@@ -12,7 +11,14 @@ public partial class MainView : UserControl
 
     private void InitializeComponent()
     {
-        AvaloniaXamlLoader.Load(this);
+        try
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+        catch (Exception ex)
+        {
+            Log.Error(TAG, ex, "load Xaml fail.");
+        }
 
         var debug = this.FindControl<Button>("DebugButton");
 
diff --git a/src/BD.WTTS.Client.Avalonia.App/UI/Views/Windows/CoreWindow.props.cs b/src/BD.WTTS.Client.Avalonia.App/UI/Views/Windows/CoreWindow.props.cs
index a557f380e..7fe10ef7e 100644
--- a/src/BD.WTTS.Client.Avalonia.App/UI/Views/Windows/CoreWindow.props.cs
+++ b/src/BD.WTTS.Client.Avalonia.App/UI/Views/Windows/CoreWindow.props.cs
@@ -1,5 +1,3 @@
-using FluentAvalonia.UI.Windowing;
-
 namespace BD.WTTS.UI.Views.Windows;
 
 public partial class CoreWindow : Window, IStyleable
diff --git a/src/BD.WTTS.Client.Avalonia.App/UI/Views/Windows/MainWindow.axaml.cs b/src/BD.WTTS.Client.Avalonia.App/UI/Views/Windows/MainWindow.axaml.cs
index 040fc2b4e..b300dcb71 100644
--- a/src/BD.WTTS.Client.Avalonia.App/UI/Views/Windows/MainWindow.axaml.cs
+++ b/src/BD.WTTS.Client.Avalonia.App/UI/Views/Windows/MainWindow.axaml.cs
@@ -1,12 +1,9 @@
-using FluentAvalonia.Styling;
-using FluentAvalonia.UI;
-using FluentAvalonia.UI.Media;
-using FluentAvalonia.UI.Windowing;
-
 namespace BD.WTTS.UI.Views.Windows;
 
 public sealed partial class MainWindow : AppWindow
 {
+    const string TAG = "MainWindow";
+
     public MainWindow()
     {
         InitializeComponent();
@@ -30,6 +27,13 @@ public sealed partial class MainWindow : AppWindow
 
     void InitializeComponent()
     {
-        AvaloniaXamlLoader.Load(this);
+        try
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+        catch (Exception ex)
+        {
+            Log.Error(TAG, ex, "load Xaml fail.");
+        }
     }
 }
diff --git a/src/BD.WTTS.Client/App/IApplication.Log.cs b/src/BD.WTTS.Client/App/IApplication.Log.cs
index becc5b704..46c5622b9 100644
--- a/src/BD.WTTS.Client/App/IApplication.Log.cs
+++ b/src/BD.WTTS.Client/App/IApplication.Log.cs
@@ -78,9 +78,16 @@ partial interface IApplication
             builder.SetMinimumLevel(minLevel);
             SetNLoggerMinLevel(minLevel);
 
-            // 可以多个日志提供同时用，比如还可以在 Win 平台再添加一个 Windows 事件日志
-
             builder.AddNLog(NLogManager.Configuration); // 添加 NLog 日志
+#if (WINDOWS || MACCATALYST || MACOS || LINUX) && !(IOS || ANDROID)
+            builder.AddConsole(); // 添加控制台日志
+#endif
+#if WINDOWS
+            builder.AddEventLog(new Microsoft.Extensions.Logging.EventLog.EventLogSettings()
+            {
+                SourceName = Constants.HARDCODED_APP_NAME,
+            }); // 添加 Windows 事件日志
+#endif
         }
 
         return (minLevel, _);
diff --git a/src/BD.WTTS.Client/BD.WTTS.Client.csproj b/src/BD.WTTS.Client/BD.WTTS.Client.csproj
index 89f9958d4..d03398dae 100644
--- a/src/BD.WTTS.Client/BD.WTTS.Client.csproj
+++ b/src/BD.WTTS.Client/BD.WTTS.Client.csproj
@@ -124,6 +124,7 @@
 		<PackageReference Include="System.Management" />
 		<PackageReference Include="Aigio.WinDivertSharp" />
 		<PackageReference Include="BD.Common.Pinyin.TinyPinyin" />
+		<PackageReference Include="Microsoft.Extensions.Logging.EventLog" />
 	</ItemGroup>
 
 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'macos' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == ''">
@@ -144,6 +145,7 @@
 		<PackageReference Include="Avalonia.Xaml.Behaviors" />
 		<PackageReference Include="Avalonia.AvaloniaEdit" />
 		<PackageReference Include="FluentAvaloniaUI" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Console" />
 	</ItemGroup>
 
 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == ''">
diff --git a/src/ImplicitUsings.Avalonia.cs b/src/ImplicitUsings.Avalonia.cs
index 4643bdebc..614ad9083 100644
--- a/src/ImplicitUsings.Avalonia.cs
+++ b/src/ImplicitUsings.Avalonia.cs
@@ -20,6 +20,7 @@ global using Avalonia.Data.Converters;
 global using Avalonia.Metadata;
 global using Avalonia.Markup;
 global using Avalonia.Markup.Xaml;
+global using Avalonia.Markup.Xaml.Styling;
 global using Avalonia.Platform;
 global using Avalonia.Media;
 global using Avalonia.Media.Imaging;
@@ -41,4 +42,12 @@ global using Avalonia.Layout;
 global using Avalonia.LogicalTree;
 global using Avalonia.Rendering;
 global using Avalonia.ReactiveUI;
-global using Avalonia.Platform.Storage;
\ No newline at end of file
+global using Avalonia.Platform.Storage;
+
+// FluentAvaloniaUI
+global using FluentAvalonia.Interop;
+global using FluentAvalonia.Styling;
+global using FluentAvalonia.UI.Controls;
+global using FluentAvalonia.UI.Windowing;
+global using FluentAvalonia.UI;
+global using FluentAvalonia.UI.Media;
\ No newline at end of file