perf: 惰性加载检查更新 UI

Blinue · Nov 17, 2023 · 47785a2 · 47785a2
1 parent 266633d
commit 47785a2
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/src/Magpie.App/AboutPage.idl b/src/Magpie.App/AboutPage.idl
@@ -3,5 +3,8 @@ namespace Magpie.App {
 		AboutPage();
 
 		AboutViewModel ViewModel { get; };
+
+		// https://github.com/microsoft/microsoft-ui-xaml/issues/7579
+		void UnloadObject(Windows.UI.Xaml.DependencyObject object);
 	}
 }
diff --git a/src/Magpie.App/AboutPage.xaml b/src/Magpie.App/AboutPage.xaml
@@ -37,22 +37,24 @@
 						<Grid>
 							<TextBlock x:Uid="About_Version_CheckForUpdates"
 							           Visibility="{x:Bind ViewModel.IsCheckingForUpdates, Mode=OneWay, Converter={StaticResource NegativeVisibilityConverter}}" />
-							<StackPanel Orientation="Horizontal"
+							<StackPanel x:Name="CheckingForUpdates"
+							            x:Load="{x:Bind ViewModel.IsCheckingForUpdates, Mode=OneWay}"
+							            Orientation="Horizontal"
 							            Spacing="8">
 								<muxc:ProgressRing Width="16"
 								                   Height="16"
 								                   VerticalAlignment="Center"
 								                   Foreground="White"
-								                   IsActive="True"
-								                   Visibility="{x:Bind ViewModel.IsCheckingForUpdates, Mode=OneWay}" />
+								                   IsActive="True" />
 								<TextBlock x:Uid="About_Version_CheckingForUpdates"
-								           VerticalAlignment="Center"
-								           Visibility="{x:Bind ViewModel.IsCheckingForUpdates, Mode=OneWay}" />
+								           VerticalAlignment="Center" />
 							</StackPanel>
 						</Grid>
 					</Button>
 				</StackPanel>
-				<StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}"
+				<StackPanel x:Name="UpdateInfos"
+				            x:Load="{x:Bind ViewModel.IsAnyUpdateStatus, Mode=OneWay}"
+				            ChildrenTransitions="{StaticResource SettingsCardsAnimations}"
 				            Orientation="Vertical">
 					<muxc:InfoBar x:Uid="About_Version_CheckForUpdatesFailed"
 					              Margin="0,10,0,0"

diff --git a/src/Magpie.App/AboutViewModel.cpp b/src/Magpie.App/AboutViewModel.cpp
@@ -120,13 +120,16 @@ void AboutViewModel::IsAutoCheckForUpdates(bool value) noexcept {
 	_propertyChangedEvent(*this, PropertyChangedEventArgs(L"IsAutoCheckForUpdates"));
 }
 
+bool AboutViewModel::IsAnyUpdateStatus() const noexcept {
+	return UpdateService::Get().Status() > UpdateStatus::Checking;
+}
+
 bool AboutViewModel::IsCheckingForUpdates() const noexcept {
 	return UpdateService::Get().Status() == UpdateStatus::Checking;
 }
 
 bool AboutViewModel::IsErrorWhileChecking() const noexcept {
-	UpdateService& service = UpdateService::Get();
-	return service.Status() == UpdateStatus::ErrorWhileChecking;
+	return UpdateService::Get().Status() == UpdateStatus::ErrorWhileChecking;
 }
 
 void AboutViewModel::IsErrorWhileChecking(bool value) noexcept {
@@ -257,6 +260,7 @@ void AboutViewModel::Retry() {
 void AboutViewModel::_UpdateService_StatusChanged(UpdateStatus status) {
 	_propertyChangedEvent(*this, PropertyChangedEventArgs(L"IsCheckingForUpdates"));
 	_propertyChangedEvent(*this, PropertyChangedEventArgs(L"IsCheckForUpdatesButtonEnabled"));
+	_propertyChangedEvent(*this, PropertyChangedEventArgs(L"IsAnyUpdateStatus"));
 	_propertyChangedEvent(*this, PropertyChangedEventArgs(L"IsErrorWhileChecking"));
 	_propertyChangedEvent(*this, PropertyChangedEventArgs(L"IsNoUpdate"));
 	_propertyChangedEvent(*this, PropertyChangedEventArgs(L"IsAvailable"));

diff --git a/src/Magpie.App/AboutViewModel.h b/src/Magpie.App/AboutViewModel.h
@@ -34,6 +34,8 @@ struct AboutViewModel : AboutViewModelT<AboutViewModel> {
 	bool IsAutoCheckForUpdates() const noexcept;
 	void IsAutoCheckForUpdates(bool value) noexcept;
 
+	bool IsAnyUpdateStatus() const noexcept;
+
 	bool IsCheckingForUpdates() const noexcept;
 
 	bool IsErrorWhileChecking() const noexcept;

diff --git a/src/Magpie.App/AboutViewModel.idl b/src/Magpie.App/AboutViewModel.idl
@@ -15,6 +15,8 @@ namespace Magpie.App {
 		Boolean IsAutoCheckForUpdates;
 		Boolean IsCheckForPreviewUpdates;
 
+		Boolean IsAnyUpdateStatus { get; };
+
 		Boolean IsErrorWhileChecking;
 		Boolean IsNoUpdate;
 		Boolean IsAvailable { get; };