From 00f581a03e0114c1207afbfc22403a023e0441f8 Mon Sep 17 00:00:00 2001 From: liufei Date: Mon, 13 Dec 2021 10:04:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=BC=80=E5=8F=91=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E4=BB=A3=E7=A0=81=20=E5=A2=9E=E5=8A=A0=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Constant/Constants.cs | 5 ++++- Control/Other/BacklogNotificatin.xaml | 8 ++++++-- Control/Windows/UpdateWindow.xaml | 2 +- MainWindow.xaml.cs | 2 +- Thread/UpdateThread.cs | 4 ++-- Update.json | 2 +- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Constant/Constants.cs b/Constant/Constants.cs index e956ca2..eae0885 100644 --- a/Constant/Constants.cs +++ b/Constant/Constants.cs @@ -10,7 +10,10 @@ namespace GeekDesk.Constant { public static string APP_DIR = AppDomain.CurrentDomain.BaseDirectory.Trim(); - public static string MY_NAME = "GeekDesk-D"; + // 是否为开发模式 + public static bool DEV = false; + + public static string MY_NAME = DEV ? "GeekDesk-D" : "GeekDesk"; /// /// app数据文件路径 diff --git a/Control/Other/BacklogNotificatin.xaml b/Control/Other/BacklogNotificatin.xaml index ba35f1a..e672b09 100644 --- a/Control/Other/BacklogNotificatin.xaml +++ b/Control/Other/BacklogNotificatin.xaml @@ -2,11 +2,15 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:hc="https://handyorg.github.io/handycontrol" - Background="AliceBlue" - BorderThickness="1" + BorderThickness="0" + Style="{StaticResource BorderBG}" + Margin="15" BorderBrush="{DynamicResource BorderBrush}" Width="320" Height="450"> + + + diff --git a/Control/Windows/UpdateWindow.xaml b/Control/Windows/UpdateWindow.xaml index 5056b54..b038d98 100644 --- a/Control/Windows/UpdateWindow.xaml +++ b/Control/Windows/UpdateWindow.xaml @@ -24,7 +24,7 @@ - + diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index 9e6c4a2..ff42626 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -100,7 +100,7 @@ namespace GeekDesk RegisterCreateToDoHotKey(true); //注册自启动 - if (!appData.AppConfig.SelfStartUped && "GeekDesk".Equals(Constants.MY_NAME)) + if (!appData.AppConfig.SelfStartUped && !Constants.DEV) { RegisterUtil.SetSelfStarting(appData.AppConfig.SelfStartUp, Constants.MY_NAME); } diff --git a/Thread/UpdateThread.cs b/Thread/UpdateThread.cs index 815ffff..13ffb41 100644 --- a/Thread/UpdateThread.cs +++ b/Thread/UpdateThread.cs @@ -32,7 +32,7 @@ namespace GeekDesk.Thread { //等待1分钟后再检查更新 有的网络连接过慢 - System.Threading.Thread.Sleep(1 * 1000); + System.Threading.Thread.Sleep(60 * 1000); string updateUrl; string nowVersion = ConfigurationManager.AppSettings["Version"]; @@ -50,7 +50,7 @@ namespace GeekDesk.Thread { JObject jo = JObject.Parse(updateInfo); string onlineVersion = jo["version"].ToString(); - if (onlineVersion.CompareTo(nowVersion) > 0 || true) + if (onlineVersion.CompareTo(nowVersion) > 0) { App.Current.Dispatcher.Invoke((Action)(() => { diff --git a/Update.json b/Update.json index 5053ee7..12d423d 100644 --- a/Update.json +++ b/Update.json @@ -2,7 +2,7 @@ "title": "汾", "subTitle": "V2.3.20 ʽ", "msgTitle": "θ", - "msg": "['']", + "msg": "['һС, ޸һbug˲ֹ','޸޷޸IJ˵ͼbug','޸ͼ״bug','޸ȼ֧Altbug','м','','ȥҵstar']", "githubUrl": "https://github.com/Demo-Liu/GeekDesk/releases", "giteeUrl": "https://gitee.com/demo_liu/GeekDesk/releases", "version": "2.3.20"