1、使用单独的ViewModel来绑定页面数据

JiuLing-zhang · JiuLing-zhang · commit 658f27b0e69a · 2021-07-12T17:51:16.000+08:00
2、优化页面布局
diff --git a/src/FindDuplicateFiles/Common/GlobalArgs.cs b/src/FindDuplicateFiles/Common/GlobalArgs.cs
@@ -1,4 +1,6 @@
-﻿namespace FindDuplicateFiles.Common
+﻿using FindDuplicateFiles.Model;
+
+namespace FindDuplicateFiles.Common
 {
     public class GlobalArgs
     {
diff --git a/src/FindDuplicateFiles/Extensions/ExtensionMethods.cs b/src/FindDuplicateFiles/Extensions/ExtensionMethods.cs
@@ -11,7 +11,5 @@ public static bool IsNotEmpty(this string input)
         {
             return !string.IsNullOrEmpty(input);
         }
-
-
     }
 }
diff --git a/src/FindDuplicateFiles/FindDuplicateFiles.csproj b/src/FindDuplicateFiles/FindDuplicateFiles.csproj
@@ -16,12 +16,14 @@
     <None Remove="Images\about.png" />
     <None Remove="Images\close.png" />
     <None Remove="Images\delete.png" />
+    <None Remove="Images\delete_bin.png" />
     <None Remove="Images\github.png" />
     <None Remove="Images\home_page.png" />
     <None Remove="Images\horizontal_line.png" />
     <None Remove="Images\icon.png" />
     <None Remove="Images\loader.png" />
     <None Remove="Images\maximize.png" />
+    <None Remove="Images\multiple_choice.png" />
     <None Remove="Images\package_search.png" />
     <None Remove="Images\reset.png" />
     <None Remove="Images\restore.png" />
@@ -47,6 +49,9 @@
     <Resource Include="Images\delete.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
+    <Resource Include="Images\delete_bin.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
     <Resource Include="Images\github.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
@@ -65,6 +70,9 @@
     <Resource Include="Images\maximize.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
+    <Resource Include="Images\multiple_choice.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
     <Resource Include="Images\package_search.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
@@ -88,4 +96,8 @@
     </Resource>
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Model\" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/FindDuplicateFiles/Images/delete_bin.png b/src/FindDuplicateFiles/Images/delete_bin.png
diff --git a/src/FindDuplicateFiles/Images/multiple_choice.png b/src/FindDuplicateFiles/Images/multiple_choice.png
diff --git a/src/FindDuplicateFiles/MainWindow.xaml b/src/FindDuplicateFiles/MainWindow.xaml
@@ -3,11 +3,10 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:FindDuplicateFiles" 
+        xmlns:local="clr-namespace:FindDuplicateFiles"
         mc:Ignorable="d"
         Title="重复文件查找" Height="650" Width="1000" WindowStartupLocation="CenterScreen" Icon="/Images/icon.png"
         MouseLeftButtonDown="Window_MouseLeftButtonDown">
-
     <WindowChrome.WindowChrome>
         <WindowChrome UseAeroCaptionButtons="False"  />
     </WindowChrome.WindowChrome>
@@ -78,7 +77,7 @@
                 <PropertyGroupDescription PropertyName="Key"></PropertyGroupDescription>
             </CollectionViewSource.GroupDescriptions>
         </CollectionViewSource>
-
+        <BooleanToVisibilityConverter x:Key="BoolToVisConverter" />
     </Window.Resources>
 
     <Grid Background="{DynamicResource Background}">
@@ -236,13 +235,32 @@
                     </Grid.ColumnDefinitions>
 
                     <Grid Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="0" Grid.RowSpan="2">
+
                         <Border BorderBrush="{DynamicResource BlockBorder}" BorderThickness="1">
                             <DockPanel>
