🐛 fix CI

BeyondDimension · Nov 2, 2023 · 00c228a · 00c228a
1 parent 54fc1e3
commit 00c228a
Show file tree

Hide file tree

Showing 9 changed files with 98 additions and 17 deletions.
diff --git a/ref/DirectoryPackages b/ref/DirectoryPackages
diff --git a/src/BD.WTTS.Client.Avalonia/UI/Styling/Controls/ProgressBar.axaml b/src/BD.WTTS.Client.Avalonia/UI/Styling/Controls/ProgressBar.axaml
@@ -17,10 +17,7 @@
                     Classes="Circle"
                     Value="60" />
                 <ProgressBar Width="150" IsIndeterminate="True" />
-                <ProgressBar
-                    Width="150"
-                    Classes="notransitions"
-                    Value="50" />
+                <ProgressBar Width="150" Value="50" />
 
                 <TextBlock Text="Material Progress" />
                 <ProgressBar
@@ -31,7 +28,6 @@
                 <ProgressBar
                     Width="150"
                     Height="5"
-                    Classes="Material notransitions"
                     Value="50" />
             </StackPanel>
         </Border>
@@ -58,7 +54,7 @@
         <Setter Property="Width" Value="{DynamicResource ProgressBarMinHeight}" />
     </Style>
 
-    <Style Selector="ProgressBar:not(.notransitions) /template/ Border#PART_Indicator">
+    <Style Selector="ProgressBar[IsIndeterminate=False] /template/ Border#PART_Indicator">
         <Setter Property="Transitions">
             <Transitions>
                 <DoubleTransition

