1.1.1 -> 1.1.2 第14次更新

2025-07-13 12:52:08 +08:00 · 2024-10-02 14:36:53 +08:00 · 2024-10-02 14:36:53 +08:00 · a3b1dc6525
commit a3b1dc6525
parent a25f0a9b6d
8 changed files with 71 additions and 25 deletions
--- a/Consts/MainConst.cs
+++ b/Consts/MainConst.cs
@ -1,4 +1,5 @@
-using System.Text.RegularExpressions;
+using System.Security.Principal;
+using System.Text.RegularExpressions;

 namespace Sheas_Cealer.Consts;

@ -7,6 +8,8 @@ internal partial class MainConst : MainMultilangConst
    internal enum SettingsMode
    { BrowserPathMode, UpstreamUrlMode, ExtraArgsMode };

+    public static bool IsAdmin => new WindowsPrincipal(WindowsIdentity.GetCurrent()).IsInRole(WindowsBuiltInRole.Administrator);
+
    internal static string DefaultUpstreamUrl => "https://gitlab.com/SpaceTimee/Cealing-Host/raw/main/Cealing-Host.json";

    [GeneratedRegex(@"^(https?:\/\/)?[a-zA-Z0-9](-*[a-zA-Z0-9])*(\.[a-zA-Z0-9](-*[a-zA-Z0-9])*)*(:\d{1,5})?(\/[a-zA-Z0-9.\-_\~\!\$\&\'\(\)\*\+\,\;\=\:\@\%]*)*$")]
--- a/Consts/MainMultilangConst.Designer.cs
+++ b/Consts/MainMultilangConst.Designer.cs
@ -186,6 +186,24 @@ namespace Sheas_Cealer.Consts {
            }
        }
        
