更改全局变量命名

sovetskyfish · Jun 1, 2020 · a2f8d44 · a2f8d44
1 parent 178abc3
commit a2f8d44
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/PixivFSUWP/SearchPage.xaml.cs b/PixivFSUWP/SearchPage.xaml.cs
@@ -31,9 +31,9 @@ namespace PixivFSUWP
     public sealed partial class SearchPage : Page, IGoBackFlag
     {
         string lastWord = null;
-        int lastIndex1 = -1;
-        int lastIndex2 = -1;
-        int lastIndex3 = -1;
+        int lastSearchTarget = -1;
+        int lastSort = -1;
+        int lastDuration = -1;
 
         public SearchPage()
         {
@@ -104,8 +104,8 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
             {
                 resultFrame.Navigate(typeof(WaterfallPage), e.Parameter);
                 grdSearchPanel.Visibility = Visibility.Collapsed;
-                if (txtWord.Text.Trim() != lastWord || cbSearchTarget.SelectedIndex != lastIndex1 ||
-                    cbSort.SelectedIndex != lastIndex2 || cbDuration.SelectedIndex != lastIndex3)
+                if (txtWord.Text.Trim() != lastWord || cbSearchTarget.SelectedIndex != lastSearchTarget ||
+                    cbSort.SelectedIndex != lastSort || cbDuration.SelectedIndex != lastDuration)
                 {
                     lastWord = txtWord.Text.Trim();
                     lastSearchTarget = cbSearchTarget.SelectedIndex;
@@ -138,8 +138,8 @@ public async Task ShowSearch()
         private async void TxtWord_QuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args)
         {
             if (string.IsNullOrWhiteSpace(txtWord.Text)) return;
-            if (txtWord.Text.Trim() != lastWord || cbSearchTarget.SelectedIndex != lastIndex1 ||
-                cbSort.SelectedIndex != lastIndex2 || cbDuration.SelectedIndex != lastIndex3)
+            if (txtWord.Text.Trim() != lastWord || cbSearchTarget.SelectedIndex != lastSearchTarget ||
+                cbSort.SelectedIndex != lastSort || cbDuration.SelectedIndex != lastDuration)
             {
                 if (resultFrame.Content != null)
                     (resultFrame.Content as WaterfallPage).ItemsSource.CollectionChanged -= ItemsSource_CollectionChanged;
@@ -190,13 +190,13 @@ private async void TxtWord_QuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQ
             storyFade.Begin();
             await Task.Delay(200);
             grdSearchPanel.Visibility = Visibility.Collapsed;
-            if (txtWord.Text.Trim() != lastWord || cbSearchTarget.SelectedIndex != lastIndex1 ||
-                cbSort.SelectedIndex != lastIndex2 || cbDuration.SelectedIndex != lastIndex3)
+            if (txtWord.Text.Trim() != lastWord || cbSearchTarget.SelectedIndex != lastSearchTarget ||
+                cbSort.SelectedIndex != lastSort || cbDuration.SelectedIndex != lastDuration)
             {
                 lastWord = txtWord.Text.Trim();
-                lastIndex1 = cbSearchTarget.SelectedIndex;
-                lastIndex2 = cbSort.SelectedIndex;
-                lastIndex3 = cbDuration.SelectedIndex;
+                lastSearchTarget = cbSearchTarget.SelectedIndex;
+                lastSort = cbSort.SelectedIndex;
+                lastDuration = cbDuration.SelectedIndex;
                 searchProgressRing.IsActive = true;
                 searchProgressRing.Visibility = Visibility.Visible;
             }