From 1f656d8e1d27510e656bcdb221c08adc418cb083 Mon Sep 17 00:00:00 2001
From: frg2089 <frg2089@qq.com>
Date: Sun, 6 Oct 2019 18:42:52 +0800
Subject: [PATCH] *

---
 PixivFSUWP/MainPage.xaml.cs   |  1 -
 PixivFSUWP/SearchPage.xaml.cs | 43 ++++++++---------------------------
 2 files changed, 9 insertions(+), 35 deletions(-)

diff --git a/PixivFSUWP/MainPage.xaml.cs b/PixivFSUWP/MainPage.xaml.cs
index a969c17..54ac0bc 100644
--- a/PixivFSUWP/MainPage.xaml.cs
+++ b/PixivFSUWP/MainPage.xaml.cs
@@ -228,6 +228,5 @@ private void NavControl_BackRequested(NavigationView sender, NavigationViewBackR
                 UpdateNavButtonState();
             }
         }
-
     }
 }
diff --git a/PixivFSUWP/SearchPage.xaml.cs b/PixivFSUWP/SearchPage.xaml.cs
index 765c99a..90ff229 100644
--- a/PixivFSUWP/SearchPage.xaml.cs
+++ b/PixivFSUWP/SearchPage.xaml.cs
@@ -195,30 +195,29 @@ private async void btnSauceNAO_Click(object sender, RoutedEventArgs e)
         {
             Frame.Navigate(typeof(SauceNAOPage));
             Windows.Storage.ApplicationDataContainer localSettings = Windows.Storage.ApplicationData.Current.LocalSettings;
-            string SAUCENAO_API_KEY = localSettings.Values["SauceNAOAPI"] as string;//读取设置项
-            string IMGUR_API_KEY = localSettings.Values["ImgurAPI"] as string;
-            if (SAUCENAO_API_KEY == null)
+            //读取设置项
+            if (localSettings.Values["SauceNAOAPI"] as string == null)
             {
                 // "未设置SauceNAO API"
                 Frame.Navigate(typeof(SettingsPage));
                 return;
                 // SAUCENAO_API_KEY = "默认API";
             }
-            else if (SAUCENAO_API_KEY.Length == 0)
+            else if ((localSettings.Values["SauceNAOAPI"] as string).Length == 0)
             {
                 // "未设置SauceNAO API"
                 Frame.Navigate(typeof(SettingsPage));
                 return;
                 // SAUCENAO_API_KEY = "默认API";
             }
-            if (IMGUR_API_KEY == null)
+            if (localSettings.Values["ImgurAPI"] as string == null)
             {
                 // "未设置Imger API"
                 Frame.Navigate(typeof(SettingsPage));
                 return;
                 // IMGUR_API_KEY = "默认API";
             }
-            else if (IMGUR_API_KEY.Length == 0)
+            else if ((localSettings.Values["ImgurAPI"] as string).Length == 0)
             {
                 // "未设置Imger API"
                 Frame.Navigate(typeof(SettingsPage));
@@ -237,13 +236,12 @@ private async void btnSauceNAO_Click(object sender, RoutedEventArgs e)
                 Frame.GoBack();
                 return;
             }
-            byte[] IMAGE_PATH = await StorageFileExt.AsByteArray(file);
 
-            Action<byte[]> action = IMAGE_BYTES =>
+            Action<byte[]> action = imageBytes =>
             {
                 Console.WriteLine("==== 以图搜源 ====");
-                string image = Imgur.Upload(IMAGE_BYTES, IMGUR_API_KEY);
-                List<Result> results = new SauceNao.SauceNao(SAUCENAO_API_KEY).Request(image, null);
+                string image = Imgur.Upload(imageBytes, localSettings.Values["ImgurAPI"] as string);
+                List<Result> results = new SauceNao.SauceNao(localSettings.Values["SauceNAOAPI"] as string).Request(image, null);
                 // 这里是调试输出查询结果的内容..
                 //results.RemoveAll(result => !result.HasRecognizableSauce());
                 //foreach (Result result in results)
@@ -253,29 +251,11 @@ private async void btnSauceNAO_Click(object sender, RoutedEventArgs e)
                 System.Diagnostics.Debug.WriteLine("Pixiv ID = " + results[0].Response.SauceId.ToString());
                 Frame.Navigate(typeof(IllustDetailPage), results[0].Response.SauceId);
             };
-            action.Invoke(IMAGE_PATH);
+            action.Invoke(await StorageFileExt.AsByteArray(file));
         }
-        /*
-        private void BtnGoTo_Click(object sender, RoutedEventArgs e)
-        {
-            Frame.Navigate(typeof(GoToPIDPage));
-        }//*/
-
-        private void tbPID_TextChanged(object sender, TextChangedEventArgs e)
-        {
-            var textbox = (TextBox)sender;
-            if (!System.Text.RegularExpressions.Regex.IsMatch(textbox.Text, "^\\d*\\.?\\d*$") && textbox.Text != "")
-            {
-                int pos = textbox.SelectionStart - 1;
-                textbox.Text = textbox.Text.Remove(pos, 1);
-                textbox.SelectionStart = pos;
-            }
-        }
-
         private void GoPixivID_QuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args)
         {
             Frame.Navigate(typeof(IllustDetailPage), Convert.ToInt32(asbGTPID.Text));
-
         }
 
         private void asbGTPID_TextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args)
@@ -283,11 +263,6 @@ private void asbGTPID_TextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChang
             if (!System.Text.RegularExpressions.Regex.IsMatch(asbGTPID.Text, "^\\d*\\.?\\d*$") && asbGTPID.Text != "")
             {
                 asbGTPID.Text = asbGTPID.Text.Substring(0, asbGTPID.Text.Length - 1);
-                /*
-                int pos = textbox.SelectionStart - 1;
-                textbox.Text = textbox.Text.Remove(pos, 1);
-                textbox.SelectionStart = pos;
-                //*/
             }
         }
     }