From de914f7c716bcc692f269f1dd5d39d92bb59fc86 Mon Sep 17 00:00:00 2001 From: Aigio Liu Date: Sun, 28 Feb 2021 19:06:24 +0800 Subject: [PATCH] app center --- .../Program.cs | 1 + .../Startup.cs | 14 +++++++++---- .../Application/UI/WpfApp.xaml.cs | 20 ++++++++++++++++++- ...plication.SteamTools.Client.Desktop.csproj | 3 +++ 4 files changed, 33 insertions(+), 5 deletions(-) diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Program.cs b/System.Application.SteamTools.Client.Desktop.Avalonia.App/Program.cs index 7541b4c7e..c86b6c9fd 100644 --- a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Program.cs +++ b/System.Application.SteamTools.Client.Desktop.Avalonia.App/Program.cs @@ -19,6 +19,7 @@ namespace System.Application.UI var logger = LogManager.GetCurrentClassLogger(); try { + Startup.Init(); #if WINDOWS var app = new WpfApp(); app.InitializeComponent(); diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Startup.cs b/System.Application.SteamTools.Client.Desktop.Avalonia.App/Startup.cs index a40a6a604..1d22bd3e1 100644 --- a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Startup.cs +++ b/System.Application.SteamTools.Client.Desktop.Avalonia.App/Startup.cs @@ -12,11 +12,17 @@ namespace System.Application.UI { internal static class Startup { + static bool isInitialized; + public static void Init() { - FileSystemDesktop.InitFileSystem(); - ModelValidatorProvider.Init(); - DI.Init(ConfigureServices); + if (!isInitialized) + { + isInitialized = true; + FileSystemDesktop.InitFileSystem(); + ModelValidatorProvider.Init(); + DI.Init(ConfigureServices); + } } static void ConfigureServices(IServiceCollection services) @@ -30,7 +36,7 @@ namespace System.Application.UI //var options = AppClientAttribute.Get(); var options = new AppSettings { - //AppSecretVisualStudioAppCenter = "", + AppSecretVisualStudioAppCenter = "ccca922e-40fe-48ab-9982-45ba496b1201", }; // app 配置项 services.TryAddOptions(options); diff --git a/System.Application.SteamTools.Client.Desktop.Windows/Application/UI/WpfApp.xaml.cs b/System.Application.SteamTools.Client.Desktop.Windows/Application/UI/WpfApp.xaml.cs index 68220e133..ebbf075ed 100644 --- a/System.Application.SteamTools.Client.Desktop.Windows/Application/UI/WpfApp.xaml.cs +++ b/System.Application.SteamTools.Client.Desktop.Windows/Application/UI/WpfApp.xaml.cs @@ -1,4 +1,9 @@ -using System.Windows; +using Microsoft.AppCenter; +using Microsoft.AppCenter.Analytics; +using Microsoft.AppCenter.Crashes; +using Microsoft.Extensions.Options; +using System.Application.Models; +using System.Windows; using System.Windows.Shell; using WpfApplication = System.Windows.Application; @@ -16,5 +21,18 @@ namespace System.Application.UI void JumpList_JumpItemsRemovedByUser(object sender, JumpItemsRemovedEventArgs e) { } + + protected override void OnStartup(StartupEventArgs e) + { + base.OnStartup(e); + + var options = DI.Get_Nullable>(); + + var appSecret = options?.Value.AppSecretVisualStudioAppCenter; + if (!string.IsNullOrWhiteSpace(appSecret)) + { + AppCenter.Start(appSecret, typeof(Analytics), typeof(Crashes)); + } + } } } \ No newline at end of file diff --git a/System.Application.SteamTools.Client.Desktop/System.Application.SteamTools.Client.Desktop.csproj b/System.Application.SteamTools.Client.Desktop/System.Application.SteamTools.Client.Desktop.csproj index 62bcab7a3..b2aa96dce 100644 --- a/System.Application.SteamTools.Client.Desktop/System.Application.SteamTools.Client.Desktop.csproj +++ b/System.Application.SteamTools.Client.Desktop/System.Application.SteamTools.Client.Desktop.csproj @@ -14,6 +14,9 @@ + + +