From 7f585dd09574c43e75ca9a2ceb0eec5a27c28c5b Mon Sep 17 00:00:00 2001 From: liufei Date: Wed, 22 Dec 2021 18:01:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E7=A3=81?= =?UTF-8?q?=E7=9B=98=E5=9B=BE=E6=A0=87=20=E5=8F=8A=20=E5=BF=AB=E6=8D=B7?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Constant/Constants.cs | 3 +++ .../PannelCard/RightCardControl.xaml.cs | 5 +++-- GeekDesk.csproj | 1 + Util/ImageUtil.cs | 13 +++++++++++-- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Constant/Constants.cs b/Constant/Constants.cs index f344463..db79b24 100644 --- a/Constant/Constants.cs +++ b/Constant/Constants.cs @@ -24,6 +24,9 @@ namespace GeekDesk.Constant public static string ERROR_FILE_PATH = APP_DIR + "Error.log"; + //默认磁盘图标 + public static string DEFAULT_DISK_IMAGE_BASE64 = "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"; + //默认文件夹图标 public static string DEFAULT_DIR_IMAGE_BASE64 = "iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAASISURBVHhe7dvPi9R1HMfx/Qu6RYfqEp1CZ8Yko0MQRNEPgnQ36FJEFyPoF/0DHbx06dSlnVkF6SgEgocOYUEG0cFWpQ476yhbQfTDslJxk+k79S1IP/NSF3f2O+7jBY/TKgvz/j5nXMUZMzMzMzMzMzMzMzMzMzMzu959023dsbSw9YGlbuchyk7v3XbP0t5tt9Yvmd3MW3r//luWu623TvbahytDrtvBQa/9xvJ85776JbWbZf359s7quCcKR2cNqjeaQ/35zgv1y2vTvOqgOy4/MDdG9abzwWC+06lfapu2jf4cXTosN9SZ5W7n9folt2nZ6Ifw6niDy47JelloH6hfepuGLffa7xQPyfpZaL9Xv/zW5K307r27eEDWXfXG9GJ9BmvqqneyV0rHYzL63a3b61NYEzfodT4rHY4J8UetZq/6mF8pHo6J8SnS4JUOxqS19tTnsKatfDAm7Hh9DmvaCsdiAwx6rcfqk1iTVjoWkzfotd+uT2JNWulYTN5yr/VFfRJr0krHYoN0t7Tqs1hTVjwUG6L6OeS1+izWlJUOxYb5xb+JNGyFI7Gxfqp+YN83+h+drK/+wtbH+3u33FmnUF7hQLCpLPfaSycX2u/WSfx/pd8Am1H1yf3d6FOlTuOflX4hbGrd1vN1HgKBou6W2wQC4+0XCASnuu1dAoGxWnsEAmMMeq1DAoExRn/tKxAIBALBmgMZ7Nsx/Pbgc9B4J3udK57fa7WmQEbf1GyatnLg6eKzfDVrCuTcypH625pNx37rHyo+y1ezpkAufL9Yf1uz6dgfpz8uPstXIxDbFBOIWZhAzMIEYhYmELMwgZiFCcQsTCBmYQIxCxOIWZhAzMIEYhYmELMwgZiFrTmQ0/u3D89+8tjw/OdPXbPVr18eXlp6E6bG6le7i8/yOL8efnR4at+24czvR54Y/nl8DrjM6INjpvQFYG548ehOgcA4AoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCC4e3XVJIDBG9QmyKhAY4+Li7HmBwBirx2bPCgTGOTH3g0BgHIFAIBAI6kDOXPEFoDLbn7l0bG53+YuwyS3OPTsz2oVjs3etLs49OM65T5/c9fNHj7z044cPvwrTbvQsj57p0rP+r3NfPnP733GYmZmZmZmZmZmZmZmZmZnZf5uZ+QsdP8v10G4AYgAAAABJRU5ErkJggg=="; diff --git a/Control/UserControls/PannelCard/RightCardControl.xaml.cs b/Control/UserControls/PannelCard/RightCardControl.xaml.cs index ff785e6..1609127 100644 --- a/Control/UserControls/PannelCard/RightCardControl.xaml.cs +++ b/Control/UserControls/PannelCard/RightCardControl.xaml.cs @@ -212,8 +212,9 @@ namespace GeekDesk.Control.UserControls.PannelCard foreach (object obj in dropObject) { string path = (string)obj; + string tempPath = path; - //string base64 = ImageUtil.FileImageToBase64(path, ImageFormat.Png); + //string base64 = ImageUtil.FileImageToBase64(path, System.Drawing.Imaging.ImageFormat.Png); string ext = ""; if (!ImageUtil.IsSystemItem(path)) { @@ -236,7 +237,7 @@ namespace GeekDesk.Control.UserControls.PannelCard BitmapImage = bi }; iconInfo.DefaultImage = iconInfo.ImageByteArr; - iconInfo.Name = System.IO.Path.GetFileNameWithoutExtension(path); + iconInfo.Name = System.IO.Path.GetFileNameWithoutExtension(tempPath); if (StringUtil.IsEmpty(iconInfo.Name)) { iconInfo.Name = path; diff --git a/GeekDesk.csproj b/GeekDesk.csproj index 21987d3..653c091 100644 --- a/GeekDesk.csproj +++ b/GeekDesk.csproj @@ -27,6 +27,7 @@ 4 true false + Auto AnyCPU diff --git a/Util/ImageUtil.cs b/Util/ImageUtil.cs index 40cca2c..968b43a 100644 --- a/Util/ImageUtil.cs +++ b/Util/ImageUtil.cs @@ -96,8 +96,17 @@ namespace GeekDesk.Util return FileIcon.GetBitmapImage(filePath); } } else if(Directory.Exists(filePath)) { - //文件夹 - return ImageUtil.Base64ToBitmapImage(Constants.DEFAULT_DIR_IMAGE_BASE64); + + if ((filePath.IndexOf("\\") == filePath.LastIndexOf("\\")) && filePath.IndexOf("\\") == filePath.Length - 1) + { + //磁盘 + return ImageUtil.Base64ToBitmapImage(Constants.DEFAULT_DISK_IMAGE_BASE64); + } else + { + //文件夹 + return ImageUtil.Base64ToBitmapImage(Constants.DEFAULT_DIR_IMAGE_BASE64); + } + } return null; }