From d714f1c2dcabb6eae7ff163545b2d09bf5fcb6e0 Mon Sep 17 00:00:00 2001
From: rmbgame <rmb@rmbgame.net>
Date: Thu, 29 Apr 2021 04:00:37 +0800
Subject: [PATCH] error reset

---
 .../Views/Pages/About/About_SoftwarePage.axaml   | 16 ++++++++--------
 src/Startup2.cs                                  |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/About/About_SoftwarePage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/About/About_SoftwarePage.axaml
index 98f784468..3280429b2 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/About/About_SoftwarePage.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/About/About_SoftwarePage.axaml
@@ -88,10 +88,10 @@
         </StackPanel>
         <StackPanel Orientation="Horizontal">
           <TextBlock Classes="Header light"
-                     Text="Current Version: "
+                     Text="{Binding LabelVersionDisplay,Mode=OneTime}"
                      VerticalAlignment="Center"/>
           <TextBox Classes="Content readonlybox"
-                   Text="{Binding LabelVersionDisplay}"/>
+                   Text="{Binding VersionDisplay,Mode=OneTime}"/>
         </StackPanel>
         <StackPanel Orientation="Horizontal" Spacing="5">
           <TextBlock Classes="Header light"
@@ -114,7 +114,7 @@
         </StackPanel>
         <StackPanel Orientation="Horizontal">
           <TextBlock Classes="Header light"
-                     Text="Business And Art: "
+                     Text="Business and Art: "
                      VerticalAlignment="Center"/>
           <Button Classes="plain" Command="{Binding OpenBrowserCommand}"
                           CommandParameter="{x:Static vm:AboutPageViewModel.CliencerLink}">
@@ -183,18 +183,18 @@
           </WrapPanel>
           <StackPanel Orientation="Horizontal" Spacing="5" HorizontalAlignment="Center">
             <Button Classes="plain" Command="{Binding OpenBrowserCommand}"
-                        CommandParameter="{x:Static vm:AboutPageViewModel.PrivacyLink}">
-              <TextBlock Text="用户协议" Classes="Hyperlink" />
+                            CommandParameter="{x:Static vm:AboutPageViewModel.AgreementLink}">
+              <TextBlock Text="{ReflectionBinding Path=Res.User_Agreement,Mode=OneWay,Source={x:Static resx:R.Current}}" Classes="Hyperlink" />
             </Button>
             <TextBlock Classes="LinkSeparatorPadding" Text="-" />
             <Button Classes="plain" Command="{Binding OpenBrowserCommand}"
-                            CommandParameter="{x:Static vm:AboutPageViewModel.AgreementLink}">
-              <TextBlock Text="隐私政策" Classes="Hyperlink" />
+                        CommandParameter="{x:Static vm:AboutPageViewModel.PrivacyLink}">
+              <TextBlock Text="{ReflectionBinding Path=Res.User_Privacy,Mode=OneWay,Source={x:Static resx:R.Current}}" Classes="Hyperlink" />
             </Button>
           </StackPanel>
           <WrapPanel HorizontalAlignment="Center">
             <TextBlock Classes="h7 light"
-                           Text="长沙次元超越科技有限公司 - 2021© All Rights Reserved."
+                           Text="{Binding Copyright}"
                            VerticalAlignment="Center"/>
           </WrapPanel>
         </StackPanel>
diff --git a/src/Startup2.cs b/src/Startup2.cs
index f87c9d107..16154c559 100644
--- a/src/Startup2.cs
+++ b/src/Startup2.cs
@@ -325,8 +325,8 @@ namespace System.Application
                     }
 #endif
                     var value =
-                        //(ThisAssembly.Debuggable || !s.GetIsOfficialChannelPackage()) ?
-                        //CSConst.Prefix_HTTPS + "pan.mossimo.net:8862" :
+                        (ThisAssembly.Debuggable || !s.GetIsOfficialChannelPackage()) ?
+                        CSConst.Prefix_HTTPS + "pan.mossimo.net:8862" :
                         CSConst.Prefix_HTTPS + "api.steampp.net";
                     s.ApiBaseUrl = value;
                 }