mirrors/Sheas-Cealer
1
0
Fork 0
mirror of https://github.com/SpaceTimee/Sheas-Cealer.git synced 2025-07-14 05:12:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

1.1.1 -> 1.1.2 第37次更新

Browse Source
This commit is contained in:
Space Time 2024-10-06 14:01:43 +08:00
parent 35adc69eb2
commit d951decd1f
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Wins/MainWin.xaml.cs
View File

@ -296,7 +296,7 @@ public partial class MainWin : Window
HoldButtonTimer.Tick += MihomoButtonHoldTimer_Tick; HoldButtonTimer.Tick += MihomoButtonHoldTimer_Tick;
HoldButtonTimer.Start(); HoldButtonTimer.Start();
} }
private void MihomoButtonHoldTimer_Tick(object? sender, EventArgs e) private async void MihomoButtonHoldTimer_Tick(object? sender, EventArgs e)
{ {
HoldButtonTimer?.Stop(); HoldButtonTimer?.Stop();
@ -312,9 +312,11 @@ public partial class MainWin : Window
if (!File.Exists(confPath)) if (!File.Exists(confPath))
File.Create(confPath).Dispose(); File.Create(confPath).Dispose();
string extraConfs = File.ReadAllText(confPath);
Dictionary<string, object> mihomoConfs = new DeserializerBuilder() Dictionary<string, object> mihomoConfs = new DeserializerBuilder()
.WithNamingConvention(HyphenatedNamingConvention.Instance) .WithNamingConvention(HyphenatedNamingConvention.Instance)
.Build().Deserialize<Dictionary<string, object>>(File.ReadAllText(confPath)) ?? []; ; .Build().Deserialize<Dictionary<string, object>>(extraConfs) ?? []; ;
mihomoConfs["mixed-port"] = 7880; mihomoConfs["mixed-port"] = 7880;
mihomoConfs["ipv6"] = true; mihomoConfs["ipv6"] = true;
@ -344,6 +346,20 @@ public partial class MainWin : Window
new MihomoProc().ShellRun(AppDomain.CurrentDomain.SetupInformation.ApplicationBase!, "-d ."); new MihomoProc().ShellRun(AppDomain.CurrentDomain.SetupInformation.ApplicationBase!, "-d .");
while (true)
try
{
await Http.GetAsync<HttpResponseMessage>("http://localhost:7880", MainClient);
break;
}
catch (HttpRequestException ex) when (ex.InnerException is SocketException innerEx)
{
if (innerEx.SocketErrorCode != SocketError.ConnectionRefused)
break;
}
File.WriteAllText(confPath, extraConfs);
if (sender == null) if (sender == null)
Application.Current.Dispatcher.InvokeShutdown(); Application.Current.Dispatcher.InvokeShutdown();
} }