-                                <StackPanel Height="0" DockPanel.Dock="Top" Name="PanelLoading" Orientation="Horizontal" Margin="5,8,5,8">
-                                    <Image Margin="0,0,5,0" Name="ImgLoading" Width="24" Height="24" Source="/Images/loader.png" HorizontalAlignment="Center" VerticalAlignment="Center" RenderTransformOrigin="0.5,0.5"></Image>
-                                    <Label Name="LblMessage" Foreground="{DynamicResource FontForeground}">准备查找....</Label>
+                                <!-- 重复文件列表功能区 -->
+                                <StackPanel Height="25" DockPanel.Dock="Top" Orientation="Horizontal" Margin="2,5,0,5">
+                                    <Button Name="BtnChooseFile" Click="BtnChooseFile_Click" ToolTip="批量选中重复文件" Style="{StaticResource ChangeButtonIsMouseOver}" Background="Transparent">
+                                        <Image Width="20" Height="20" Source="/Images/multiple_choice.png"></Image>
+                                    </Button>
+                                    <Button Name="BtnDeleteFile" Click="BtnDeleteFile_Click" ToolTip="删除选中文件" Style="{StaticResource ChangeButtonIsMouseOver}" Background="Transparent">
+                                        <Image Width="20" Height="20" Source="/Images/delete_bin.png"></Image>
+                                    </Button>
+
+                                    <!-- loading模块 -->
+                                    <StackPanel Name="Tmp" Orientation="Horizontal" Margin="10,0,0,0" Visibility="{Binding IsShowLoading, Mode=OneWay, Converter={StaticResource BoolToVisConverter}}">
+                                        <Image Name="ImgLoading" Width="20" Height="20" Source="/Images/loader.png" HorizontalAlignment="Center" VerticalAlignment="Center" RenderTransformOrigin="0.5,0.5"></Image>
+                                        <Label Name="LblMessage" Foreground="{DynamicResource FontForeground}" Margin="0,0,0,-3">准备查找....</Label>
+                                    </StackPanel>
                                 </StackPanel>
-                                <ListView Name="ListViewDuplicateFile" SelectionChanged="ListViewDuplicateFile_SelectionChanged" ItemsSource="{Binding Source={StaticResource DuplicateFiles}}" Background="{DynamicResource ListViewBackground}" BorderBrush="{DynamicResource BlockBorder}" BorderThickness="0" >
+                                <!-- 重复文件列表 -->
+                                <ListView 
+                                    Name="ListViewDuplicateFile" 
+                                    SelectionChanged="ListViewDuplicateFile_SelectionChanged" 
+                                    ItemsSource="{Binding Source={StaticResource DuplicateFiles}}" 
+                                    Background="{DynamicResource ListViewBackground}" 
+                                    BorderBrush="{DynamicResource BlockBorder}" 
+                                    BorderThickness="0" >
                                     <ListView.ItemContainerStyle>
                                         <Style TargetType="ListViewItem">
                                             <Setter Property="Foreground" Value="{DynamicResource FontForeground}"/>
@@ -260,6 +278,13 @@
                                     </ListView.ItemContainerStyle>
                                     <ListView.View>
                                         <GridView>
+                                            <GridViewColumn>
+                                                <GridViewColumn.CellTemplate>
+                                                    <DataTemplate>
+                                                        <CheckBox />
+                                                    </DataTemplate>
+                                                </GridViewColumn.CellTemplate>
+                                            </GridViewColumn>
                                             <GridViewColumn Width="230" Header="文件名" DisplayMemberBinding="{Binding Name}"></GridViewColumn>
                                             <GridViewColumn Width="150" Header="修改时间" DisplayMemberBinding="{Binding LastWriteTime, StringFormat=yyyy-MM-dd HH:mm:ss}"></GridViewColumn>
                                             <GridViewColumn Width="100" Header="大小" DisplayMemberBinding="{Binding Size}"></GridViewColumn>
@@ -294,8 +319,10 @@
                             </DockPanel>
                         </Border>
                     </Grid>
-                    <Grid Name="GridImage" Grid.Column="1" Grid.Row="1" Background="{DynamicResource FontForeground}" Visibility="Hidden" Margin="0,0,0,18">
-                        <Image Name="ImgSelected"></Image>
+                    <Grid Name="GridImage" Grid.Column="1" Grid.Row="1" Background="{DynamicResource Title}" Visibility="Hidden" Margin="0,0,18,18">
+                        <Border BorderBrush="{DynamicResource BlockBorder}" BorderThickness="1">
+                            <Image Name="ImgSelected"></Image>
+                        </Border>
                     </Grid>
                 </Grid>
             </Grid>
diff --git a/src/FindDuplicateFiles/MainWindow.xaml.cs b/src/FindDuplicateFiles/MainWindow.xaml.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using System.Windows;
@@ -13,6 +14,8 @@
 using System.Windows.Media;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
