admin/GeekDesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

删除开发模式代码 增加更新日志

Browse Source
This commit is contained in:
liufei
2021-12-13 10:04:15 +08:00
parent 24ba279b18
commit 00f581a03e
6 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Constant/Constants.cs
View File

@@ -10,7 +10,10 @@ namespace GeekDesk.Constant
{ {
public static string APP_DIR = AppDomain.CurrentDomain.BaseDirectory.Trim(); 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";
/// <summary> /// <summary>
/// app数据文件路径 /// app数据文件路径

8
Control/Other/BacklogNotificatin.xaml
View File

@@ -2,11 +2,15 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:hc="https://handyorg.github.io/handycontrol" xmlns:hc="https://handyorg.github.io/handycontrol"
Background="AliceBlue" BorderThickness="0"
BorderThickness="1" Style="{StaticResource BorderBG}"
Margin="15"
BorderBrush="{DynamicResource BorderBrush}" BorderBrush="{DynamicResource BorderBrush}"
Width="320" Width="320"
Height="450"> Height="450">
<Border.Background>
<SolidColorBrush Color="AliceBlue" Opacity="0.96"/>
</Border.Background>
<Grid> <Grid>
<Image Source="/Resource/Image/BacklogImg.png" Margin="22,35,22,361" /> <Image Source="/Resource/Image/BacklogImg.png" Margin="22,35,22,361" />

2
Control/Windows/UpdateWindow.xaml
View File

@@ -24,7 +24,7 @@
<TextBlock Margin="10" x:Name="MsgTitle" TextWrapping="Wrap" FontSize="16" HorizontalAlignment="Left" Style="{DynamicResource TextBlockLargeBold}" Text="测试"/> <TextBlock Margin="10" x:Name="MsgTitle" TextWrapping="Wrap" FontSize="16" HorizontalAlignment="Left" Style="{DynamicResource TextBlockLargeBold}" Text="测试"/>
<StackPanel x:Name="MsgPanel"> <StackPanel x:Name="MsgPanel">
<hc:ScrollViewer x:Name="MsgBar" HorizontalScrollBarVisibility="Visible" IsInertiaEnabled="True" Margin="10" Width="430"> <hc:ScrollViewer x:Name="MsgBar" HorizontalScrollBarVisibility="Visible" IsInertiaEnabled="True" Margin="10" Width="430">
<TextBlock Width="430" LineHeight="20" x:Name="Msg" TextWrapping="Wrap" VerticalAlignment="Center" Text=""/> <TextBlock Width="430" FontSize="15" LineHeight="22" x:Name="Msg" TextWrapping="Wrap" VerticalAlignment="Center" Text="测试"/>
</hc:ScrollViewer> </hc:ScrollViewer>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

2
MainWindow.xaml.cs
View File

@@ -100,7 +100,7 @@ namespace GeekDesk
RegisterCreateToDoHotKey(true); 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); RegisterUtil.SetSelfStarting(appData.AppConfig.SelfStartUp, Constants.MY_NAME);
} }

4
Thread/UpdateThread.cs
View File

@@ -32,7 +32,7 @@ namespace GeekDesk.Thread
{ {
//等待1分钟后再检查更新 有的网络连接过慢 //等待1分钟后再检查更新 有的网络连接过慢
System.Threading.Thread.Sleep(1 * 1000); System.Threading.Thread.Sleep(60 * 1000);
string updateUrl; string updateUrl;
string nowVersion = ConfigurationManager.AppSettings["Version"]; string nowVersion = ConfigurationManager.AppSettings["Version"];
@@ -50,7 +50,7 @@ namespace GeekDesk.Thread
{ {
JObject jo = JObject.Parse(updateInfo); JObject jo = JObject.Parse(updateInfo);
string onlineVersion = jo["version"].ToString(); string onlineVersion = jo["version"].ToString();
if (onlineVersion.CompareTo(nowVersion) > 0 || true) if (onlineVersion.CompareTo(nowVersion) > 0)
{ {
App.Current.Dispatcher.Invoke((Action)(() => App.Current.Dispatcher.Invoke((Action)(() =>
{ {

2
Update.json
View File

@@ -2,7 +2,7 @@
"title": "<22>汾<EFBFBD><E6B1BE><EFBFBD><EFBFBD>", "title": "<22>汾<EFBFBD><E6B1BE><EFBFBD><EFBFBD>",
"subTitle": "V2.3.20 <20><>ʽ<EFBFBD><CABD>", "subTitle": "V2.3.20 <20><>ʽ<EFBFBD><CABD>",
"msgTitle": "<22><><EFBFBD>θ<EFBFBD><CEB8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", "msgTitle": "<22><><EFBFBD>θ<EFBFBD><CEB8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
"msg": "['']", "msg": "['һ<EFBFBD><EFBFBD>С<EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20>޸<EFBFBD><DEB8><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD>bug<75><67><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˲<EFBFBD><CBB2>ֹ<EFBFBD><D6B9><EFBFBD>','<27>޸<EFBFBD><DEB8>޷<EFBFBD><DEB7>޸IJ˵<C4B2>ͼ<EFBFBD><CDBC><EFBFBD><EFBFBD>bug','<27>޸<EFBFBD>ͼ<EFBFBD><CDBC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״bug','<27>޸<EFBFBD><DEB8>ȼ<EFBFBD><C8BC><EFBFBD>֧<EFBFBD><D6A7>Alt<6C><74>bug','<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>м<EFBFBD><D0BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>','<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>','<27><><EFBFBD><EFBFBD>ȥ<EFBFBD><C8A5><EFBFBD>ҵ<EFBFBD><D2B5><EFBFBD>star<61><72>']",
"githubUrl": "https://github.com/Demo-Liu/GeekDesk/releases", "githubUrl": "https://github.com/Demo-Liu/GeekDesk/releases",
"giteeUrl": "https://gitee.com/demo_liu/GeekDesk/releases", "giteeUrl": "https://gitee.com/demo_liu/GeekDesk/releases",
"version": "2.3.20" "version": "2.3.20"