From 9fe1471f8eb667025a3778b3ab6e3fa3c8262bd2 Mon Sep 17 00:00:00 2001
From: tangge233 <2697992791@qq.com>
Date: Mon, 5 Aug 2024 23:43:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=94=A8=E6=9E=9A=E4=B8=BE=E6=9B=BF?=
 =?UTF-8?q?=E4=BB=A3=E5=AD=97=E7=AC=A6=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/PageVersion/PageVersionMod.xaml     | 10 ++---
 .../Pages/PageVersion/PageVersionMod.xaml.vb  | 37 +++++++++++++------
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml
index 5177eee..bc6770e 100644
--- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml	
+++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml	
@@ -26,15 +26,15 @@
                     </local:MyCard>
                     <local:MyCard x:Name="PanListBack" VerticalAlignment="Top" Opacity="0" Margin="0,0,0,15" Title=" " MinHeight="40">
                         <StackPanel Margin="0,9,10,0" Orientation="Horizontal" VerticalAlignment="Top" HorizontalAlignment="Right" Height="24">
-                            <local:MyRadioButton VerticalAlignment="Center" Height="24" Margin="2,0" Tag="All"  Text="全部" x:Name="BtnTypeAll" ColorType="Highlight" Checked="True"/>
+                            <local:MyRadioButton VerticalAlignment="Center" Height="24" Margin="2,0" Text="全部" x:Name="BtnTypeAll" ColorType="Highlight" Checked="True"/>
                             <TextBlock Text="|" Foreground="{StaticResource ColorBrushGray1}" VerticalAlignment="Center"/>
-                            <local:MyRadioButton VerticalAlignment="Center" Height="24" Margin="2,0" Tag="Enabled" Text="已启用" x:Name="BtnTypeEnabled" ColorType="Highlight"/>
+                            <local:MyRadioButton VerticalAlignment="Center" Height="24" Margin="2,0" Text="已启用" x:Name="BtnTypeEnabled" ColorType="Highlight"/>
                             <TextBlock Text="|" Foreground="{StaticResource ColorBrushGray1}" VerticalAlignment="Center"/>
-                            <local:MyRadioButton VerticalAlignment="Center" Height="24" Margin="2,0" Tag="Disabled" Text="已禁用" x:Name="BtnTypeDisabled" ColorType="Highlight"/>
+                            <local:MyRadioButton VerticalAlignment="Center" Height="24" Margin="2,0" Text="已禁用" x:Name="BtnTypeDisabled" ColorType="Highlight"/>
                             <TextBlock Text="|" Foreground="{StaticResource ColorBrushGray1}" VerticalAlignment="Center"/>
-                            <local:MyRadioButton VerticalAlignment="Center" Height="24" Margin="2,0" Tag="CanUpdate" Text="可更新" x:Name="BtnTypeCanUpdate" ColorType="Highlight"/>
+                            <local:MyRadioButton VerticalAlignment="Center" Height="24" Margin="2,0" Text="可更新" x:Name="BtnTypeCanUpdate" ColorType="Highlight"/>
                             <TextBlock Text="|" Foreground="{StaticResource ColorBrushGray1}" VerticalAlignment="Center"/>
-                            <local:MyRadioButton VerticalAlignment="Center" Height="24" Margin="2,0" Tag="Error" Text="错误" x:Name="BtnTypeError" ColorType="Highlight"/>
+                            <local:MyRadioButton VerticalAlignment="Center" Height="24" Margin="2,0" Text="错误" x:Name="BtnTypeError" ColorType="Highlight"/>
                         </StackPanel>
                         <StackPanel Margin="20,38,18,18" Name="PanList" VerticalAlignment="Top" />
                     </local:MyCard>
diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb
index b55339d..3700f22 100644
--- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb	
+++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb	
@@ -4,6 +4,11 @@
 
     Private IsLoad As Boolean = False
     Public Sub PageOther_Loaded() Handles Me.Loaded
+        BtnTypeAll.Tag = ViewType.All
+        BtnTypeEnabled.Tag = ViewType.Enabled
+        BtnTypeDisabled.Tag = ViewType.Disabled
+        BtnTypeCanUpdate.Tag = ViewType.CanUpdate
+        BtnTypeError.Tag = ViewType.InError
 
         If FrmMain.PageLast.Page <> FormMain.PageType.CompDetail Then PanBack.ScrollToHome()
         AniControlEnabled += 1
@@ -25,7 +30,7 @@
     ''' 刷新 Mod 列表。
     ''' </summary>
     Public Sub RefreshList(Optional ForceReload As Boolean = False)
-        ViewModType = "All"
+        ViewModType = ViewType.All
         If LoaderFolderRun(McModLoader, PageVersionLeft.Version.PathIndie & "mods\", If(ForceReload, LoaderFolderRunType.ForceRun, LoaderFolderRunType.RunOnUpdated)) Then
             Log("[System] 已刷新 Mod 列表")
             PanBack.ScrollToHome()
@@ -128,21 +133,21 @@
     Private Sub RefreshResult(Mods As List(Of McMod))
         Dim ShowMods As List(Of McMod) = New List(Of McMod)
         Select Case ViewModType
-            Case "All"
+            Case ViewType.All
                 ShowMods = Mods
-            Case "Enabled"
+            Case ViewType.Enabled
                 For Each Item In Mods
                     If Item.State.Equals(McMod.McModState.Fine) Then ShowMods.Add(Item)
                 Next
-            Case "Disabled"
+            Case ViewType.Disabled
                 For Each Item In Mods
                     If Item.State.Equals(McMod.McModState.Disabled) Then ShowMods.Add(Item)
                 Next
-            Case "CanUpdate"
+            Case ViewType.CanUpdate
                 For Each Item In Mods
                     If Item.CanUpdate Then ShowMods.Add(Item)
                 Next
-            Case "Error"
+            Case ViewType.InError
                 For Each Item In Mods
                     If Item.State.Equals(McMod.McModState.Unavaliable) Then ShowMods.Add(Item)
                 Next
@@ -188,15 +193,15 @@
             PanListBack.Title = "无搜索结果 - "
         End If
         Select Case ViewModType
-            Case "All"
+            Case ViewType.All
                 PanListBack.Title += BtnTypeAll.Text
-            Case "Enabled"
+            Case ViewType.Enabled
                 PanListBack.Title += BtnTypeEnabled.Text
-            Case "Disabled"
+            Case ViewType.Disabled
                 PanListBack.Title += BtnTypeDisabled.Text
-            Case "CanUpdate"
+            Case ViewType.CanUpdate
                 PanListBack.Title += BtnTypeCanUpdate.Text
-            Case "Error"
+            Case ViewType.InError
                 PanListBack.Title += BtnTypeError.Text
         End Select
         PanList.Visibility = If(PanList.Children.Count > 0, Visibility.Visible, Visibility.Collapsed)
@@ -383,7 +388,15 @@
         If My.Computer.Keyboard.CtrlKeyDown AndAlso e.Key = Key.A Then ChangeCurrentSelected(True)
     End Sub
 
-    Private ViewModType As String = "All"
+    Private ViewModType As ViewType = ViewType.All
+
+    Private Enum ViewType As Integer
+        All
+        Enabled
+        Disabled
+        CanUpdate
+        InError
+    End Enum
 
     Private Sub ChangeViewType(sender As MyRadioButton, raiseByMouse As Boolean) Handles BtnTypeAll.Check, BtnTypeCanUpdate.Check, BtnTypeDisabled.Check, BtnTypeEnabled.Check, BtnTypeError.Check
         ViewModType = sender.Tag