+using FindDuplicateFiles.Model;
+using FindDuplicateFiles.ViewModel;
 
 namespace FindDuplicateFiles
 {
@@ -21,21 +24,13 @@ namespace FindDuplicateFiles
     /// </summary>
     public partial class MainWindow : Window
     {
-        /// <summary>
-        /// 已选取的要搜索的文件夹
-        /// </summary>
-        public ObservableCollection<string> SearchFolders { get; set; }
         /// <summary>
         /// 是否正在进行搜索
         /// </summary>
         private bool _isSearching;
-        private readonly SearchFilesJob _searchFilesJob = new();
-
-        /// <summary>
-        /// 重复文件集合
-        /// </summary>
-        public ObservableCollection<DuplicateFileInfo> DuplicateFiles { get; set; }
 
+        private readonly SearchFilesJob _searchFilesJob = new();
+        private readonly MainWindowViewModel _myModel = new();
         public MainWindow()
         {
             InitializeComponent();
@@ -70,7 +65,7 @@ private void InitializeSearchCondition()
             ChkIgnoreSmallFile.IsChecked = false;
             RdoAllFile.IsChecked = true;
 
-            SearchFolders.Clear();
+            _myModel.SearchFolders.Clear();
         }
         private void InitializeLoadingBlock()
         {
@@ -84,20 +79,15 @@ private void InitializeLoadingBlock()
             RotateTransform rt = new RotateTransform();
             ImgLoading.RenderTransform = rt;
             rt.BeginAnimation(RotateTransform.AngleProperty, da);
-            PanelLoading.Height = 0;
-            PanelLoading.Margin = new Thickness(0, 0, 0, 0);
         }
 
         /// <summary>
         /// UI数据绑定
         /// </summary>
         private void BindingItemsSource()
         {
-            SearchFolders = new ObservableCollection<string>();
-            ListBoxSearchFolders.ItemsSource = SearchFolders;
-
-            DuplicateFiles = new ObservableCollection<DuplicateFileInfo>();
-            ListViewDuplicateFile.ItemsSource = DuplicateFiles;
+            ListBoxSearchFolders.ItemsSource = _myModel.SearchFolders;
+            ListViewDuplicateFile.ItemsSource = _myModel.DuplicateFiles;
 
             CollectionView view = (CollectionView)CollectionViewSource.GetDefaultView(ListViewDuplicateFile.ItemsSource);
             PropertyGroupDescription groupDescription = new PropertyGroupDescription("Key");
@@ -106,6 +96,7 @@ private void BindingItemsSource()
             RdoOnlyImageFile.ToolTip = $"仅支持：{GlobalArgs.AppConfig.ImageExtension}文件";
             RdoOnlyMediaFile.ToolTip = $"仅支持：{GlobalArgs.AppConfig.MediaExtension}文件";
             RdoOnlyDocumentFile.ToolTip = $"仅支持：{GlobalArgs.AppConfig.DocumentExtension}文件";
+            DataContext = _myModel;
         }
 
         /// <summary>
@@ -136,7 +127,7 @@ private void Window_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
             if (GridImage.Visibility == Visibility)
             {
                 ImgSelected.Source = null;
-                GridImage.Visibility = Visibility.Hidden;
+                GridImage.Visibility = Visibility.Collapsed;
             }
         }
 
@@ -174,12 +165,11 @@ private void BtnAddSearchFolder_Click(object sender, RoutedEventArgs e)
                 return;
             }
 
-            if (SearchFolders.Contains(path))
+            if (_myModel.SearchFolders.Contains(path))
             {
                 return;
             }
-
-            SearchFolders.Add(path);
+            _myModel.SearchFolders.Add(path);
         }
 
         private void BtnRemoveSearchFolder_Click(object sender, RoutedEventArgs e)
@@ -190,7 +180,7 @@ private void BtnRemoveSearchFolder_Click(object sender, RoutedEventArgs e)
                 return;
             }
 
-            SearchFolders.Remove(tag.ToString());
+            _myModel.SearchFolders.Remove(tag.ToString());
         }
 
         private void BtnSearch_Click(object sender, RoutedEventArgs e)
