fix 由于其他程序(例如雷神加速器)占用 hosts 导致关闭加速或退出时闪退 & v2.6.3

This commit is contained in:
Aigio Liu
2021-12-11 22:54:45 +08:00
parent 879cda38fa
commit 44e5bdb895
7 changed files with 41 additions and 29 deletions
+2 -2
View File
@@ -33,9 +33,9 @@ emit_plist() {
<key>CFBundleIdentifier</key>
<string>net.steampp.app</string>
<key>CFBundleShortVersionString</key>
<string>2.6.2</string>
<string>2.6.3</string>
<key>CFBundleVersion</key>
<string>2.6.2.0</string>
<string>2.6.3.0</string>
<key>LSMinimumSystemVersion</key>
<string>10.14</string>
<key>CFBundleDevelopmentRegion</key>
+18 -18
View File
@@ -6,9 +6,9 @@
5. 新增 代理设置可自定义 DNS
6. 新增 ASF 编辑/移除 Bot 功能
7. 新增 Android ASF 本地挂卡功能 (Beta)
8. 新增 Microsoft/Xbox 相关加速服务 (需要升级到 **2.6.2** 之后可用)
9. 新增 Uplay 相关加速服务 (需要升级到 **2.6.2** 之后可用)
10. 新增 OneDrive 等更多相关加速服务 (需要升级到 **2.6.2** 之后可用)
8. 新增 Microsoft/Xbox 相关加速服务 (需要升级到 **2.6.3** 之后可用)
9. 新增 Uplay 相关加速服务 (需要升级到 **2.6.3** 之后可用)
10. 新增 OneDrive 等更多相关加速服务 (需要升级到 **2.6.3** 之后可用)
11. 优化 Desktop 加速代理性能
12. 优化 Desktop 脚本注入打包的性能
13. 优化 Desktop 已安装游戏加载性能
@@ -76,7 +76,7 @@
- .nupkg 文件可使用解压工具打开或解压,找到此文件复制即可
[![steampp.net](https://img.shields.io/badge/WebSite-steampp.net-brightgreen.svg?style=flat-square&color=61dafb)](https://steampp.net)
[![Steam++ v2.6.2](https://img.shields.io/badge/Steam++-v2.6.2-brightgreen.svg?style=flat-square&color=512bd4)]()
[![Steam++ v2.6.3](https://img.shields.io/badge/Steam++-v2.6.3-brightgreen.svg?style=flat-square&color=512bd4)]()
##### [不知道该下载哪个文件?](./download-guide.md)
@@ -85,23 +85,23 @@
### 文件校验
| File | Checksum (SHA256) |
| ---- | ---- |
| Steam++_win_x64_v2.6.2.7z | SHA256 |
| Steam++_win_x64_fde_v2.6.2.7z | SHA256 |
| Steam++_win_x64_v2.6.3.7z | SHA256 |
| Steam++_win_x64_fde_v2.6.3.7z | SHA256 |
| | |
| Steam++_win_x64_v2.6.2.exe | SHA256 |
| Steam++_win_x64_fde_v2.6.2.exe | SHA256 |
| Steam++_win_x64_v2.6.3.exe | SHA256 |
| Steam++_win_x64_fde_v2.6.3.exe | SHA256 |
| | |
| Steam++_linux_x64_v2.6.2.7z | SHA256 |
| Steam++_linux_arm64_v2.6.2.7z | SHA256 |
| Steam++_linux_x64_v2.6.3.7z | SHA256 |
| Steam++_linux_arm64_v2.6.3.7z | SHA256 |
| | |
| Steam++_linux_x64_v2.6.2.deb | SHA256 |
| Steam++_linux_arm64_v2.6.2.deb | SHA256 |
| Steam++_linux_x64_v2.6.3.deb | SHA256 |
| Steam++_linux_arm64_v2.6.3.deb | SHA256 |
| | |
| Steam++_linux_x64_v2.6.2.rpm | SHA256 |
| Steam++_linux_arm64_v2.6.2.rpm | SHA256 |
| Steam++_linux_x64_v2.6.3.rpm | SHA256 |
| Steam++_linux_arm64_v2.6.3.rpm | SHA256 |
| | |
| Steam++_macos_x64_v2.6.2.dmg | SHA256 |
| Steam++_macos_x64_v2.6.3.dmg | SHA256 |
| | |
| Steam++_android_arm64_v8a_v2.6.2.apk | SHA256 |
| Steam++_android_armeabi_v7a_v2.6.2.apk | SHA256 |
| Steam++_android_x86_v2.6.2.apk | SHA256 |
| Steam++_android_arm64_v8a_v2.6.3.apk | SHA256 |
| Steam++_android_armeabi_v7a_v2.6.3.apk | SHA256 |
| Steam++_android_x86_v2.6.3.apk | SHA256 |
@@ -12,7 +12,7 @@ namespace System.Properties
/// <item> macOS:\packaging\build-osx-app.sh &lt;CFBundleVersion&gt; &lt;CFBundleShortVersionString&gt; </item>
/// </list>
/// </summary>
public const string Version = "2.6.2";
public const string Version = "2.6.3";
//public const string InfoVersion = Version + "-beta";
}
@@ -10,7 +10,7 @@
<Identity
Name="4651ED44255E.47979655102CE"
Publisher="CN=A90E406B-B2D3-4A23-B061-0FA1D65C4F66"
Version="2.6.2.0" />
Version="2.6.3.0" />
<Properties>
<DisplayName>Steam++</DisplayName>
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="7" android:versionName="2.6.2" package="net.steampp.app" android:installLocation="auto">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="7" android:versionName="2.6.3" package="net.steampp.app" android:installLocation="auto">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
<application android:fullBackupContent="@xml/auto_backup_rules"></application>
<!-- Required for API Level 30 to make sure the app can detect browsers and other apps where communication is needed.-->
@@ -63,6 +63,10 @@ namespace System.Application.Services
/// </summary>
void OnExitRestoreHosts();
/// <summary>
/// 获取当前 hosts 文件是否包含修改过的标签,注意:产生异常时也将返回 <see langword="false"/>,并 <see cref="Toast"/> 显示 <see cref="Exception"/>
/// </summary>
/// <returns></returns>
bool ContainsHostsByTag();
enum EncodingType : byte
@@ -619,16 +619,24 @@ namespace System.Application.Services.Implementation
public bool ContainsHostsByTag()
{
var filePath = s.HostsFilePath;
var fileInfo = new FileInfo(filePath);
if (fileInfo.Exists && fileInfo.Length <= MaxFileLength)
try
{
var lines = File.ReadAllLines(filePath, GetEncoding());
if (lines.Reverse().Any(x => x.StartsWith(MarkEnd)))
var filePath = s.HostsFilePath;
var fileInfo = new FileInfo(filePath);
if (fileInfo.Exists && fileInfo.Length <= MaxFileLength)
{
return true;
var lines = File.ReadAllLines(filePath, GetEncoding());
if (lines.Reverse().Any(x => x.StartsWith(MarkEnd)))
{
return true;
}
}
}
catch (Exception ex)
{
Log.Error(TAG, ex, "ContainsHostsByTag fail.");
Toast.Show(AppResources.OperationHostsError_.Format(ex.GetAllMessage()));
}
return false;
}