From f43c07ba8058e1397a7870aa5d94ec102146a2e6 Mon Sep 17 00:00:00 2001
From: zzyyyl <aysyxx53@hotmail.com>
Date: Sun, 5 Mar 2023 15:58:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=20changelog=20?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaWpfGui/Main/VersionUpdateViewModel.cs |  6 +++
 src/MaaWpfGui/Views/VersionUpdateView.xaml   | 57 ++++++++++----------
 2 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/src/MaaWpfGui/Main/VersionUpdateViewModel.cs b/src/MaaWpfGui/Main/VersionUpdateViewModel.cs
index 391ee38426..01f03d8d67 100644
--- a/src/MaaWpfGui/Main/VersionUpdateViewModel.cs
+++ b/src/MaaWpfGui/Main/VersionUpdateViewModel.cs
@@ -22,7 +22,10 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows;
+using System.Windows.Documents;
 using MaaWpfGui.Helper;
+using Markdig;
+using Neo.Markdig.Xaml;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Stylet;
@@ -108,6 +111,9 @@ namespace MaaWpfGui
             }
         }
 
+        public FlowDocument UpdateInfoDoc => MarkdownXaml.ToFlowDocument(UpdateInfo,
+                new MarkdownPipelineBuilder().UseXamlSupportedExtensions().Build());
+
         private string _updateUrl;
 
         /// <summary>
diff --git a/src/MaaWpfGui/Views/VersionUpdateView.xaml b/src/MaaWpfGui/Views/VersionUpdateView.xaml
index ac1532a6a0..4ebcb3a7b0 100644
--- a/src/MaaWpfGui/Views/VersionUpdateView.xaml
+++ b/src/MaaWpfGui/Views/VersionUpdateView.xaml
@@ -5,7 +5,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:maa="clr-namespace:MaaWpfGui.Helper.CustomStyle"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:mdxam="clr-namespace:MdXaml;assembly=MdXaml"
+    xmlns:mdg="clr-namespace:Neo.Markdig.Xaml;assembly=Neo.Markdig.Xaml"
     xmlns:s="https://github.com/canton7/Stylet"
     xmlns:vm="clr-namespace:MaaWpfGui"
     Title="{DynamicResource VersionUpdated}"
@@ -15,9 +15,9 @@
     mc:Ignorable="d">
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="80" />
+            <RowDefinition Height="50" />
             <RowDefinition Height="*" />
-            <RowDefinition Height="120" />
+            <RowDefinition Height="20" />
         </Grid.RowDefinitions>
 
         <StackPanel
@@ -25,42 +25,43 @@
             HorizontalAlignment="Center"
             Orientation="Horizontal">
             <maa:TextBlock
-                Margin="0,20"
-                FontSize="24"
+                Margin="0,10,0,5"
+                FontSize="20"
                 Style="{StaticResource TextBlockDefaultBold}"
                 Text="{DynamicResource VersionUpdatedTo}"
-                TextWrapping="Wrap" />
+                TextWrapping="Wrap" VerticalAlignment="Bottom" />
             <maa:TextBlock
-                Margin="0,20"
-                FontSize="24"
+                Margin="0,10,0,5"
+                FontSize="20"
                 Style="{StaticResource TextBlockDefaultBold}"
                 Text="{Binding UpdateTag}"
-                TextWrapping="Wrap" />
+                TextWrapping="Wrap" VerticalAlignment="Bottom" />
         </StackPanel>
 
-
-        <mdxam:MarkdownScrollViewer
+        <FlowDocumentScrollViewer
             x:Name="UpdateInfoMarkdownDocument"
+            Document="{Binding UpdateInfoDoc}"
             Grid.Row="1"
             Margin="16,0"
-            ClickAction="DisplayWithRelativePath"
-            Language="zh-CN"
-            Markdown="{Binding UpdateInfo}"
-            MarkdownStyleName="GithubLike" />
+            Zoom="90"
+            IsSelectionEnabled="False">
 
+            <FlowDocumentScrollViewer.Template>
+                <ControlTemplate TargetType="FlowDocumentScrollViewer">
+                    <Border
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        Focusable="False">
+                        <ScrollViewer x:Name="PART_ContentHost" />
+                    </Border>
+                </ControlTemplate>
+            </FlowDocumentScrollViewer.Template>
 