@@ -211,7 +201,7 @@ private void BtnSearch_Click(object sender, RoutedEventArgs e)
 
         private void BeginSearch()
         {
-            if (SearchFolders.Count == 0)
+            if (_myModel.SearchFolders.Count == 0)
             {
                 MessageBox.Show("请选择要查找的文件夹", "重复文件查找", MessageBoxButton.OK, MessageBoxImage.Stop);
                 return;
@@ -265,10 +255,10 @@ private void BeginSearch()
             }
 
             SetBeginSearchStyle();
-            DuplicateFiles.Clear();
+            _myModel.DuplicateFiles.Clear();
             var config = new SearchConfigs()
             {
-                Folders = new List<string>(SearchFolders.ToList()),
+                Folders = new List<string>(_myModel.SearchFolders.ToList()),
                 SearchMatch = searchMatch,
                 SearchOption = searchOption
             };
@@ -280,11 +270,10 @@ private void BeginSearch()
         /// </summary>
         private void SetBeginSearchStyle()
         {
-            PanelLoading.Height = 25;
-            PanelLoading.Margin = new Thickness(5, 8, 5, 8);
             TxtSearch.Text = "停止";
             ImgSearch.Source = new BitmapImage(new Uri("pack://application:,,,/Images/stop.png"));
             _isSearching = true;
+            _myModel.IsShowLoading = _isSearching;
         }
 
         private void EndSearch()
@@ -298,11 +287,10 @@ private void EndSearch()
         /// </summary>
         private void SetEndSearchStyle()
         {
-            PanelLoading.Height = 0;
-            PanelLoading.Margin = new Thickness(0, 0, 0, 0);
             TxtSearch.Text = "开始";
             ImgSearch.Source = new BitmapImage(new Uri("pack://application:,,,/Images/search.png"));
             _isSearching = false;
+            _myModel.IsShowLoading = _isSearching;
         }
 
         private void BtnReset_Click(object sender, RoutedEventArgs e)
@@ -354,7 +342,7 @@ private void DuplicateFilesFound(string key, SimpleFileInfo simpleFile)
         {
             Application.Current.Dispatcher.Invoke(() =>
             {
-                DuplicateFiles.Add(new DuplicateFileInfo()
+                _myModel.DuplicateFiles.Add(new DuplicateFileInfo()
                 {
                     Key = key,
                     Name = simpleFile.Name,
@@ -397,5 +385,15 @@ private void BtnAbout_Click(object sender, RoutedEventArgs e)
             };
             about.Show();
         }
+
+        private void BtnChooseFile_Click(object sender, RoutedEventArgs e)
+        {
+            MessageBox.Show("抱歉，该功能暂不可用", "重复文件查找", MessageBoxButton.OK, MessageBoxImage.Information);
+        }
+
+        private void BtnDeleteFile_Click(object sender, RoutedEventArgs e)
+        {
+            MessageBox.Show("抱歉，该功能暂不可用", "重复文件查找", MessageBoxButton.OK, MessageBoxImage.Information);
+        }
     }
 }
diff --git a/src/FindDuplicateFiles/Model/AppConfigInfo.cs b/src/FindDuplicateFiles/Model/AppConfigInfo.cs
@@ -1,4 +1,4 @@
-﻿namespace FindDuplicateFiles.Common
+﻿namespace FindDuplicateFiles.Model
 {
     public class AppConfigInfo
     {
diff --git a/src/FindDuplicateFiles/Model/DuplicateFileInfo.cs b/src/FindDuplicateFiles/Model/DuplicateFileInfo.cs
@@ -1,4 +1,6 @@
-﻿namespace FindDuplicateFiles.SearchFile
+﻿using FindDuplicateFiles.SearchFile;
+
+namespace FindDuplicateFiles.Model
 {
     public class DuplicateFileInfo : SimpleFileInfo
     {
diff --git a/src/FindDuplicateFiles/Model/SearchConfigs.cs b/src/FindDuplicateFiles/Model/SearchConfigs.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 
-namespace FindDuplicateFiles.Common
+namespace FindDuplicateFiles.Model
 {
     public class SearchConfigs
     {
diff --git a/src/FindDuplicateFiles/Model/SimpleFileInfo.cs b/src/FindDuplicateFiles/Model/SimpleFileInfo.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace FindDuplicateFiles.SearchFile
+namespace FindDuplicateFiles.Model
 {
     public class SimpleFileInfo
     {
diff --git a/src/FindDuplicateFiles/SearchFile/CheckDuplicateQueue.cs b/src/FindDuplicateFiles/SearchFile/CheckDuplicateQueue.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using FindDuplicateFiles.Model;
 
 namespace FindDuplicateFiles.SearchFile
 {
diff --git a/src/FindDuplicateFiles/SearchFile/SearchFilesJob.cs b/src/FindDuplicateFiles/SearchFile/SearchFilesJob.cs
@@ -5,6 +5,7 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using FindDuplicateFiles.Model;
 
 namespace FindDuplicateFiles.SearchFile
 {
@@ -75,8 +76,6 @@ private void EachDirectory(string folderPath, Action<List<string>> callbackFileP
                 });
 
                 callbackFilePaths.Invoke(Directory.GetFiles(folderPath).ToList());
-
-
             }
             catch (UnauthorizedAccessException)
             {
diff --git a/src/FindDuplicateFiles/ViewModel/MainWindowViewModel.cs b/src/FindDuplicateFiles/ViewModel/MainWindowViewModel.cs
diff --git a/src/FindDuplicateFiles/ViewModel/ViewModelBase.cs b/src/FindDuplicateFiles/ViewModel/ViewModelBase.cs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-namespace FindDuplicateFiles.Common`
	`1`	`+using FindDuplicateFiles.Model;`
	`2`	`+`
	`3`	`+namespace FindDuplicateFiles.Common`
`2`	`4`	`{`
`3`	`5`	`public class GlobalArgs`
`4`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,5 @@ public static bool IsNotEmpty(this string input)`
`11`	`11`	`{`
`12`	`12`	`return !string.IsNullOrEmpty(input);`
`13`	`13`	`}`
`14`		`-`
`15`		`-`
`16`	`14`	`}`
`17`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using System;`
`5`	`5`	`using System.Collections.Generic;`
`6`	`6`	`using System.Collections.ObjectModel;`
	`7`	`+using System.ComponentModel;`
`7`	`8`	`using System.IO;`
`8`	`9`	`using System.Linq;`
`9`	`10`	`using System.Windows;`
`@@ -13,6 +14,8 @@`
`13`	`14`	`using System.Windows.Media;`
`14`	`15`	`using System.Windows.Media.Animation;`
`15`	`16`	`using System.Windows.Media.Imaging;`
	`17`	`+using FindDuplicateFiles.Model;`
	`18`	`+using FindDuplicateFiles.ViewModel;`
`16`	`19`
`17`	`20`	`namespace FindDuplicateFiles`
`18`	`21`	`{`
`@@ -21,21 +24,13 @@ namespace FindDuplicateFiles`
`21`	`24`	`/// </summary>`
`22`	`25`	`public partial class MainWindow : Window`
`23`	`26`	`{`
`24`		`- /// <summary>`
`25`		`- /// 已选取的要搜索的文件夹`
`26`		`- /// </summary>`
`27`		`- public ObservableCollection<string> SearchFolders { get; set; }`
`28`	`27`	`/// <summary>`
`29`	`28`	`/// 是否正在进行搜索`
`30`	`29`	`/// </summary>`
`31`	`30`	`private bool _isSearching;`
`32`		`- private readonly SearchFilesJob _searchFilesJob = new();`
`33`		`-`
`34`		`- /// <summary>`
`35`		`- /// 重复文件集合`
`36`		`- /// </summary>`
`37`		`- public ObservableCollection<DuplicateFileInfo> DuplicateFiles { get; set; }`
`38`	`31`
	`32`	`+ private readonly SearchFilesJob _searchFilesJob = new();`
	`33`	`+ private readonly MainWindowViewModel _myModel = new();`
`39`	`34`	`public MainWindow()`
`40`	`35`	`{`
`41`	`36`	`InitializeComponent();`
`@@ -70,7 +65,7 @@ private void InitializeSearchCondition()`
`70`	`65`	`ChkIgnoreSmallFile.IsChecked = false;`
`71`	`66`	`RdoAllFile.IsChecked = true;`
`72`	`67`
`73`		`- SearchFolders.Clear();`
	`68`	`+ _myModel.SearchFolders.Clear();`
`74`	`69`	`}`
`75`	`70`	`private void InitializeLoadingBlock()`
`76`	`71`	`{`
`@@ -84,20 +79,15 @@ private void InitializeLoadingBlock()`
`84`	`79`	`RotateTransform rt = new RotateTransform();`
`85`	`80`	`ImgLoading.RenderTransform = rt;`
`86`	`81`	`rt.BeginAnimation(RotateTransform.AngleProperty, da);`
`87`		`- PanelLoading.Height = 0;`
`88`		`- PanelLoading.Margin = new Thickness(0, 0, 0, 0);`
`89`	`82`	`}`
`90`	`83`
`91`	`84`	`/// <summary>`
`92`	`85`	`/// UI数据绑定`
`93`	`86`	`/// </summary>`
`94`	`87`	`private void BindingItemsSource()`
`95`	`88`	`{`
`96`		`- SearchFolders = new ObservableCollection<string>();`
`97`		`- ListBoxSearchFolders.ItemsSource = SearchFolders;`
`98`		`-`
`99`		`- DuplicateFiles = new ObservableCollection<DuplicateFileInfo>();`
`100`		`- ListViewDuplicateFile.ItemsSource = DuplicateFiles;`
	`89`	`+ ListBoxSearchFolders.ItemsSource = _myModel.SearchFolders;`
	`90`	`+ ListViewDuplicateFile.ItemsSource = _myModel.DuplicateFiles;`
`101`	`91`
`102`	`92`	`CollectionView view = (CollectionView)CollectionViewSource.GetDefaultView(ListViewDuplicateFile.ItemsSource);`
`103`	`93`	`PropertyGroupDescription groupDescription = new PropertyGroupDescription("Key");`
`@@ -106,6 +96,7 @@ private void BindingItemsSource()`
`106`	`96`	`RdoOnlyImageFile.ToolTip = $"仅支持：{GlobalArgs.AppConfig.ImageExtension}文件";`
`107`	`97`	`RdoOnlyMediaFile.ToolTip = $"仅支持：{GlobalArgs.AppConfig.MediaExtension}文件";`
`108`	`98`	`RdoOnlyDocumentFile.ToolTip = $"仅支持：{GlobalArgs.AppConfig.DocumentExtension}文件";`
	`99`	`+ DataContext = _myModel;`
`109`	`100`	`}`
`110`	`101`
`111`	`102`	`/// <summary>`
`@@ -136,7 +127,7 @@ private void Window_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)`
`136`	`127`	`if (GridImage.Visibility == Visibility)`
`137`	`128`	`{`
`138`	`129`	`ImgSelected.Source = null;`
`139`		`- GridImage.Visibility = Visibility.Hidden;`
	`130`	`+ GridImage.Visibility = Visibility.Collapsed;`
`140`	`131`	`}`
`141`	`132`	`}`
`142`	`133`
`@@ -174,12 +165,11 @@ private void BtnAddSearchFolder_Click(object sender, RoutedEventArgs e)`
`174`	`165`	`return;`
`175`	`166`	`}`
`176`	`167`
`177`		`- if (SearchFolders.Contains(path))`
	`168`	`+ if (_myModel.SearchFolders.Contains(path))`
`178`	`169`	`{`
`179`	`170`	`return;`
`180`	`171`	`}`
`181`		`-`
`182`		`- SearchFolders.Add(path);`
	`172`	`+ _myModel.SearchFolders.Add(path);`
`183`	`173`	`}`
`184`	`174`
`185`	`175`	`private void BtnRemoveSearchFolder_Click(object sender, RoutedEventArgs e)`
`@@ -190,7 +180,7 @@ private void BtnRemoveSearchFolder_Click(object sender, RoutedEventArgs e)`
`190`	`180`	`return;`
`191`	`181`	`}`
`192`	`182`
`193`		`- SearchFolders.Remove(tag.ToString());`
	`183`	`+ _myModel.SearchFolders.Remove(tag.ToString());`
`194`	`184`	`}`
`195`	`185`
`196`	`186`	`private void BtnSearch_Click(object sender, RoutedEventArgs e)`
`@@ -211,7 +201,7 @@ private void BtnSearch_Click(object sender, RoutedEventArgs e)`
`211`	`201`
`212`	`202`	`private void BeginSearch()`
`213`	`203`	`{`
`214`		`- if (SearchFolders.Count == 0)`
	`204`	`+ if (_myModel.SearchFolders.Count == 0)`
`215`	`205`	`{`
`216`	`206`	`MessageBox.Show("请选择要查找的文件夹", "重复文件查找", MessageBoxButton.OK, MessageBoxImage.Stop);`
`217`	`207`	`return;`
`@@ -265,10 +255,10 @@ private void BeginSearch()`
`265`	`255`	`}`
`266`	`256`
`267`	`257`	`SetBeginSearchStyle();`
`268`		`- DuplicateFiles.Clear();`
	`258`	`+ _myModel.DuplicateFiles.Clear();`
`269`	`259`	`var config = new SearchConfigs()`
`270`	`260`	`{`
`271`		`- Folders = new List<string>(SearchFolders.ToList()),`
	`261`	`+ Folders = new List<string>(_myModel.SearchFolders.ToList()),`
`272`	`262`	`SearchMatch = searchMatch,`
`273`	`263`	`SearchOption = searchOption`
`274`	`264`	`};`
`@@ -280,11 +270,10 @@ private void BeginSearch()`
`280`	`270`	`/// </summary>`
`281`	`271`	`private void SetBeginSearchStyle()`
`282`	`272`	`{`
`283`		`- PanelLoading.Height = 25;`
`284`		`- PanelLoading.Margin = new Thickness(5, 8, 5, 8);`
`285`	`273`	`TxtSearch.Text = "停止";`
`286`	`274`	`ImgSearch.Source = new BitmapImage(new Uri("pack://application:,,,/Images/stop.png"));`
`287`	`275`	`_isSearching = true;`
	`276`	`+ _myModel.IsShowLoading = _isSearching;`
`288`	`277`	`}`
`289`	`278`
`290`	`279`	`private void EndSearch()`
`@@ -298,11 +287,10 @@ private void EndSearch()`
`298`	`287`	`/// </summary>`
`299`	`288`	`private void SetEndSearchStyle()`
`300`	`289`	`{`
`301`		`- PanelLoading.Height = 0;`
`302`		`- PanelLoading.Margin = new Thickness(0, 0, 0, 0);`
`303`	`290`	`TxtSearch.Text = "开始";`
`304`	`291`	`ImgSearch.Source = new BitmapImage(new Uri("pack://application:,,,/Images/search.png"));`
`305`	`292`	`_isSearching = false;`
	`293`	`+ _myModel.IsShowLoading = _isSearching;`
`306`	`294`	`}`
`307`	`295`
`308`	`296`	`private void BtnReset_Click(object sender, RoutedEventArgs e)`
`@@ -354,7 +342,7 @@ private void DuplicateFilesFound(string key, SimpleFileInfo simpleFile)`
`354`	`342`	`{`
`355`	`343`	`Application.Current.Dispatcher.Invoke(() =>`
`356`	`344`	`{`
`357`		`- DuplicateFiles.Add(new DuplicateFileInfo()`
	`345`	`+ _myModel.DuplicateFiles.Add(new DuplicateFileInfo()`
`358`	`346`	`{`
`359`	`347`	`Key = key,`
`360`	`348`	`Name = simpleFile.Name,`
`@@ -397,5 +385,15 @@ private void BtnAbout_Click(object sender, RoutedEventArgs e)`
`397`	`385`	`};`
`398`	`386`	`about.Show();`
`399`	`387`	`}`
	`388`	`+`
	`389`	`+ private void BtnChooseFile_Click(object sender, RoutedEventArgs e)`
	`390`	`+ {`
	`391`	`+ MessageBox.Show("抱歉，该功能暂不可用", "重复文件查找", MessageBoxButton.OK, MessageBoxImage.Information);`
	`392`	`+ }`
	`393`	`+`
	`394`	`+ private void BtnDeleteFile_Click(object sender, RoutedEventArgs e)`
	`395`	`+ {`
	`396`	`+ MessageBox.Show("抱歉，该功能暂不可用", "重复文件查找", MessageBoxButton.OK, MessageBoxImage.Information);`
	`397`	`+ }`
`400`	`398`	`}`
`401`	`399`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace FindDuplicateFiles.Common`
	`1`	`+namespace FindDuplicateFiles.Model`
`2`	`2`	`{`
`3`	`3`	`public class AppConfigInfo`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-namespace FindDuplicateFiles.SearchFile`
	`1`	`+using FindDuplicateFiles.SearchFile;`
	`2`	`+`
	`3`	`+namespace FindDuplicateFiles.Model`
`2`	`4`	`{`
`3`	`5`	`public class DuplicateFileInfo : SimpleFileInfo`
`4`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`
`4`		`-namespace FindDuplicateFiles.Common`
	`4`	`+namespace FindDuplicateFiles.Model`
`5`	`5`	`{`
`6`	`6`	`public class SearchConfigs`
`7`	`7`	`{`