From bf002ade423400a245419c2e4285b77d83bab2aa Mon Sep 17 00:00:00 2001
From: Aigio Liu <lysoft.pw@foxmail.com>
Date: Mon, 26 Apr 2021 16:57:52 +0800
Subject: [PATCH] fix

---
 src/ST.Client.Desktop.Avalonia.App/App.axaml.cs               | 4 ++--
 src/ST.Client/Services/IAppUpdateService.cs                   | 3 ++-
 src/ST.Client/Services/Implementation/AppUpdateServiceImpl.cs | 4 ++--
 .../Services/CloudService/ApiConnection.cs                    | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs b/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs
index 98eacb87a..24a33a9da 100644
--- a/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs
+++ b/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs
@@ -244,7 +244,7 @@ namespace System.Application.UI
                     desktop.MainWindow = null;
                 else
 #endif
-                    desktop.MainWindow = MainWindow;
+                desktop.MainWindow = MainWindow;
 
                 desktop.Startup += Desktop_Startup;
                 desktop.Exit += ApplicationLifetime_Exit;
@@ -268,7 +268,7 @@ namespace System.Application.UI
             if (Startup.IsMainProcess)
             {
                 Startup.ActiveUserPost(ActiveUserType.OnStartup);
-                IAppUpdateService.Instance.CheckUpdate();
+                IAppUpdateService.Instance.CheckUpdate(showIsExistUpdateFalse: false);
             }
         }
 
diff --git a/src/ST.Client/Services/IAppUpdateService.cs b/src/ST.Client/Services/IAppUpdateService.cs
index 92e892f6e..a4d35346c 100644
--- a/src/ST.Client/Services/IAppUpdateService.cs
+++ b/src/ST.Client/Services/IAppUpdateService.cs
@@ -53,7 +53,8 @@ namespace System.Application.Services
         /// 检查更新，返回新版本信息
         /// </summary>
         /// <param name="force">是否强制检查，如果为 <see langword="false"/> 当有新版本内存中缓存时将跳过 api 请求</param>
-        void CheckUpdate(bool force = false);
+        /// <param name="showIsExistUpdateFalse">是否显示已是最新版本吐司提示</param>
+        void CheckUpdate(bool force = false, bool showIsExistUpdateFalse = true);
 
         ICommand StartUpdateCommand { get; }
     }
diff --git a/src/ST.Client/Services/Implementation/AppUpdateServiceImpl.cs b/src/ST.Client/Services/Implementation/AppUpdateServiceImpl.cs
index 5de261827..802412fa8 100644
--- a/src/ST.Client/Services/Implementation/AppUpdateServiceImpl.cs
+++ b/src/ST.Client/Services/Implementation/AppUpdateServiceImpl.cs
@@ -65,7 +65,7 @@ namespace System.Application.Services.Implementation
 
         static bool isCheckUpdateing;
 
-        public async void CheckUpdate(bool force)
+        public async void CheckUpdate(bool force, bool showIsExistUpdateFalse = true)
         {
             if (!force && IsExistUpdate)
             {
@@ -102,7 +102,7 @@ namespace System.Application.Services.Implementation
                 if (!rsp.Content.HasValue())
                 {
                     IsExistUpdate = false;
-                    toast.Show(SR.IsExistUpdateFalse);
+                    if (showIsExistUpdateFalse) toast.Show(SR.IsExistUpdateFalse);
                 }
                 else
                 {
diff --git a/src/ST.Services.CloudService/Services/CloudService/ApiConnection.cs b/src/ST.Services.CloudService/Services/CloudService/ApiConnection.cs
index faae04e26..406e4203e 100644
--- a/src/ST.Services.CloudService/Services/CloudService/ApiConnection.cs
+++ b/src/ST.Services.CloudService/Services/CloudService/ApiConnection.cs
@@ -285,7 +285,7 @@ namespace System.Application.Services.CloudService
                 {
                     if (isApi)
                     {
-                        if (response is IApiResponse<IExplicitHasValue> explicitHasValue && !explicitHasValue.Content.HasValue())
+                        if (!responseContentMaybeNull && response is IApiResponse<IExplicitHasValue> explicitHasValue && !explicitHasValue.Content.HasValue())
                         {
                             response.Code = ApiResponseCode.NoResponseContentValue;
                         }