v1.00

Uahh · May 31, 2021 · 200681a · 200681a
1 parent 6348ee4
commit 200681a
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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为本软件提供的支持，建议和测试！
diff --git a/ToastFish.csproj b/ToastFish.csproj
@@ -73,19 +73,19 @@
       <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>
     <Compile Include="App.xaml.cs">
       <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 → View/ToastFish.xaml b/View/MainWindow.xaml → 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 → View/ToastFish.xaml.cs b/View/MainWindow.xaml.cs → 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 → ViewModel/ToastFishModel.cs b/ViewModel/MainViewModel.cs → 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
@@ -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>();
             }
         }