From 3459e4bc051f17989d35e9e78b31cde1b3d8a27b Mon Sep 17 00:00:00 2001
From: Zaitonn <103164490+Zaitonn@users.noreply.github.com>
Date: Sat, 11 Mar 2023 15:53:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=94=99=E8=AF=AF=E7=9A=84=E6=9B=B4?=
=?UTF-8?q?=E6=96=B0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Serein/Universal/Core/Server/ServerManager.cs | 12 ++++++++++--
Serein/Universal/Utils/Logger.cs | 7 +++----
Serein/WPF/Windows/Pages/Settings/Serein.xaml | 2 +-
Serein/Winform/Ui/Settings.cs | 2 +-
4 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/Serein/Universal/Core/Server/ServerManager.cs b/Serein/Universal/Core/Server/ServerManager.cs
index aaea4057..efe4f95e 100644
--- a/Serein/Universal/Core/Server/ServerManager.cs
+++ b/Serein/Universal/Core/Server/ServerManager.cs
@@ -57,8 +57,14 @@ internal static class ServerManager
///
public static double CPUUsage { get; private set; }
+ ///
+ /// Motd对象
+ ///
public static Motd Motd { get; private set; } = new();
+ ///
+ /// 更新计时器
+ ///
private static Timer UpdateTimer;
///
@@ -101,6 +107,9 @@ internal static class ServerManager
};
#if CONSOLE
+ ///
+ /// 上一次执行强制结束时间
+ ///
private static DateTime LastKillTime = DateTime.Now;
#endif
@@ -108,8 +117,7 @@ internal static class ServerManager
/// 启动服务器
///
/// 启动结果
- public static bool Start()
- => Start(false);
+ public static bool Start() => Start(false);
///
/// 启动服务器
diff --git a/Serein/Universal/Utils/Logger.cs b/Serein/Universal/Utils/Logger.cs
index bc509f2e..c554aa94 100644
--- a/Serein/Universal/Utils/Logger.cs
+++ b/Serein/Universal/Utils/Logger.cs
@@ -1,5 +1,4 @@
-using System.Drawing;
-using Serein.Base;
+using Serein.Base;
using Serein.Extensions;
using System;
using System.Diagnostics;
@@ -154,7 +153,7 @@ public static void Output(LogType type, params object[] objects)
break;
case LogType.Version_New:
Program.Ui.ShowBalloonTip("发现新版本:\n" + line);
- Program.Ui.SettingSereinVersion_Update($"当前版本:{Global.VERSION} (发现新版本:{line},你可以等待后台自动下载或手动点击下方链接获取最新版)");
+ Program.Ui.SettingSereinVersion_Update($"当前版本:{Global.VERSION} (发现新版本:{line},你可以{(Global.Settings.Serein.AutoUpdate ? "等待后台自动下载或手动" : string.Empty)}点击下方链接获取最新版)");
break;
case LogType.Version_Latest:
Program.Ui.ShowBalloonTip(
@@ -223,7 +222,7 @@ public static void Output(LogType type, params object[] objects)
),
expirationTime: TimeSpan.FromSeconds(10)
);
- Catalog.Settings.Serein?.UpdateVersion($"\n(发现新版本:{line},你可以等待后台自动下载或手动点击下方链接获取最新版)");
+ Catalog.Settings.Serein?.UpdateVersion($"\n(发现新版本:{line},你可以{(Global.Settings.Serein.AutoUpdate ? "等待后台自动下载或手动" : string.Empty)}点击下方链接获取最新版)");
break;
case LogType.Version_Latest:
Catalog.Notification?.Show(
diff --git a/Serein/WPF/Windows/Pages/Settings/Serein.xaml b/Serein/WPF/Windows/Pages/Settings/Serein.xaml
index a32ee32d..2981c153 100644
--- a/Serein/WPF/Windows/Pages/Settings/Serein.xaml
+++ b/Serein/WPF/Windows/Pages/Settings/Serein.xaml
@@ -55,7 +55,7 @@
HorizontalAlignment="Left"
Icon="TextFirstLine24"
IntegersOnly="True"
- Max="250"
+ Max="300"
Min="0"
Step="1"
TextChanged="MaxCacheLines_TextChanged"
diff --git a/Serein/Winform/Ui/Settings.cs b/Serein/Winform/Ui/Settings.cs
index 0f37e193..15a48f5c 100644
--- a/Serein/Winform/Ui/Settings.cs
+++ b/Serein/Winform/Ui/Settings.cs
@@ -325,7 +325,7 @@ private void SettingSereinVersion_Click(object sender, EventArgs _)
Buttons = {
new Ookii.Dialogs.Wpf.TaskDialogButton(ButtonType.Ok)
},
- MainInstruction = "详细信息",
+ MainInstruction = "当前版本详细信息",
WindowTitle = "Serein",
Content = "" +
$"当前版本:{Global.VERSION}\n" +