-        <StackPanel
-            Grid.Row="2"
-            HorizontalAlignment="Center"
-            Orientation="Horizontal">
-            <!--<Button Command="{s:Action Download}" Content="前往下载" Margin="20" Width="120" Height="60" />-->
-            <!--<Button Command="{s:Action Ignore}" Content="不再提示" Margin="20" Width="120" Height="60" />-->
-            <Button
-                Width="120"
-                Height="60"
-                Margin="20"
-                Command="{s:Action Close}"
-                Content="{DynamicResource UpdateNotificationOK}" />
-        </StackPanel>
+            <FlowDocumentScrollViewer.CommandBindings>
+                <CommandBinding
+                    Command="{x:Static mdg:MarkdownXaml.Hyperlink}"
+                    Executed="{s:Action OpenHyperlink}" />
+            </FlowDocumentScrollViewer.CommandBindings>
+        </FlowDocumentScrollViewer>
     </Grid>
 </Window>
\ No newline at end of file

From 97358acea6750ca53b5e8aca5ffe4ef96c2a642b Mon Sep 17 00:00:00 2001
From: zzyyyl <aysyxx53@hotmail.com>
Date: Sun, 5 Mar 2023 17:52:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=20IsFirstBootAft?=
 =?UTF-8?q?erUpdate=20=E7=9A=84=E5=A4=84=E7=90=86=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

更新完设成 True，弹完窗设成 False
---
 src/MaaWpfGui/Main/RootViewModel.cs          |  2 ++
 src/MaaWpfGui/Main/VersionUpdateViewModel.cs | 24 ++++++++++----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/MaaWpfGui/Main/RootViewModel.cs b/src/MaaWpfGui/Main/RootViewModel.cs
index 5c5f18680c..4f190a8bf0 100644
--- a/src/MaaWpfGui/Main/RootViewModel.cs
+++ b/src/MaaWpfGui/Main/RootViewModel.cs
@@ -85,6 +85,7 @@ namespace MaaWpfGui
         {
             if (_versionUpdateViewModel.IsFirstBootAfterUpdate)
             {
+                _versionUpdateViewModel.IsFirstBootAfterUpdate = false;
                 _windowManager.ShowWindow(_versionUpdateViewModel);
             }
             else
@@ -93,6 +94,7 @@ namespace MaaWpfGui
 
                 if (ret == VersionUpdateViewModel.CheckUpdateRetT.OK)
                 {
+                    _versionUpdateViewModel.IsFirstBootAfterUpdate = true;
                     _versionUpdateViewModel.AskToRestart();
                 }
             }
diff --git a/src/MaaWpfGui/Main/VersionUpdateViewModel.cs b/src/MaaWpfGui/Main/VersionUpdateViewModel.cs
index 01f03d8d67..344a11850c 100644
--- a/src/MaaWpfGui/Main/VersionUpdateViewModel.cs
+++ b/src/MaaWpfGui/Main/VersionUpdateViewModel.cs
@@ -125,10 +125,20 @@ namespace MaaWpfGui
             set => SetAndNotify(ref _updateUrl, value);
         }
 
+        private bool _isFirstBootAfterUpdate = Convert.ToBoolean(ViewStatusStorage.Get("VersionUpdate.isfirstboot", bool.FalseString));
+
         /// <summary>
-        /// Gets a value indicating whether it is the first boot after updating.
+        /// Gets or sets a value indicating whether it is the first boot after updating.
         /// </summary>
-        public bool IsFirstBootAfterUpdate => UpdateTag != string.Empty && UpdateTag == _curVersion;
+        public bool IsFirstBootAfterUpdate
+        {
+            get => _isFirstBootAfterUpdate;
+            set
+            {
+                SetAndNotify(ref _isFirstBootAfterUpdate, value);
+                ViewStatusStorage.Set("VersionUpdate.isfirstboot", value.ToString());
+            }
+        }
 
         private string _updatePackageName = ViewStatusStorage.Get("VersionUpdate.package", string.Empty);
 
@@ -960,16 +970,6 @@ namespace MaaWpfGui
             }
         }
 
-        /// <summary>
-        /// Closes view model.
-        /// </summary>
-        public void Close()
-        {
-            RequestClose();
-            /* UpdateTag = string.Empty; */
-            /* UpdateInfo = string.Empty; */
-        }
-
         /// <summary>
         /// The event handler of opening hyperlink.
         /// </summary>