[Pull Request] 六项修复及优化, 四项新增

App.axaml.cs

@@ -20,6 +20,7 @@
 using System.Threading;
 
 #pragma warning disable CS8604 // 引用类型参数可能为 null。
+#pragma warning disable CA2211 // Non-constant fields should not be visible
 
 namespace KitX_Dashboard
 {
@@ -146,7 +147,7 @@ public override void OnFrameworkInitializationCompleted()
                     }
                     catch (Exception ex)
                     {
-                        Log.Error("In AnouncementManager.CheckNewAccnouncements()", ex);
+                        Log.Error(ex, "In AnouncementManager.CheckNewAccnouncements()");
                     }
                 }).Start();
 
@@ -158,6 +159,7 @@ public override void OnFrameworkInitializationCompleted()
     }
 }
 
+#pragma warning restore CA2211 // Non-constant fields should not be visible
 #pragma warning restore CS8604 // 引用类型参数可能为 null。
 
 //                                         .....'',;;::cccllllllllllllcccc:::;;,,,''...'',,'..

Helper.cs

@@ -290,6 +290,8 @@ public static void SaveInfo()
         /// </summary>
         public static void Exit()
         {
+            Log.CloseAndFlush();
+
             Program.WebManager?.Stop();
             Program.WebManager?.Dispose();
 
@@ -305,12 +307,12 @@ public static void Exit()
         public static void InitEnvironment()
         {
             #region 检查 Common.Algorithm 库环境并安装环境
-            if (!Algorithm.Interop.Environment.CheckEnvironment())
+            if (!Common.Algorithm.Interop.Environment.CheckEnvironment())
                 new Thread(() =>
                 {
                     try
                     {
-                        Algorithm.Interop.Environment.InstallEnvironment();
+                        Common.Algorithm.Interop.Environment.InstallEnvironment();
                     }
                     catch (Exception ex)
                     {

KitX Dashboard.csproj

@@ -1,16 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <IsBuild4WindowsPlatform>False</IsBuild4WindowsPlatform>
+        <TargetFramework Condition="$(IsBuild4WindowsPlatform) == 'False'">net6.0</TargetFramework>
+        <TargetFramework Condition="$(IsBuild4WindowsPlatform) == 'True'">net6.0-windows10.0.17763.0</TargetFramework>
         <Nullable>enable</Nullable>
         <TrimMode>copyused</TrimMode>
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
         <ApplicationIcon>Assets\KitX-Icon-256x.ico</ApplicationIcon>
         <BaseOutputPath>..\KitX Build\Dashboard\</BaseOutputPath>
         <BaseIntermediateOutputPath>..\KitX Build\Temp\Dashboard\</BaseIntermediateOutputPath>
-        <AssemblyVersion>3.22.04.$([System.DateTime]::UtcNow.Date.Subtract($([System.DateTime]::Parse("2005-07-16"))).TotalDays)</AssemblyVersion>
-        <FileVersion>3.22.04.$([System.DateTime]::UtcNow.Date.Subtract($([System.DateTime]::Parse("2005-07-16"))).TotalDays)</FileVersion>
-        <Version>3.22.04.$([System.DateTime]::UtcNow.Date.Subtract($([System.DateTime]::Parse("2005-07-16"))).TotalDays)</Version>
+        <AssemblyVersion>$(Version)</AssemblyVersion>
+        <FileVersion>$(Version)</FileVersion>
+        <Version>3.22.10.$([System.DateTime]::UtcNow.Date.Subtract($([System.DateTime]::Parse("2005-06-06"))).TotalDays)</Version>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="$(IsBuild4WindowsPlatform) == 'True'">
+        <DefineConstants>IsBuild4WindowsPlatform</DefineConstants>
     </PropertyGroup>
 
     <!--<ItemGroup>
@@ -58,7 +64,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <None Remove="Assets\KitX-Icon-256x256.ico" />
+        <None Remove="Assets\KitX-Icon-256x256.ico" />
     </ItemGroup>
     <ItemGroup>
         <Content Include="Languages\en-us.axaml">
@@ -122,30 +128,33 @@
     <ItemGroup>
         <PackageReference Include="Avalonia" Version="0.10.18" />
         <PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.18" />
+        <PackageReference Include="Avalonia.Diagnostics" Version="0.10.18" Condition="'$(Configuration)' == 'Debug'" />
         <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="0.10.18" />
         <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.18" />
-        <PackageReference Include="Common.BasicHelper" Version="1.1.6347.236" />
+        <PackageReference Include="Common.BasicHelper" Version="1.2.6402.1373" />
         <PackageReference Include="Common.Activity" Version="1.0.6346.961" />
-        <PackageReference Include="Common.Algorithm.Interop" Version="1.1.6345.985" />
+        <PackageReference Include="Common.Algorithm.Interop" Version="1.2.6407.702" />
+        <PackageReference Include="Common.ExternalConsole" Version="1.0.6407.192" />
         <PackageReference Include="Common.Update.Checker" Version="1.0.1.3" />
-        <PackageReference Include="FluentAvaloniaUI" Version="1.4.4" />
-        <PackageReference Include="KitX.KXP.Helper" Version="22.4.6276.567" />
-        <PackageReference Include="KitX.Web.Rules" Version="22.4.6276.567" />
-        <PackageReference Include="LiteDB" Version="5.0.12" />
+        <!--<PackageReference Include="DesktopNotifications.Avalonia" Version="1.2.0" Condition="$(IsBuild4WindowsPlatform) == 'True'" />-->
+        <PackageReference Include="FluentAvaloniaUI" Version="1.4.5" />
+        <PackageReference Include="KitX.KXP.Helper" Version="22.4.6351.975" />
+        <PackageReference Include="KitX.Web.Rules" Version="22.4.6351.974" />
+        <PackageReference Include="LiteDB" Version="5.0.14" />
         <PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-beta.400" />
-        <PackageReference Include="Markdown.Avalonia" Version="0.10.11" />
+        <PackageReference Include="Markdown.Avalonia" Version="0.10.12" />
         <PackageReference Include="Material.Icons.Avalonia" Version="1.1.10" />
         <PackageReference Include="MessageBox.Avalonia" Version="2.1.0" />
         <PackageReference Include="nulastudio.NetBeauty" Version="2.0.0-beta.6" />
         <PackageReference Include="Serilog" Version="2.12.0" />
         <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-        <PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
+        <PackageReference Include="XamlNameReferenceGenerator" Version="1.5.1" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\KitX Dashboard Helper\KitX.Assets\KitX.Assets.csproj" />
         <ProjectReference Include="..\KitX Dashboard Helper\KitX.Fonts\KitX.Fonts.csproj" />
         <ProjectReference Include="..\KitX File Format Helper\KitX.KXP.Helper\KitX.KXP.Helper.csproj" />
         <ProjectReference Include="..\KitX Rules\KitX.Web.Rules\KitX.Web.Rules.csproj" />
+        <ProjectReference Include="..\Reference\Common.ExternalConsole\Common.ExternalConsole.Console\Common.ExternalConsole.Console.csproj" />
     </ItemGroup>
 </Project>

Languages/en-us.axaml

@@ -13,6 +13,8 @@
     <x:String x:Key="Text_Public_Exit">Exit</x:String>
     <x:String x:Key="Text_Public_ShowMainWindow">Show Main Window</x:String>
     <x:String x:Key="Text_Public_Second">s</x:String>
+    <x:String x:Key="Text_Public_Minute">minute</x:String>
+    <x:String x:Key="Text_Public_Hour">hour</x:String>
     <x:String x:Key="Text_Public_Tip">Tip</x:String>
     <x:String x:Key="Text_Public_Delete">Delete</x:String>
     <x:String x:Key="Text_Public_Replace">Replace</x:String>
@@ -21,6 +23,8 @@
     <x:String x:Key="Text_Public_Task">Task</x:String>
     <x:String x:Key="Text_Public_Size">Size</x:String>
     <x:String x:Key="Text_Public_Developing">Developing ...</x:String>
+    <x:String x:Key="Text_Public_Empty">Empty</x:String>
+    <x:String x:Key="Text_Public_Refresh">Refresh</x:String>
     <x:String x:Key="Text_Log_Verbose">Verbose</x:String>
     <x:String x:Key="Text_Log_Debug">Debug</x:String>
     <x:String x:Key="Text_Log_Information">Infomation</x:String>
@@ -93,6 +97,7 @@
     <x:String x:Key="Text_Settings_General_DeveloperSetting">Developer Settings</x:String>
     <x:String x:Key="Text_Settings_General_ShowAnnouncement">Show Announcements When Start</x:String>
     <x:String x:Key="Text_Settings_General_ShowAnnouncementNow">Show Announcements Now</x:String>
+    <x:String x:Key="Text_Settings_General_OpenDebugTool">Open Debug Tool</x:String>
     <x:String x:Key="Text_Settings_Personalise">Personalise</x:String>
     <x:String x:Key="Text_Settings_Personalise_DisplayLanguage">Display Language</x:String>
     <x:String x:Key="Text_Settings_Personalise_MicaEffect">Mica Effect</x:String>
@@ -111,6 +116,7 @@
     <x:String x:Key="Text_Settings_Performence_Web_MyIP_Filter">Native IP Filter</x:String>
     <x:String x:Key="Text_Settings_Performence_Greeting_Interval">Greeting Text Update Interval</x:String>
     <x:String x:Key="Text_Settings_Performence_Log">Log File Relative Settings</x:String>
+    <x:String x:Key="Text_Settings_Performence_LogFileSizeUsage">The log file has taken up space</x:String>
     <x:String x:Key="Text_Settings_Performence_LogFileSize">Log File Max Size</x:String>
     <x:String x:Key="Text_Settings_Performence_LogFileMaxCount">Log File Max Count</x:String>
     <x:String x:Key="Text_Settings_Performence_LogFileFlushInterval">Log File Flush Interval</x:String>

Languages/fr-fr.axaml

@@ -13,6 +13,8 @@
     <x:String x:Key="Text_Public_Exit">quitter</x:String>
     <x:String x:Key="Text_Public_ShowMainWindow">Afficher la fenêtre principale</x:String>
     <x:String x:Key="Text_Public_Second">deuxième</x:String>
+    <x:String x:Key="Text_Public_Minute">minute</x:String>
+    <x:String x:Key="Text_Public_Hour">Heure</x:String>
     <x:String x:Key="Text_Public_Tip">indice</x:String>
     <x:String x:Key="Text_Public_Delete">effacer</x:String>
     <x:String x:Key="Text_Public_Replace">remplacer</x:String>
@@ -21,6 +23,8 @@
     <x:String x:Key="Text_Public_Task">Tâche</x:String>
     <x:String x:Key="Text_Public_Size">Taille</x:String>
     <x:String x:Key="Text_Public_Developing">En développement</x:String>
+    <x:String x:Key="Text_Public_Empty">vide</x:String>
+    <x:String x:Key="Text_Public_Refresh">rafraîchir</x:String>
     <x:String x:Key="Text_Log_Verbose">détaillé</x:String>
     <x:String x:Key="Text_Log_Debug">débogage</x:String>
     <x:String x:Key="Text_Log_Information">informations</x:String>
@@ -93,6 +97,7 @@
     <x:String x:Key="Text_Settings_General_DeveloperSetting">option de développeur</x:String>
     <x:String x:Key="Text_Settings_General_ShowAnnouncement">Afficher l'annonce au démarrage</x:String>
     <x:String x:Key="Text_Settings_General_ShowAnnouncementNow">Voir les dernières annonces</x:String>
+    <x:String x:Key="Text_Settings_General_OpenDebugTool">Ouvrir le débogueur</x:String>
     <x:String x:Key="Text_Settings_Personalise">personnaliser</x:String>
     <x:String x:Key="Text_Settings_Personalise_DisplayLanguage">langue d'affichage</x:String>
     <x:String x:Key="Text_Settings_Personalise_MicaEffect">Effet mica</x:String>
@@ -111,6 +116,7 @@
     <x:String x:Key="Text_Settings_Performence_Web_MyIP_Filter">Règles de filtrage IP natives</x:String>
     <x:String x:Key="Text_Settings_Performence_Greeting_Interval">Mise à jour du message d'accueil retardée</x:String>
     <x:String x:Key="Text_Settings_Performence_Log">Paramètres liés au fichier journal</x:String>
+    <x:String x:Key="Text_Settings_Performence_LogFileSizeUsage">Le fichier journal a pris de la place</x:String>
     <x:String x:Key="Text_Settings_Performence_LogFileSize">Limite de taille du fichier journal</x:String>
     <x:String x:Key="Text_Settings_Performence_LogFileMaxCount">limite du fichier journal</x:String>
     <x:String x:Key="Text_Settings_Performence_LogFileFlushInterval">Délai du cache du fichier journal</x:String>

Languages/ja-jp.axaml

@@ -13,6 +13,8 @@
     <x:String x:Key="Text_Public_Exit">終了する</x:String>
     <x:String x:Key="Text_Public_ShowMainWindow">メインウィンドウを表示</x:String>
     <x:String x:Key="Text_Public_Second">2番目</x:String>
+    <x:String x:Key="Text_Public_Minute">分</x:String>
+    <x:String x:Key="Text_Public_Hour">時間</x:String>
     <x:String x:Key="Text_Public_Tip">ヒント</x:String>
     <x:String x:Key="Text_Public_Delete">消去</x:String>
     <x:String x:Key="Text_Public_Replace">交換</x:String>
@@ -21,6 +23,8 @@
     <x:String x:Key="Text_Public_Task">仕事</x:String>
     <x:String x:Key="Text_Public_Size">サイズ</x:String>
     <x:String x:Key="Text_Public_Developing">開発中</x:String>
+    <x:String x:Key="Text_Public_Empty">空の</x:String>
+    <x:String x:Key="Text_Public_Refresh">リフレッシュする</x:String>
     <x:String x:Key="Text_Log_Verbose">详细</x:String>
     <x:String x:Key="Text_Log_Debug">调试</x:String>
     <x:String x:Key="Text_Log_Information">情報</x:String>
@@ -93,6 +97,7 @@
     <x:String x:Key="Text_Settings_General_DeveloperSetting">開発者向けオプション</x:String>
     <x:String x:Key="Text_Settings_General_ShowAnnouncement">起動時にアナウンスを表示</x:String>
     <x:String x:Key="Text_Settings_General_ShowAnnouncementNow">最新のお知らせを見る</x:String>
+    <x:String x:Key="Text_Settings_General_OpenDebugTool">デバッガーを開く</x:String>
     <x:String x:Key="Text_Settings_Personalise">パーソナライズ</x:String>
     <x:String x:Key="Text_Settings_Personalise_DisplayLanguage">表示言語</x:String>
     <x:String x:Key="Text_Settings_Personalise_MicaEffect">Mica 効果</x:String>
@@ -111,6 +116,7 @@
     <x:String x:Key="Text_Settings_Performence_Web_MyIP_Filter">ネイティブ IP フィルタリング ルール</x:String>
     <x:String x:Key="Text_Settings_Performence_Greeting_Interval">あいさつ更新が遅れる</x:String>
     <x:String x:Key="Text_Settings_Performence_Log">ログファイル関連の設定</x:String>
+    <x:String x:Key="Text_Settings_Performence_LogFileSizeUsage">ログファイルがスペースを占有しています</x:String>
     <x:String x:Key="Text_Settings_Performence_LogFileSize">ログ ファイルのサイズ制限</x:String>
     <x:String x:Key="Text_Settings_Performence_LogFileMaxCount">ログ ファイルの制限</x:String>
     <x:String x:Key="Text_Settings_Performence_LogFileFlushInterval">ログ ファイル キャッシュの遅延</x:String>

Languages/ko-kr.axaml

@@ -13,6 +13,8 @@
     <x:String x:Key="Text_Public_Exit">그만두다</x:String>
     <x:String x:Key="Text_Public_ShowMainWindow">메인 창 표시</x:String>
     <x:String x:Key="Text_Public_Second">초</x:String>
+    <x:String x:Key="Text_Public_Minute">분</x:String>
+    <x:String x:Key="Text_Public_Hour">시</x:String>
     <x:String x:Key="Text_Public_Tip">힌트</x:String>
     <x:String x:Key="Text_Public_Delete">삭제</x:String>
     <x:String x:Key="Text_Public_Replace">바꾸다</x:String>
@@ -21,6 +23,8 @@
     <x:String x:Key="Text_Public_Task">일</x:String>
     <x:String x:Key="Text_Public_Size">크기</x:String>
     <x:String x:Key="Text_Public_Developing">개발 중</x:String>
+    <x:String x:Key="Text_Public_Empty">비어 있는</x:String>
+    <x:String x:Key="Text_Public_Refresh">새로 고침</x:String>
     <x:String x:Key="Text_Log_Verbose">상세한</x:String>
     <x:String x:Key="Text_Log_Debug">디버깅</x:String>
     <x:String x:Key="Text_Log_Information">정보</x:String>
@@ -93,6 +97,7 @@
     <x:String x:Key="Text_Settings_General_DeveloperSetting">개발자 옵션</x:String>
     <x:String x:Key="Text_Settings_General_ShowAnnouncement">시작 시 알림 표시</x:String>
     <x:String x:Key="Text_Settings_General_ShowAnnouncementNow">최신 공지사항 보기</x:String>
+    <x:String x:Key="Text_Settings_General_OpenDebugTool">디버거 열기</x:String>
     <x:String x:Key="Text_Settings_Personalise">개인화</x:String>
     <x:String x:Key="Text_Settings_Personalise_DisplayLanguage">표시 언어</x:String>
     <x:String x:Key="Text_Settings_Personalise_MicaEffect">운모 효과</x:String>
@@ -111,6 +116,7 @@
     <x:String x:Key="Text_Settings_Performence_Web_MyIP_Filter">기본 IP 필터링 규칙</x:String>
     <x:String x:Key="Text_Settings_Performence_Greeting_Interval">인사말 업데이트가 지연되었습니다.</x:String>
     <x:String x:Key="Text_Settings_Performence_Log">로그 파일 관련 설정</x:String>
+    <x:String x:Key="Text_Settings_Performence_LogFileSizeUsage">로그 파일이 공간을 차지했습니다.</x:String>
     <x:String x:Key="Text_Settings_Performence_LogFileSize">로그 파일 크기 제한</x:String>
     <x:String x:Key="Text_Settings_Performence_LogFileMaxCount">로그 파일 제한</x:String>
     <x:String x:Key="Text_Settings_Performence_LogFileFlushInterval">로그 파일 캐시 지연</x:String>

Languages/ru-ru.axaml

@@ -13,6 +13,8 @@
     <x:String x:Key="Text_Public_Exit">покидать</x:String>
     <x:String x:Key="Text_Public_ShowMainWindow">Показать главное окно</x:String>
     <x:String x:Key="Text_Public_Second">второй</x:String>
+    <x:String x:Key="Text_Public_Minute">минута</x:String>
+    <x:String x:Key="Text_Public_Hour">Час</x:String>
     <x:String x:Key="Text_Public_Tip">намекать</x:String>
     <x:String x:Key="Text_Public_Delete">Удалить</x:String>
     <x:String x:Key="Text_Public_Replace">заменять</x:String>
@@ -21,6 +23,8 @@
     <x:String x:Key="Text_Public_Task">Задача</x:String>
     <x:String x:Key="Text_Public_Size">размер</x:String>
     <x:String x:Key="Text_Public_Developing">В развитие</x:String>
+    <x:String x:Key="Text_Public_Empty">пустой</x:String>
+    <x:String x:Key="Text_Public_Refresh">обновить</x:String>
     <x:String x:Key="Text_Log_Verbose">подробный</x:String>
     <x:String x:Key="Text_Log_Debug">отладка</x:String>
     <x:String x:Key="Text_Log_Information">Информация</x:String>
@@ -93,6 +97,7 @@
     <x:String x:Key="Text_Settings_General_DeveloperSetting">вариант разработчика</x:String>
     <x:String x:Key="Text_Settings_General_ShowAnnouncement">Показывать объявление при запуске</x:String>
     <x:String x:Key="Text_Settings_General_ShowAnnouncementNow">Посмотреть последние объявления</x:String>
+    <x:String x:Key="Text_Settings_General_OpenDebugTool">Откройте отладчик</x:String>
     <x:String x:Key="Text_Settings_Personalise">персонализировать</x:String>
     <x:String x:Key="Text_Settings_Personalise_DisplayLanguage">язык отображения</x:String>
     <x:String x:Key="Text_Settings_Personalise_MicaEffect">Эффект слюды</x:String>
@@ -111,6 +116,7 @@
     <x:String x:Key="Text_Settings_Performence_Web_MyIP_Filter">Собственные правила IP-фильтрации</x:String>
     <x:String x:Key="Text_Settings_Performence_Greeting_Interval">Обновление приветствия отложено</x:String>
     <x:String x:Key="Text_Settings_Performence_Log">Настройки, связанные с файлом журнала</x:String>
+    <x:String x:Key="Text_Settings_Performence_LogFileSizeUsage">Файл журнала занял место</x:String>
     <x:String x:Key="Text_Settings_Performence_LogFileSize">Ограничение размера файла журнала</x:String>
     <x:String x:Key="Text_Settings_Performence_LogFileMaxCount">лимит файла журнала</x:String>
     <x:String x:Key="Text_Settings_Performence_LogFileFlushInterval">Задержка кеша файла журнала</x:String>