Skip to content

Commit a76c5f9

Browse files
committed
增加全自动升级功能
1 parent a709610 commit a76c5f9

File tree

4 files changed

+8
-38
lines changed

4 files changed

+8
-38
lines changed

llcom/MainWindow.xaml.cs

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -132,42 +132,8 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
132132
this.Title += " - " + versionTextBlock.Text;
133133

134134
//检查更新
135-
Task.Run(async() =>
136-
{
137-
if(!await CheckUpdate("https://api.github.com/repos/chenxuuu/llcom/releases/latest", "https://github.com/chenxuuu/llcom/releases/latest"))
138-
{
139-
await CheckUpdate("https://gitee.com/api/v5/repos/chenxuuu/llcom/releases/latest", "https://gitee.com/chenxuuu/llcom/releases");
140-
}
141-
});
142-
}
143-
144-
private async Task<bool> CheckUpdate(string url, string download)
145-
{
146-
try
147-
{
148-
HttpClient client = new HttpClient();
149-
client.DefaultRequestHeaders.Add("user-agent", "llcom");
150-
string data = await client.GetStringAsync(url);
151-
JObject jo = (JObject)JsonConvert.DeserializeObject(data);
152-
if (int.Parse(((string)jo["tag_name"]).Replace(".", "")) >
153-
int.Parse(System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString().Replace(".", "")))
154-
{
155-
var result = MessageBox.Show($"发现新版本{(string)jo["tag_name"]},是否前往官网进行更新?\r\n" +
156-
$"更新内容:{(string)jo["body"]}",
157-
"更新检查",
158-
MessageBoxButton.YesNo);
159-
if (result == MessageBoxResult.Yes)
160-
{
161-
System.Diagnostics.Process.Start(download);
162-
}
163-
}
164-
return true;
165-
}
166-
catch
167-
{
168-
//MessageBox.Show(ex.ToString());
169-
return false;
170-
}
135+
Random r = new Random();//加上随机参数,确保获取的是最新数据
136+
AutoUpdaterDotNET.AutoUpdater.Start("https://llcom.papapoi.com/autoUpdate.xml?" + r.Next());
171137
}
172138

173139
private void Uart_UartDataSent(object sender, EventArgs e)

llcom/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
5252
//通过使用 "*",如下所示:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("1.0.0.9")]
55-
[assembly: AssemblyFileVersion("1.0.0.9")]
54+
[assembly: AssemblyVersion("1.0.1.0")]
55+
[assembly: AssemblyFileVersion("1.0.1.0")]
5656
[assembly: NeutralResourcesLanguage("zh-CN")]
5757

llcom/llcom.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@
8989
<Reference Include="AdonisUI.ClassicTheme, Version=1.11.0.0, Culture=neutral, processorArchitecture=MSIL">
9090
<HintPath>..\packages\AdonisUI.ClassicTheme.1.11.0\lib\net40\AdonisUI.ClassicTheme.dll</HintPath>
9191
</Reference>
92+
<Reference Include="AutoUpdater.NET, Version=1.5.3.0, Culture=neutral, PublicKeyToken=501435c91b35f4bc, processorArchitecture=MSIL">
93+
<HintPath>..\packages\Autoupdater.NET.Official.1.5.3\lib\net40\AutoUpdater.NET.dll</HintPath>
94+
</Reference>
9295
<Reference Include="Costura, Version=4.0.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
9396
<HintPath>..\packages\Costura.Fody.4.0.0\lib\net40\Costura.dll</HintPath>
9497
</Reference>

llcom/packages.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<packages>
33
<package id="AdonisUI" version="1.11.0" targetFramework="net472" />
44
<package id="AdonisUI.ClassicTheme" version="1.11.0" targetFramework="net472" />
5+
<package id="Autoupdater.NET.Official" version="1.5.3" targetFramework="net472" />
56
<package id="AvalonEdit" version="5.0.4" targetFramework="net472" />
67
<package id="Costura.Fody" version="4.0.0" targetFramework="net472" />
78
<package id="CrashReporter.NET.Official" version="1.5.7" targetFramework="net472" />

0 commit comments

Comments
 (0)