v2.1

Uahh · Jul 1, 2021 · 213ea0d · 213ea0d
1 parent fc95c85
commit 213ea0d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/Model/PushControl/PushJpWords.cs b/Model/PushControl/PushJpWords.cs
@@ -188,13 +188,12 @@ public static void PushOneTransQuestion(JpWord CurrentWord, string B, string C)
             PushMessage("背完了！接下来开始测验！");
             Thread.Sleep(3000);
 
-            /* 背诵结束 */
 
-            while (CopyList.Count != 0)
+            while (RandomList.Count != 0)
             {
                 ToastNotificationManagerCompat.History.Clear();
                 Thread.Sleep(500);
-                CurrentWord = GetRandomWord(CopyList);
+                CurrentWord = GetRandomWord(RandomList);
                 List<JpWord> FakeWordList = Query.GetRandomJpWords(2);
 
                 PushOneTransQuestion(CurrentWord, FakeWordList[0].headWord, FakeWordList[1].headWord);
@@ -213,7 +212,7 @@ public static void PushOneTransQuestion(JpWord CurrentWord, string B, string C)
 
                 if (QUESTION_CURRENT_STATUS == 1)
                 {
-                    CopyList.Remove(CurrentWord);
+                    RandomList.Remove(CurrentWord);
                     Thread.Sleep(500);
                 }
                 else if (QUESTION_CURRENT_STATUS == 0)

diff --git a/View/ToastFish.xaml b/View/ToastFish.xaml
@@ -6,12 +6,13 @@
         xmlns:local="clr-namespace:ToastFish"
         mc:Ignorable="d"
         DataContext="{Binding Source={StaticResource Locator},Path=Main}"
-        Title="ToastFish v1.4" Height="210" Width="500">
+        Title="ToastFish v2.1" Height="170" Width="400">
     <Grid>
-        <TextBlock Text="BUG反馈，和软件更新群：560844819" Height="30" FontSize="22" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,30,0,0" />
-        <TextBlock Text="也可以去Github上提issuse，提出意见建议。" Height="30" FontSize="22" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,60,0,0" />
-        <TextBlock Text="https://github.com/Uahh/ToastFish" Height="30" FontSize="20" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,90,0,0" />
-        <TextBlock Text="如果能点个星星那真是感激不尽。" Height="30" FontSize="20" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,120,0,0" />
+        <TextBox Text="BUG反馈，和软件更新群：560844819" Height="20" FontSize="14" BorderThickness="0"  VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,20,0,0" IsReadOnly="True" />
+        <TextBox Text="也可以去Github上提issuse，提出意见建议。" Height="20" FontSize="14" BorderThickness="0" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,40,0,0" IsReadOnly="True"/>
+        <TextBox Text="https://github.com/Uahh/ToastFish" Height="20" FontSize="14" BorderThickness="0" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,60,0,0" IsReadOnly="True"/>
+        <TextBox Text="如果能点个星星那真是感激不尽。" Height="20" FontSize="14" BorderThickness="0" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,80,0,0" IsReadOnly="True" />
+        <TextBox Text="软件更新请去官网：https://lab.magiconch.com/toast-fish" BorderThickness="0" Height="20" FontSize="14" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,100,0,0" IsReadOnly="True" />
         <!--<Button Command="{Binding Push}" Content="Push"/>-->
     </Grid>
 </Window>
diff --git a/View/ToastFish.xaml.cs b/View/ToastFish.xaml.cs
@@ -350,7 +350,7 @@ private void RandomWordTest_Click(object sender, EventArgs e)
                     Thread.Sleep(100);
                 }
             }
-            if (Select.TABLE_NAME == "StdJp_Mid")
+            if (Select.TABLE_NAME == "StdJp_Mid" || Select.TABLE_NAME == "Goin")
                 Select.TABLE_NAME = "CET4_1";
             thread = new Thread(new ParameterizedThreadStart(PushWords.UnorderWord));
             thread.Start(Select.WORD_NUMBER);