update

CrazyZhang666 · Jul 20, 2024 · 10d92d4 · 10d92d4
1 parent 06e88cb
commit 10d92d4
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 19 deletions.
diff --git a/EAappEmulater/Api/CoreApi.cs b/EAappEmulater/Api/CoreApi.cs
@@ -24,7 +24,7 @@ public static async Task<Version> GetWebUpdateVersion()
     {
         try
         {
-            var request = new RestRequest("https://api.battlefield.vip/eaapp/update.txt", Method.Get);
+            var request = new RestRequest("https://api.github.com/repos/CrazyZhang666/EAappEmulater/releases/latest", Method.Get);
 
             var response = await _client.ExecuteAsync(request);
             LoggerHelper.Info($"GetWebUpdateVersion 请求结束，状态 {response.ResponseStatus}");
@@ -38,7 +38,10 @@ public static async Task<Version> GetWebUpdateVersion()
 
             if (response.StatusCode == HttpStatusCode.OK)
             {
-                if (Version.TryParse(response.Content, out Version version))
+                var jsonNode = JsonNode.Parse(response.Content);
+
+                var tagName = jsonNode["tag_name"].GetValue<string>();
+                if (Version.TryParse(tagName, out Version version))
                 {
                     LoggerHelper.Info($"获取服务器更新版本号成功 {version}");
                     return version;

diff --git a/EAappEmulater/Assets/Files/Misc/UpdateNotes.txt b/EAappEmulater/Assets/Files/Misc/UpdateNotes.txt
@@ -1,4 +1,9 @@
-2024/07/18  v1.6.0.0
+2024/07/20  v1.6.1.0
+------------------------
+- 修改软件内超链接指向GitHub
+
+
+2024/07/18  v1.6.0.0
 ------------------------
 - 开源了EAapp模拟器源代码
 

diff --git a/EAappEmulater/Properties/AssemblyInfo.cs b/EAappEmulater/Properties/AssemblyInfo.cs
@@ -12,12 +12,12 @@
 
 // PropertyGroup Generate????Attribute
 [assembly: AssemblyTitle("EA app 模拟器")]
-[assembly: AssemblyCompany("https://battlefield.vip")]
+[assembly: AssemblyCompany("https://github.com/CrazyZhang666/EAappEmulater")]
 [assembly: AssemblyProduct("EA app 模拟器")]
-[assembly: AssemblyVersion("1.6.0.0")]
-[assembly: AssemblyFileVersion("1.6.0.0")]
-[assembly: AssemblyInformationalVersion("1.6.0.0")]
+[assembly: AssemblyVersion("1.6.1.0")]
+[assembly: AssemblyFileVersion("1.6.1.0")]
+[assembly: AssemblyInformationalVersion("1.6.1.0")]
 
 // 不重复
-[assembly: AssemblyDescription("https://battlefield.vip")]
+[assembly: AssemblyDescription("https://github.com/CrazyZhang666/EAappEmulater")]
 [assembly: AssemblyCopyright("Copyright © 2024-2024")]
diff --git a/EAappEmulater/Usings.cs b/EAappEmulater/Usings.cs
@@ -29,4 +29,5 @@
 global using System.Text.Unicode;
 global using System.Text.Encodings.Web;
 global using System.Text.Json.Serialization;
+global using System.Text.Json.Nodes;
 global using Microsoft.Win32;
diff --git a/EAappEmulater/Views/AboutView.xaml b/EAappEmulater/Views/AboutView.xaml
@@ -46,15 +46,10 @@
 
         <WrapPanel Margin="5" HorizontalAlignment="Center">
             <ui:IconHyperlink
-                Margin="5,5,7,5"
+                Margin="5"
                 Text="GitHub"
                 ToolTip="https://github.com/CrazyZhang666/EAappEmulater"
                 Uri="https://github.com/CrazyZhang666/EAappEmulater" />
-            <ui:IconHyperlink
-                Margin="5"
-                Text="KOOK"
-                ToolTip="https://kook.top/WVuDlM"
-                Uri="https://kook.top/WVuDlM" />
         </WrapPanel>
     </StackPanel>
 

diff --git a/EAappEmulater/Windows/MainWindow.xaml b/EAappEmulater/Windows/MainWindow.xaml
@@ -30,8 +30,8 @@
                     VerticalAlignment="Center"
                     Icon="&#xE896;"
                     Text="发现新版本，点击下载"
-                    ToolTip="https://battlefield.vip"
-                    Uri="https://battlefield.vip"
+                    ToolTip="https://github.com/CrazyZhang666/EAappEmulater/releases"
+                    Uri="https://github.com/CrazyZhang666/EAappEmulater/releases"
                     Visibility="Hidden"
                     WindowChrome.IsHitTestVisibleInChrome="True" />
                 <!--  //////////////  -->

diff --git a/ModernWpf/Styles/TextBoxHint.xaml b/ModernWpf/Styles/TextBoxHint.xaml
@@ -99,6 +99,8 @@
         <Setter Property="TextWrapping" Value="Wrap" />
         <Setter Property="VerticalContentAlignment" Value="Top" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+        <Setter Property="HorizontalScrollBarVisibility" Value="Disabled" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:TextBoxHint}">
@@ -129,10 +131,11 @@
                                     Text="{TemplateBinding Hint}" />
                                 <ScrollViewer
                                     x:Name="PART_ContentHost"
-                                    HorizontalAlignment="Stretch"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                     Focusable="False"
-                                    HorizontalScrollBarVisibility="Disabled"
-                                    VerticalScrollBarVisibility="Auto" />
+                                    HorizontalScrollBarVisibility="{TemplateBinding HorizontalScrollBarVisibility}"
+                                    VerticalScrollBarVisibility="{TemplateBinding VerticalScrollBarVisibility}" />
                             </Grid>
                         </DockPanel>
                     </Border>