From 200681a985aec0b02e57a83d00113d29e9bf3195 Mon Sep 17 00:00:00 2001
From: Uahh <uahh.yang@designorder.cn>
Date: Mon, 31 May 2021 21:04:37 +0800
Subject: [PATCH] v1.00

---
 App.xaml                                      |  2 +-
 Model/PushControl/PushWords.cs                |  2 +-
 README.md                                     | 41 ++++++++++++++++++-
 ToastFish.csproj                              |  8 ++--
 View/{MainWindow.xaml => ToastFish.xaml}      |  2 +-
 .../{MainWindow.xaml.cs => ToastFish.xaml.cs} |  2 +-
 .../{MainViewModel.cs => ToastFishModel.cs}   |  4 +-
 ViewModel/ViewModelLocator.cs                 |  6 +--
 8 files changed, 53 insertions(+), 14 deletions(-)
 rename View/{MainWindow.xaml => ToastFish.xaml} (96%)
 rename View/{MainWindow.xaml.cs => ToastFish.xaml.cs} (99%)
 rename ViewModel/{MainViewModel.cs => ToastFishModel.cs} (85%)

diff --git a/App.xaml b/App.xaml
index f6ecb82..b634c78 100644
--- a/App.xaml
+++ b/App.xaml
@@ -1,7 +1,7 @@
 <Application x:Class="ToastFish.App" 
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
-             StartupUri="View\MainWindow.xaml"
+             StartupUri="View\ToastFish.xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              d1p1:Ignorable="d" 
              xmlns:d1p1="http://schemas.openxmlformats.org/markup-compatibility/2006">
diff --git a/Model/PushControl/PushWords.cs b/Model/PushControl/PushWords.cs
index 00ad43f..5d9ce9d 100644
--- a/Model/PushControl/PushWords.cs
+++ b/Model/PushControl/PushWords.cs
@@ -273,7 +273,7 @@ public static void Recitation(Object Number)
                 }
                 else if (QUESTION_CURRENT_STATUS == 0)
                 {
-                    CopyList.Remove(CurrentWord);
+                    //CopyList.Remove(CurrentWord);
                     new ToastContentBuilder()
                     .AddText("错误 正确答案：" + AnswerDict[QUESTION_CURRENT_RIGHT_ANSWER.ToString()] + '.' + CurrentWord.headWord)
                     .Show();
diff --git a/README.md b/README.md
index e46a241..804165c 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,41 @@
 # ToastFish
-一个利用Windows通知栏背单词的软件。
+
+这是一个利用Windows通知栏背单词的软件。可以让你在上班、上课等恶劣环境下安全隐蔽的背单词。
+
+## 使用
+
+![选择书籍](https://github.com/Uahh/ToastFish/blob/main/Resources/select_book.gif)
+首先选择要背的单词集，
+
+![设置词数](https://github.com/Uahh/ToastFish/blob/main/Resources/set_word.gif)
+然后设置要背多少单词，
+
+![开始](https://github.com/Uahh/ToastFish/blob/main/Resources/word.gif)
+然后点击开始按钮，
+
+![测试](https://github.com/Uahh/ToastFish/blob/main/Resources/exam.gif)
+背完单词后进行测试，通过后结束。
+
+软件运行系统： Windows 10
+
+请灵活使用 Win + A 键隐蔽的使用本软件！
+
+## 下载与安装
+
+请至网盘下载
+```bash
+链接：https://pan.baidu.com/s/1WJRfUnJpt4IymO0vStmi7w 
+提取码：2173 
+```
+下载后解压，运行ToastFish.exe即可。
+
+## 编译源码
+请在cmd中运行
+```bash
+git clone https://github.com/Uahh/ToastFish
+```
+使用vs打开ToastFish.sln即可
+
+## 感谢
+
+感谢@itorr为本软件提供的支持，建议和测试！
\ No newline at end of file
diff --git a/ToastFish.csproj b/ToastFish.csproj
index d53970f..3ff850b 100644
--- a/ToastFish.csproj
+++ b/ToastFish.csproj
@@ -73,10 +73,10 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>IconChika.resx</DependentUpon>
     </Compile>
-    <Compile Include="ViewModel\MainViewModel.cs" />
+    <Compile Include="ViewModel\ToastFishModel.cs" />
     <Compile Include="ViewModel\TestViewModel.cs" />
     <Compile Include="ViewModel\ViewModelLocator.cs" />
-    <Page Include="View\MainWindow.xaml">
+    <Page Include="View\ToastFish.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -84,8 +84,8 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="View\MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
+    <Compile Include="View\ToastFish.xaml.cs">
+      <DependentUpon>ToastFish.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/View/MainWindow.xaml b/View/ToastFish.xaml
similarity index 96%
rename from View/MainWindow.xaml
rename to View/ToastFish.xaml
index 657edfe..d700990 100644
--- a/View/MainWindow.xaml
+++ b/View/ToastFish.xaml
@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:ToastFish"
         mc:Ignorable="d"
         DataContext="{Binding Source={StaticResource Locator},Path=Main}"
-        Title="MainWindow" Height="754.5" Width="409.5">
+        Title="ToastFish" Height="754.5" Width="409.5">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="634.5"></RowDefinition>
diff --git a/View/MainWindow.xaml.cs b/View/ToastFish.xaml.cs
similarity index 99%
rename from View/MainWindow.xaml.cs
rename to View/ToastFish.xaml.cs
index d465d3a..8542bf0 100644
--- a/View/MainWindow.xaml.cs
+++ b/View/ToastFish.xaml.cs
@@ -19,7 +19,7 @@ namespace ToastFish
     /// </summary>
     public partial class MainWindow : Window
     {
-        MainViewModel vm = new MainViewModel();
+        ToastFishModel vm = new ToastFishModel();
         Select se = new Select();
         public MainWindow()
         {
diff --git a/ViewModel/MainViewModel.cs b/ViewModel/ToastFishModel.cs
similarity index 85%
rename from ViewModel/MainViewModel.cs
rename to ViewModel/ToastFishModel.cs
index 82ffa22..403adb5 100644
--- a/ViewModel/MainViewModel.cs
+++ b/ViewModel/ToastFishModel.cs
@@ -9,9 +9,9 @@
 
 namespace ToastFish.ViewModel
 {
-    public class MainViewModel : ViewModelBase
+    public class ToastFishModel : ViewModelBase
     {
-        public MainViewModel()      
+        public ToastFishModel()      
         {
             Push = new RelayCommand(PushTest);
         }
diff --git a/ViewModel/ViewModelLocator.cs b/ViewModel/ViewModelLocator.cs
index c3edce6..60d91f3 100644
--- a/ViewModel/ViewModelLocator.cs
+++ b/ViewModel/ViewModelLocator.cs
@@ -29,15 +29,15 @@ public class ViewModelLocator
         public ViewModelLocator()
         {
             ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);
-            SimpleIoc.Default.Register<MainViewModel>();
+            SimpleIoc.Default.Register<ToastFishModel>();
             SimpleIoc.Default.Register<TestViewModel>();
         }
 
-        public MainViewModel Main
+        public ToastFishModel Main
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<MainViewModel>();
+                return ServiceLocator.Current.GetInstance<ToastFishModel>();
             }
         }