fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 10:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore.修复自动更新OTA带来的一些问题

Browse Source
This commit is contained in:
MistEO
2022-05-18 02:04:42 +08:00
parent 00a16881d6
commit 708ddac911
3 changed files with 52 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
MeoAssistantArknights.sln
View File

@@ -85,13 +85,12 @@ Global
{362D1E30-F5AE-4279-9985-65C27B3BA300}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
{362D1E30-F5AE-4279-9985-65C27B3BA300}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x64
{362D1E30-F5AE-4279-9985-65C27B3BA300}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x64
{8D9036DD-75F1-4BD0-89E2-DFB37B925DA3}.CICD|x64.ActiveCfg = Debug|Any CPU
{8D9036DD-75F1-4BD0-89E2-DFB37B925DA3}.CICD|x86.ActiveCfg = Debug|Any CPU
{8D9036DD-75F1-4BD0-89E2-DFB37B925DA3}.CICD|x86.Build.0 = Debug|Any CPU
{8D9036DD-75F1-4BD0-89E2-DFB37B925DA3}.Release|x64.ActiveCfg = Debug|Any CPU
{8D9036DD-75F1-4BD0-89E2-DFB37B925DA3}.Release|x86.ActiveCfg = Debug|Any CPU
{8D9036DD-75F1-4BD0-89E2-DFB37B925DA3}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
{8D9036DD-75F1-4BD0-89E2-DFB37B925DA3}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU
{8D9036DD-75F1-4BD0-89E2-DFB37B925DA3}.CICD|x64.ActiveCfg = Release|x64
{8D9036DD-75F1-4BD0-89E2-DFB37B925DA3}.CICD|x86.ActiveCfg = Release|Any CPU
{8D9036DD-75F1-4BD0-89E2-DFB37B925DA3}.Release|x64.ActiveCfg = Release|x64
{8D9036DD-75F1-4BD0-89E2-DFB37B925DA3}.Release|x86.ActiveCfg = Release|Any CPU
{8D9036DD-75F1-4BD0-89E2-DFB37B925DA3}.RelWithDebInfo|x64.ActiveCfg = Release|x64
{8D9036DD-75F1-4BD0-89E2-DFB37B925DA3}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
{C9EA2837-0A4B-488F-A289-643B9D0BFCEB}.CICD|x64.ActiveCfg = Release|x64
{C9EA2837-0A4B-488F-A289-643B9D0BFCEB}.CICD|x64.Build.0 = Release|x64
{C9EA2837-0A4B-488F-A289-643B9D0BFCEB}.CICD|x86.ActiveCfg = Release|Win32

1
src/MeoAssistantBuilder/MeoAssistantBuilder.csproj
View File

@@ -10,6 +10,7 @@
<NukeTelemetryVersion>1</NukeTelemetryVersion>
<PlatformTarget>x64</PlatformTarget>
<Configurations>Release</Configurations>
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>
<ItemGroup>

75
src/MeoAsstGui/ViewModels/VersionUpdateViewModel.cs
View File

@@ -1,4 +1,4 @@
// MeoAsstGui - A part of the MeoAssistantArknights project
// MeoAsstGui - A part of the MaaAssistantArknights project
// Copyright (C) 2021 MistEO and Contributors
//
// This program is free software: you can redistribute it and/or modify
@@ -101,7 +101,7 @@ namespace MeoAsstGui
}
}
private const string RequestUrl = "https://api.github.com/repos/MistEO/MeoAssistantArknights/releases";
private const string RequestUrl = "https://api.github.com/repos/MaaAssistantArknights/MaaAssistantArknights/releases";
private const string RequestUserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.99 Safari/537.36 Edg/97.0.1072.76";
private JObject _lastestJson;
private JObject _assetsObject;
@@ -307,35 +307,14 @@ namespace MeoAsstGui
public bool CheckUpdate()
{
var settings = _container.Get<SettingsViewModel>();
if (!settings.UpdateCheck)
// 开发版不检查更新
if (!isStableVersion())
{
return false;
}
// 开发版、测试版不检查更新
// 正式版：vX.X.X
// DevBuild (CI)：yyyy-MM-dd-HH-mm-ss-{CommitHash[..7]}
// DevBuild (Local)：yyyy-MM-dd-HH-mm-ss-{CommitHash[..7]}-Local
// Release (Local Commit)：v.{CommitHash[..7]}-Local
// Release (Local Tag)：{Tag}-Local
// Debug (Local)：DEBUG VERSION
// Script Compiled：c{CommitHash[..7]}
if (_curVersion == "DEBUG VERSION")
{
return false;
}
if (_curVersion.StartsWith("c"))
{
return false;
}
if (_curVersion.Contains("Local"))
{
return false;
}
var pattern = @"v((0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)";
var match = Regex.Match(_curVersion, pattern);
if (match.Success is false)
var settings = _container.Get<SettingsViewModel>();
if (!settings.UpdateCheck)
{
return false;
}
@@ -577,10 +556,46 @@ namespace MeoAsstGui
return true;
}
private bool isStableVersion()
{
// 正式版：vX.X.X
// DevBuild (CI)：yyyy-MM-dd-HH-mm-ss-{CommitHash[..7]}
// DevBuild (Local)：yyyy-MM-dd-HH-mm-ss-{CommitHash[..7]}-Local
// Release (Local Commit)：v.{CommitHash[..7]}-Local
// Release (Local Tag)：{Tag}-Local
// Debug (Local)：DEBUG VERSION
// Script Compiled：c{CommitHash[..7]}
if (_curVersion == "DEBUG VERSION")
{
return false;
}
if (_curVersion.StartsWith("c"))
{
return false;
}
if (_curVersion.Contains("Local"))
{
return false;
}
var pattern = @"v((0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)";
var match = Regex.Match(_curVersion, pattern);
if (match.Success is false)
{
return false;
}
return true;
}
public bool ResourceOTA()
{
const string req_base_url = "https://api.github.com/repos/MistEO/MeoAssistantArknights/commits?path=";
const string repositorie_base = "MistEO/MeoAssistantArknights";
// 开发版不检查更新
if (!isStableVersion())
{
return false;
}
const string req_base_url = "https://api.github.com/repos/MaaAssistantArknights/MaaAssistantArknights/commits?path=";
const string repositorie_base = "MaaAssistantArknights/MaaAssistantArknights";
const string branche_base = "master";
// cdn接口地址组
@@ -599,7 +614,7 @@ namespace MeoAsstGui
// 资源文件在仓库中的路径，与实际打包后的路径并不相同，需要使用dict
var update_dict = new Dictionary<string, string>()
{
{ "3rdparty/resource/penguin-stats-recognize/json/stages.json" , "resource/penguin-stats-recognize/json/stages.json"},
{ "resource/stages.json" , "resource/stages.json"},
{ "resource/recruit.json", "resource/recruit.json" }
};