From 067c7d7c4d28f7f4422b267ace1de043e9b1b005 Mon Sep 17 00:00:00 2001
From: Lightczx <1686188646@qq.com>
Date: Thu, 2 Nov 2023 12:45:11 +0800
Subject: [PATCH] fix ci

---
 src/Snap.Hutao/Snap.Hutao/Control/Theme/FlyoutStyle.xaml | 6 +++++-
 .../Snap.Hutao/Service/Hutao/HutaoUserService.cs         | 8 ++++----
 src/Snap.Hutao/Snap.Hutao/View/UserView.xaml             | 9 ++-------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/FlyoutStyle.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/FlyoutStyle.xaml
index bd38511d..b2da9a2e 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/FlyoutStyle.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/FlyoutStyle.xaml
@@ -1,6 +1,10 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Style x:Key="WebViewerFlyoutPresenterStyle" TargetType="FlyoutPresenter">
+    <Style
+        x:Key="WebViewerFlyoutPresenterStyle"
+        BasedOn="{StaticResource DefaultFlyoutPresenterStyle}"
+        TargetType="FlyoutPresenter">
         <Setter Property="Padding" Value="0"/>
+        <Setter Property="CornerRadius" Value="0"/>
         <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}"/>
     </Style>
     <Style
diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoUserService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoUserService.cs
index 8639d734..7d7638b6 100644
--- a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoUserService.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoUserService.cs
@@ -32,19 +32,19 @@ internal sealed partial class HutaoUserService : IHutaoUserService, IHutaoUserSe
     public async ValueTask InitializeInternalAsync(CancellationToken token = default)
     {
         string userName = LocalSetting.Get(SettingKeys.PassportUserName, string.Empty);
-        string passport = LocalSetting.Get(SettingKeys.PassportPassword, string.Empty);
+        string password = LocalSetting.Get(SettingKeys.PassportPassword, string.Empty);
 
-        if (string.IsNullOrEmpty(userName) || string.IsNullOrEmpty(passport))
+        if (string.IsNullOrEmpty(userName) || string.IsNullOrEmpty(password))
         {
             options.SkipLogin();
         }
         else
         {
-            Web.Response.Response<string> response = await passportClient.LoginAsync(userName, passport, token).ConfigureAwait(false);
+            Web.Response.Response<string> response = await passportClient.LoginAsync(userName, password, token).ConfigureAwait(false);
 
             if (response.IsOk())
             {
-                if (await options.PostLoginSucceedAsync(passportClient, taskContext, userName, token: response.Data).ConfigureAwait(false))
+                if (await options.PostLoginSucceedAsync(passportClient, taskContext, userName, password, response.Data).ConfigureAwait(false))
                 {
                     isInitialized = true;
                 }
diff --git a/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml b/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml
index 0dcba325..8c66005a 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml
@@ -189,19 +189,14 @@
                                 Style="{StaticResource DefaultAppBarButtonStyle}">
                                 <AppBarButton.Flyout>
                                     <Flyout
+                                        FlyoutPresenterStyle="{StaticResource WebViewerFlyoutPresenterStyle}"
                                         LightDismissOverlayMode="On"
                                         Placement="Full"
                                         ShouldConstrainToRootBounds="False">
-                                        <Flyout.FlyoutPresenterStyle>
-                                            <Style BasedOn="{StaticResource DefaultFlyoutPresenterStyle}" TargetType="FlyoutPresenter">
-                                                <Setter Property="Padding" Value="0"/>
-                                                <Setter Property="CornerRadius" Value="0"/>
-                                            </Style>
-                                        </Flyout.FlyoutPresenterStyle>
                                         <Grid>
                                             <shvc:WebViewer>
                                                 <shvc:WebViewer.SourceProvider>
-                                                    <shvc:StaticWebview2ViewerSource ChineseSource="https://webstatic.mihoyo.com/app/community-game-records/index.html"/>
+                                                    <shvc:StaticWebview2ViewerSource ChineseSource="https://webstatic.mihoyo.com/bbs/event/e20200511toolbox/index.html?game_biz=ys_cn"/>
                                                 </shvc:WebViewer.SourceProvider>
                                             </shvc:WebViewer>
                                         </Grid>