diff --git a/src/BD.WTTS.Client.Plugins.Authenticator/Helpers/AuthenticatorHelper.cs b/src/BD.WTTS.Client.Plugins.Authenticator/Helpers/AuthenticatorHelper.cs
@@ -136,7 +136,7 @@ public static async Task<bool> SwitchEncryptionAuthenticators(bool hasLocal, IEn
         IEnumerable<IAuthenticatorDTO> items, string? password = null)
     {
         SaveFileResult? exportFile = null;
-        if (Essentials.IsSupportedSaveFileDialog)
+        if (CommonEssentials.IsSupportedSaveFileDialog)
         {
             AvaloniaFilePickerFileTypeFilter fileTypes = new AvaloniaFilePickerFileTypeFilter.Item[] {
                 new("MsgPack Files") {

diff --git a/src/BD.WTTS.Client.Plugins.Authenticator/UI/ViewModels/AuthenticatorHomePageViewModel.cs b/src/BD.WTTS.Client.Plugins.Authenticator/UI/ViewModels/AuthenticatorHomePageViewModel.cs
@@ -514,7 +514,7 @@ public async void ExportAuthWithSdaFile(object sender)
 
             //...导出至文件目录
 
-            if (Essentials.IsSupportedSaveFileDialog)
+            if (CommonEssentials.IsSupportedSaveFileDialog)
             {
                 AvaloniaFilePickerFileTypeFilter fileTypes = new AvaloniaFilePickerFileTypeFilter.Item[] {
                     new("maFile Files") {

diff --git a/src/BD.WTTS.Client.Plugins.SteamIdleCard/UI/ViewModels/IdleCardPageViewModel.props.cs b/src/BD.WTTS.Client.Plugins.SteamIdleCard/UI/ViewModels/IdleCardPageViewModel.props.cs
@@ -19,14 +19,17 @@ public sealed partial class IdleCardPageViewModel
     [Reactive]
     public string? RuningCountTxt { get; set; }
 
+    /// <summary>
+    /// 正在挂卡游戏
+    /// </summary>
     [Reactive]
     public ObservableCollection<SteamApp> IdleGameList { get; set; } = new();
 
     /// <summary>
     /// 用户徽章和卡片数据
     /// </summary>
     [Reactive]
-    private ObservableCollection<Badge> Badges { get; set; } = new ObservableCollection<Badge>();
+    private ObservableCollection<Badge> Badges { get; set; } = new();
 
     /// <summary>
     /// 当前挂卡游戏 

diff --git a/src/BD.WTTS.Client.Plugins.SteamIdleCard/UI/Views/Pages/IdleCardPage.axaml b/src/BD.WTTS.Client.Plugins.SteamIdleCard/UI/Views/Pages/IdleCardPage.axaml
@@ -25,9 +25,91 @@
     </spp:PageBase.ActionContent>
 
     <spp:ContentLoader IsLoading="False">
+        <Grid RowDefinitions="Auto,Auto,*">
+            <StackPanel Spacing="8">
+                <TextBlock Text="账号信息" />
 
-        <Grid RowDefinitions="Auto,*">
-            <ItemsControl>
+                <StackPanel Orientation="Horizontal" Spacing="5">
+                    <Border
+                        Grid.Column="0"
+                        HorizontalAlignment="Center"
+                        spp:Animations.EnableAnimations="True">
+                        <Button Padding="20">
+                            <Grid ColumnDefinitions="60,*" RowDefinitions="3*,*,Auto">
+                                <WrapPanel Grid.RowSpan="3">
+                                    <spp:Image2
+                                        Width="36"
+                                        Height="36"
+                                        Margin="0,0,5,0"
+                                        VerticalAlignment="Center"
+                                        DecodeWidth="36"
+                                        Source="{Binding Source={x:Static s:SteamConnectService.Current}, Path=CurrentSteamUser.AvatarMedium, Mode=OneWay}"
+                                        Stretch="Uniform">
+                                        <spp:Image2.Clip>
+                                            <EllipseGeometry Rect="0,0,36,36" />
+                                        </spp:Image2.Clip>
+                                    </spp:Image2>
+                                    <TextBlock
+                                        VerticalAlignment="Center"
+                                        Text="{Binding Source={x:Static s:SteamConnectService.Current}, Path=CurrentSteamUser.SteamNickName, Mode=OneWay}"
+                                        Theme="{StaticResource SubtitleTextBlockStyle}" />
+                                    <TextBlock
+                                        VerticalAlignment="Center"
+                                        IsVisible="{Binding Source={x:Static s:SteamConnectService.Current}, Path=CurrentSteamUser.IPCountry, Mode=OneWay, Converter={StaticResource IsNullConverter}, ConverterParameter=invert}"
+                                        Text="{Binding Source={x:Static s:SteamConnectService.Current}, Path=CurrentSteamUser.IPCountry, Mode=OneWay, StringFormat={}({0})}"
+                                        Theme="{StaticResource SubtitleTextBlockStyle}" />
+                                </WrapPanel>
+                                <ProgressBar
+                                    Grid.Column="1"
+                                    Width="30"
+                                    Height="30"
+                                    Classes="Circle"
+                                    Value="50" />
+                                <TextBlock
+                                    Grid.Row="1"
+                                    Grid.Column="1"
+                                    FontWeight="SemiBold"
+                                    Text="Steam 已运行" />
+                            </Grid>
+                        </Button>
+                    </Border>
+                    <Border
+                        Grid.Column="0"
+                        HorizontalAlignment="Center"
+                        spp:Animations.EnableAnimations="True">
+                        <Button Padding="20">
+                            <Grid RowDefinitions="3*,*,Auto">
+                                <spp:Image2 Width="50" Source="avares://BD.WTTS.Client.Plugins.GameTools/UI/Assets/BorderlessWindow.png " />
+                                <TextBlock
+                                    Grid.Row="1"
+                                    FontWeight="SemiBold"
+                                    Text="Steam 已运行" />
+                                <TextBlock
+                                    Grid.Row="1"
+                                    FontWeight="SemiBold"
+                                    Text="Steam 账号已登录" />
+                            </Grid>
+                        </Button>
+                    </Border>
+
+                    <Border
+                        Grid.Column="0"
+                        HorizontalAlignment="Center"
+                        spp:Animations.EnableAnimations="True">
+                        <Button Padding="20">
+                            <Grid RowDefinitions="3*,*">
+                                <spp:Image2 Width="50" Source="avares://BD.WTTS.Client.Plugins.GameTools/UI/Assets/BorderlessWindow.png " />
+                                <TextBlock
+                                    Grid.Row="1"
+                                    FontWeight="SemiBold"
+                                    Text="Steam 账号已登录" />
+                            </Grid>
+                        </Button>
+                    </Border>
+                </StackPanel>
+            </StackPanel>
+
+            <ItemsControl Grid.Row="1">
                 <ItemsControl.ItemsPanel>
                     <ItemsPanelTemplate>
                         <Grid ColumnDefinitions="*,*,*" />
@@ -78,7 +160,7 @@
                             <TextBlock
                                 Margin="12"
                                 FontWeight="SemiBold"
-                                Text="{Binding Badges^.Count}" />
+                                Text="{Binding Badges.Count}" />
                             <TextBlock
                                 Grid.Row="1"
                                 Margin="12"
@@ -89,7 +171,7 @@
                 </Border>
             </ItemsControl>
 
-            <DockPanel Grid.Row="1">
+            <DockPanel Grid.Row="2">
                 <TextBlock DockPanel.Dock="Top" Text="正在挂卡的游戏" />
                 <ItemsControl DockPanel.Dock="Bottom" ItemsSource="{Binding IdleGameList}">
                     <ItemsControl.ItemsPanel>

diff --git a/src/BD.WTTS.Client/Services.Implementation/Net/Http/ClientHttpPlatformHelperServiceImpl.cs b/src/BD.WTTS.Client/Services.Implementation/Net/Http/ClientHttpPlatformHelperServiceImpl.cs
@@ -12,7 +12,7 @@ protected override bool IsConnected
     {
         get
         {
-            if (Essentials.IsSupported)
+            if (CommonEssentials.IsSupported)
             {
                 var networkAccess = Connectivity2.NetworkAccess();
                 return networkAccess == NetworkAccess.Internet;

diff --git a/src/BD.WTTS.Client/Services/Platform/IPlatformService.MachineUniqueIdentifier.cs b/src/BD.WTTS.Client/Services/Platform/IPlatformService.MachineUniqueIdentifier.cs
@@ -31,7 +31,7 @@ private static (byte[] key, byte[] iv) GetMachineSecretKey(string? value)
 
     protected static (byte[] key, byte[] iv) GetMachineSecretKeyBySecureStorage()
     {
-        if (!Essentials.IsSupported) throw new PlatformNotSupportedException();
+        if (!CommonEssentials.IsSupported) throw new PlatformNotSupportedException();
         const string KEY_MACHINE_SECRET = "KEY_MACHINE_SECRET_2105";
         var guid = GetMachineSecretKeyGuid();
         static Guid GetMachineSecretKeyGuid()

diff --git a/src/BD.WTTS.Client/UI/ViewModels/Pages/AboutPageViewModel.EasterEgg.cs b/src/BD.WTTS.Client/UI/ViewModels/Pages/AboutPageViewModel.EasterEgg.cs
@@ -534,7 +534,7 @@ static string GetJavaSystemGetProperty(string propertyKey)
         b.AppendLine();
 
         b.Append("[essentials.supported] ");
-        b.Append(Essentials.IsSupported.ToLowerString());
+        b.Append(CommonEssentials.IsSupported.ToLowerString());
         b.AppendLine();
 
         //#if ANDROID