admin/GeekDesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化代码

Browse Source
This commit is contained in:
liufei
2022-01-10 17:27:12 +08:00
parent dd17bbc2b3
commit 9ca443acf6
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Control/Windows/SystemItemWindow.xaml.cs
View File

@@ -29,9 +29,9 @@ namespace GeekDesk.Control.Windows
{ {
private static AppConfig appConfig = MainWindow.appData.AppConfig; private static AppConfig appConfig = MainWindow.appData.AppConfig;
private static SystemItemViewModel vm; private static SystemItemViewModel vm;
private static List<IconInfo> systemIcons; private List<IconInfo> systemIcons;
private static List<IconInfo> startMenuIcons; private List<IconInfo> startMenuIcons;
private static List<IconInfo> storeIcons; private List<IconInfo> storeIcons;
private SystemItemWindow() private SystemItemWindow()
{ {
@@ -150,13 +150,24 @@ namespace GeekDesk.Control.Windows
/// </summary> /// </summary>
/// <param name="path"></param> /// <param name="path"></param>
/// <param name="listInfos"></param> /// <param name="listInfos"></param>
private void GetInfos(string path, List<IconInfo> listInfos) private void GetInfos(string filePath, List<IconInfo> listInfos)
{ {
DirectoryInfo di = new DirectoryInfo(path); DirectoryInfo di = new DirectoryInfo(filePath);
FileSystemInfo[] fileInfoArr = di.GetFileSystemInfos(); string[] filePaths = Directory.GetFiles(filePath);
foreach(FileSystemInfo fi in fileInfoArr) string[] dirPaths = Directory.GetDirectories(filePath);
string[] paths = new string[filePaths.Length + dirPaths.Length];
filePaths.CopyTo(paths, 0);
if (filePaths == null || filePaths.Length == 0)
{
dirPaths.CopyTo(paths, 0);
} else
{
dirPaths.CopyTo(paths, filePaths.Length - 1);
}
foreach (string path in paths)
{ {
path = fi.FullName;
if (File.Exists(path)) if (File.Exists(path))
{ {
string ext = Path.GetExtension(path).ToLower(); string ext = Path.GetExtension(path).ToLower();
@@ -179,6 +190,13 @@ namespace GeekDesk.Control.Windows
GetInfos(path, listInfos); GetInfos(path, listInfos);
} }
} }
//FileSystemInfo[] fileInfoArr = di.GetFileSystemInfos();
//foreach(FileSystemInfo fi in fileInfoArr)
//{
// string path = fi.FullName;
//}
} }
/// <summary> /// <summary>