同步 2.3.4 代码

Plain Craft Launcher 2/Pages/PageOther/PageOtherLeft.xaml.vb

@@ -6,7 +6,6 @@
         '是否处于隐藏的子页面
         Dim IsHiddenPage As Boolean = False
         If ItemHelp.Checked AndAlso Setup.Get("UiHiddenOtherHelp") Then IsHiddenPage = True
-        If ItemFeedback.Checked AndAlso Setup.Get("UiHiddenOtherFeedback") Then IsHiddenPage = True
         If ItemAbout.Checked AndAlso Setup.Get("UiHiddenOtherAbout") Then IsHiddenPage = True
         If ItemTest.Checked AndAlso Setup.Get("UiHiddenOtherTest") Then IsHiddenPage = True
         If PageSetupUI.HiddenForceShow Then IsHiddenPage = False
@@ -21,10 +20,8 @@
             ItemHelp.SetChecked(True, False, False)
         ElseIf Not Setup.Get("UiHiddenOtherAbout") Then
             ItemAbout.SetChecked(True, False, False)
-        ElseIf Not Setup.Get("UiHiddenOtherTest") Then
-            ItemTest.SetChecked(True, False, False)
         Else
-            ItemFeedback.SetChecked(True, False, False)
+            ItemTest.SetChecked(True, False, False)
         End If
     End Sub
     Private Sub PageOtherLeft_Unloaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
@@ -44,17 +41,15 @@
             PageID = FormMain.PageSubType.OtherHelp
         ElseIf Not Setup.Get("UiHiddenOtherAbout") Then
             PageID = FormMain.PageSubType.OtherAbout
-        ElseIf Not Setup.Get("UiHiddenOtherTest") Then
-            PageID = FormMain.PageSubType.OtherTest
         Else
-            PageID = FormMain.PageSubType.OtherFeedback
+            PageID = FormMain.PageSubType.OtherTest
         End If
     End Sub
 
     ''' <summary>
     ''' 勾选事件改变页面。
     ''' </summary>
-    Private Sub PageCheck(sender As MyListItem, e As RouteEventArgs) Handles ItemAbout.Check, ItemHelp.Check, ItemFeedback.Check, ItemTest.Check
+    Private Sub PageCheck(sender As MyListItem, e As RouteEventArgs) Handles ItemAbout.Check, ItemHelp.Check, ItemTest.Check
         '尚未初始化控件属性时，sender.Tag 为 Nothing，会导致切换到页面 0
         '若使用 IsLoaded，则会导致模拟点击不被执行（模拟点击切换页面时，控件的 IsLoaded 为 False）
         If sender.Tag IsNot Nothing Then PageChange(Val(sender.Tag))
@@ -66,9 +61,6 @@
             Case FormMain.PageSubType.OtherHelp
                 If FrmOtherHelp Is Nothing Then FrmOtherHelp = New PageOtherHelp
                 Return FrmOtherHelp
-            Case FormMain.PageSubType.OtherFeedback
-                If FrmOtherFeedback Is Nothing Then FrmOtherFeedback = New PageOtherFeedback
-                Return FrmOtherFeedback
             Case FormMain.PageSubType.OtherAbout
                 If FrmOtherAbout Is Nothing Then FrmOtherAbout = New PageOtherAbout
                 Return FrmOtherAbout
@@ -122,13 +114,6 @@
         Select Case Val(sender.Tag)
             Case FormMain.PageSubType.OtherHelp
                 RefreshHelp()
-            Case FormMain.PageSubType.OtherFeedback
-                If FrmOtherFeedback IsNot Nothing Then
-                    FrmOtherFeedback.PageLoaderRestart()
-                    FrmOtherFeedback.SearchBox.Text = ""
-                Else
-                    FeedbackLoader.Start()
-                End If
         End Select
     End Sub
     Public Shared Sub RefreshHelp()
@@ -137,4 +122,9 @@
         FrmOtherHelp.SearchBox.Text = ""
     End Sub
 
+    '打开反馈
+    Public Shared Sub TryFeedback() Handles ItemFeedback.Click
+        If CanFeedback(True) Then Feedback(True, False)
+    End Sub
+
 End Class