+        /// <summary>
+        ///   查找类似 Start Proxy 的本地化字符串。
+        /// </summary>
+        public static string ProxyButtonContent {
+            get {
+                return ResourceManager.GetString("ProxyButtonContent", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Click to launch a local proxy 的本地化字符串。
+        /// </summary>
+        public static string ProxyButtonToolTip {
+            get {
+                return ResourceManager.GetString("ProxyButtonToolTip", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   查找类似 Fill in a Chromium-based browser path 的本地化字符串。
        /// </summary>
--- a/Consts/MainMultilangConst.resx
+++ b/Consts/MainMultilangConst.resx
@ -141,6 +141,12 @@
  <data name="ExtraArgsSettingsModeName" xml:space="preserve">
    <value>Extra Args</value>
  </data>
+  <data name="ProxyButtonContent" xml:space="preserve">
+    <value>Start Proxy</value>
+  </data>
+  <data name="ProxyButtonToolTip" xml:space="preserve">
+    <value>Click to launch a local proxy</value>
+  </data>
  <data name="SettingsBoxBrowserPathToolTip" xml:space="preserve">
    <value>Fill in a Chromium-based browser path</value>
  </data>
@ -198,9 +204,6 @@
  <data name="_HostErrorHint" xml:space="preserve">
    <value>The args cannot be recognized, check if the hosts contain syntax errors</value>
  </data>
-  <data name="_UpstreamHostUtdHint" xml:space="preserve">
-    <value>Upstream host has been updated to the latest</value>
-  </data>
  <data name="_KillBrowserProcessPrompt" xml:space="preserve">
    <value>All processes of the selected browser will be closed before launching, do you want to continue?</value>
  </data>
@ -210,4 +213,7 @@
  <data name="_UpdateUpstreamHostSuccessHint" xml:space="preserve">
    <value>Update successfully</value>
  </data>
+  <data name="_UpstreamHostUtdHint" xml:space="preserve">
+    <value>Upstream host has been updated to the latest</value>
+  </data>
 </root>
--- a/Consts/MainMultilangConst.zh.resx
+++ b/Consts/MainMultilangConst.zh.resx
@ -141,6 +141,12 @@
  <data name="ExtraArgsSettingsModeName" xml:space="preserve">
    <value>额外参数</value>
  </data>
+  <data name="ProxyButtonContent" xml:space="preserve">
+    <value>启动代理</value>
+  </data>
+  <data name="ProxyButtonToolTip" xml:space="preserve">
+    <value>点击启动本地代理</value>
+  </data>
  <data name="SettingsBoxBrowserPathToolTip" xml:space="preserve">
    <value>填入任意以 Chromium 为内核的浏览器路径</value>
  </data>
@ -198,9 +204,6 @@
  <data name="_HostErrorHint" xml:space="preserve">
    <value>规则无法识别，请检查伪造规则中是否含有语法错误</value>
  </data>
-  <data name="_UpstreamHostUtdHint" xml:space="preserve">
-    <value>上游规则已经更到最新了</value>
-  </data>
  <data name="_KillBrowserProcessPrompt" xml:space="preserve">
    <value>启动前将关闭所选浏览器的所有进程，是否继续？</value>
  </data>
@ -210,4 +213,7 @@
  <data name="_UpdateUpstreamHostSuccessHint" xml:space="preserve">
    <value>更新已完成</value>
  </data>
+  <data name="_UpstreamHostUtdHint" xml:space="preserve">
+    <value>上游规则已经更到最新了</value>
+  </data>
 </root>
--- a/Preses/MainPres.cs
+++ b/Preses/MainPres.cs
@ -17,7 +17,7 @@ internal partial class MainPres : ObservableObject
        int upstreamUrlIndex = Array.FindIndex(args, arg => arg.Equals("-u", StringComparison.OrdinalIgnoreCase)) + 1;
        int extraArgsIndex = Array.FindIndex(args, arg => arg.Equals("-e", StringComparison.OrdinalIgnoreCase)) + 1;

-        BrowserPath = browserPathIndex != 0 && browserPathIndex != args.Length ?args[browserPathIndex]:
+        BrowserPath = browserPathIndex != 0 && browserPathIndex != args.Length ? args[browserPathIndex] :
            !string.IsNullOrWhiteSpace(Settings.Default.BrowserPath) ? Settings.Default.BrowserPath :
            (Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\msedge.exe", string.Empty, null) ??
            Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\chrome.exe", string.Empty, null) ??
--- a/Sheas-Cealer.csproj
+++ b/Sheas-Cealer.csproj
@ -21,9 +21,9 @@
    <RepositoryType>git</RepositoryType>
    <Copyright>Copyright © 2077</Copyright>
    <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
    <SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
-	  <WindowsSdkPackageVersion>10.0.22621.41</WindowsSdkPackageVersion>
+	<WindowsSdkPackageVersion>10.0.26100.41</WindowsSdkPackageVersion>
    <RootNamespace>Sheas_Cealer</RootNamespace>
    <Nullable>enable</Nullable>
    <UseWPF>true</UseWPF>
--- a/Wins/MainWin.xaml
+++ b/Wins/MainWin.xaml
@ -76,20 +76,31 @@
                </Button.Content>
            </Button>
        </Grid>
-        <Button IsDefault="True"
-                Grid.Row="1" Margin="5" Content="{Binding Source={x:Static consts:MainConst.StartButtonContent}}" ToolTip="{Binding Source={x:Static consts:MainConst.StartButtonToolTip}}"
-                Click="StartButton_Click" PreviewMouseDown="StartButton_PreviewMouseDown">
-            <Button.IsEnabled>
-                <MultiBinding>
-                    <MultiBinding.Converter>
-                        <convs:MainStartButtonIsEnabledConv />
-                    </MultiBinding.Converter>
+        <Grid Grid.Row="1">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <Button IsDefault="True"
+                Grid.Column="0" Margin="5" Content="{Binding Source={x:Static consts:MainConst.StartButtonContent}}" ToolTip="{Binding Source={x:Static consts:MainConst.StartButtonToolTip}}"
+                Click="StartButton_Click" PreviewMouseDown="StartButton_PreviewMouseDown">
+                <Button.IsEnabled>
+                    <MultiBinding>
+                        <MultiBinding.Converter>
+                            <convs:MainStartButtonIsEnabledConv />
+                        </MultiBinding.Converter>
+
+                        <Binding Path="BrowserPath" />
+                        <Binding Path="ExtraArgs" />
+                    </MultiBinding>
+                </Button.IsEnabled>
+            </Button>
+            <Button IsEnabled="{Binding Source={x:Static consts:MainConst.IsAdmin}, Mode=OneTime}"
+                Grid.Column="1" Margin="5" Content="{Binding Source={x:Static consts:MainConst.ProxyButtonContent}}" ToolTip="{Binding Source={x:Static consts:MainConst.ProxyButtonToolTip}}"
+                Click="ProxyButton_Click" />
+        </Grid>

-                    <Binding Path="BrowserPath" />
-                    <Binding Path="ExtraArgs" />
-                </MultiBinding>
-            </Button.IsEnabled>
-        </Button>
        <Grid Grid.Row="2">
            <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1.3*" />
@ -102,8 +113,7 @@
            <Button x:Name="EditLocalHostButton"
                    Grid.Column="0" Margin="5" Content="{Binding Source={x:Static consts:MainConst.EditLocalHostButtonContent}}" ToolTip="{Binding Source={x:Static consts:MainConst.EditLocalHostButtonToolTip}}"
                    Click="EditHostButton_Click" />
-            <Button x:Name="EditUpstreamHostButton"
-                    Grid.Column="1" Margin="5" Content="{Binding Source={x:Static consts:MainConst.EditUpstreamHostButtonContent}}" ToolTip="{Binding Source={x:Static consts:MainConst.EditUpstreamHostButtonToolTip}}"
+            <Button Grid.Column="1" Margin="5" Content="{Binding Source={x:Static consts:MainConst.EditUpstreamHostButtonContent}}" ToolTip="{Binding Source={x:Static consts:MainConst.EditUpstreamHostButtonToolTip}}"
                    Click="EditHostButton_Click" />
            <Button Grid.Column="2" Margin="5" Content="{Binding Source={x:Static consts:MainConst.UpdateUpstreamHostButtonContent}}" ToolTip="{Binding Source={x:Static consts:MainConst.UpdateUpstreamHostButtonToolTip}}"
                    Click="UpdateUpstreamHostButton_Click">
--- a/Wins/MainWin.xaml.cs
+++ b/Wins/MainWin.xaml.cs
@ -132,6 +132,9 @@ public partial class MainWin : Window

        new CommandProc(sender == null).ShellRun(AppDomain.CurrentDomain.SetupInformation.ApplicationBase!, ($"{CealArgs} {MainPres!.ExtraArgs}").Trim());
    }
+    private void ProxyButton_Click(object sender, RoutedEventArgs e)
+    {
+    }

    private void EditHostButton_Click(object sender, RoutedEventArgs e)
    {