add in drag file.

1)update in issues.
2)add in drag  file.

Co-Authored-By: 闫驚鏵（Jinhua  Yan） <yanjinhuamail@gmail.com>

Author: yanjinhuagood

SoftwareHelper/App.xaml.cs

@@ -46,7 +46,9 @@ protected override void OnStartup(StartupEventArgs e)
                 var autoUpdater = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "AutoUpdater.exe");
                 if (File.Exists(autoUpdater))
                 {
-                    Process.Start(autoUpdater, System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString());
+                    var version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
+                    Log.Debug($"版本号：{version}");
+                    Process.Start(autoUpdater, version);
                 }
                 else
                     Log.Warn("警告:未找到AutoUpdater.exe，无法及时更新到最新版。");

SoftwareHelper/Helpers/Common.cs

@@ -1,4 +1,5 @@
-using Microsoft.Win32;
+using Microsoft.Expression.Drawing.Core;
+using Microsoft.Win32;
 using Newtonsoft.Json;
 using SoftwareHelper.Models;
 using System;
@@ -31,6 +32,10 @@ public partial class Common
         /// </summary>
         public static string TemporaryApplicationJson { get; set; }
         /// <summary>
+        /// 自己推拽的应用程序json
+        /// </summary>
+        public static string LocalTemporaryApplicationJson { get; set; }
+        /// <summary>
         /// 默认图标
         /// </summary>
         public static string ApplicationIcon { get; set; }
@@ -396,6 +401,7 @@ public static void TemporaryFiles()
                     System.IO.Directory.CreateDirectory(TemporaryIconFile);
                 }
                 TemporaryApplicationJson = Path.Combine(TemporaryFile, "application.json");
+                LocalTemporaryApplicationJson = Path.Combine(TemporaryFile, "localapplication.json");
                 ApplicationIcon = Path.Combine(TemporaryIconFile, "ApplicationIcon.png");
                 if (!File.Exists(ApplicationIcon))
                 {
@@ -548,11 +554,16 @@ public static void Init()
                 var json1 = JsonHelper.Serialize(Common.ApplicationListCache);
                 FileHelper.WriteFile(ConvertJsonString(json1), Common.TemporaryApplicationJson);
             }
+            var jsonLocal = FileHelper.ReadFile(LocalTemporaryApplicationJson);
+            var applicationsLocal = JsonHelper.Deserialize<ObservableCollection<ApplicationModel>>(jsonLocal);
+            Common.ApplicationListCache.AddRange(applicationsLocal);
+            Common.ApplicationListCache = new ObservableCollection<ApplicationModel>(Common.ApplicationListCache.OrderBy(x => x.Group));
+
         }
 
 
         #region 格式化json字符串
-        static string ConvertJsonString(string str)
+        public static string ConvertJsonString(string str)
         {
             //格式化json字符串
             JsonSerializer serializer = new JsonSerializer();
@@ -579,7 +590,7 @@ static string ConvertJsonString(string str)
         #endregion
 
         #region 判断首字母是否为中文,如果为中文 首字母转为英语
-        static bool IsChinese(string text)
+        public static bool IsChinese(string text)
         {
             bool chinese = false;
             Regex regChina = new Regex("[^\x00-\xFF]");
@@ -600,7 +611,7 @@ static bool IsChinese(string text)
         /// <param name="CnChar">单个汉字</param>
         /// <returns>单个大写字母</returns>
 
-        static string GetCharSpellCode(string CnChar)
+        public static string GetCharSpellCode(string CnChar)
         {
             long iCnChar;
             byte[] ZW = System.Text.Encoding.Default.GetBytes(CnChar);

SoftwareHelper/Models/ApplicationModel.cs

@@ -24,5 +24,9 @@ public class ApplicationModel
         ///     是否移除
         /// </summary>
         public bool IsRemove { get; set; }
+        /// <summary>
+        ///     是否是拖拽进来的
+        /// </summary>
+        public bool IsDrag { get; set; }
     }
 }

SoftwareHelper/Views/EmbedDeasktopView.xaml

@@ -18,7 +18,9 @@
         SnapsToDevicePixels="True" WindowStyle="None" Background="Transparent"
         Title="SoftwareHelper" Height="600" Width="90"
         ShowInTaskbar="False" x:Name="embedDeasktopView"
-        AllowDrop="True" PreviewDragEnter="embedDeasktopView_DragEnter" PreviewDragLeave="embedDeasktopView_DragLeave">
+        AllowDrop="True" 
+        PreviewDragEnter="embedDeasktopView_DragEnter" 
+        PreviewDragLeave="embedDeasktopView_DragLeave">
     <wpfdev:WindowChrome.WindowChrome>
         <wpfdev:WindowChrome GlassFrameThickness="-1" CaptionHeight="0"/>
     </wpfdev:WindowChrome.WindowChrome>
@@ -356,12 +358,15 @@
                        HorizontalAlignment="Center" VerticalAlignment="Center"
                        FontSize="22" Foreground="{DynamicResource NormalWhiteBrush}" />
         </Border>
-        <Canvas Background="Transparent" x:Name="DragCanvas"
-                AllowDrop="True" DragOver="Grid_DragOver"
+        <Canvas Background="Transparent" 
+                x:Name="DragCanvas"
+                AllowDrop="True" 
+                DragOver="DragCanvas_DragOver"
                 Drop="DragCanvas_Drop"
                 Visibility="Collapsed">
             <StackPanel Orientation="Vertical" Name="DragStackPanel"
-                        RenderTransformOrigin=".5,.5">
+                        RenderTransformOrigin=".5,.5"
+                        Opacity=".5">
                 <StackPanel.RenderTransform>
                     <ScaleTransform x:Name="DragScaleTransform" ScaleX="1" ScaleY="1"/>
                 </StackPanel.RenderTransform>

SoftwareHelper/Views/EmbedDeasktopView.xaml.cs

@@ -11,9 +11,14 @@
 using System.Windows.Media;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
+using Newtonsoft.Json.Linq;
+using System.Xml.Linq;
 using SoftwareHelper.Helpers;
+using SoftwareHelper.Models;
 using SoftwareHelper.ViewModels;
 using WPFDevelopers.Controls;
+using static System.Windows.Forms.LinkLabel;
+using System.IO;
 
 namespace SoftwareHelper.Views
 {
@@ -28,6 +33,8 @@ public partial class EmbedDeasktopView : Window
         private Point anchorPoint;
         private bool inDrag;
         private readonly MainVM mainVM;
+        private string filePath;
+        private BitmapSource fileIcon;
 
         public EmbedDeasktopView()
         {
@@ -133,6 +140,8 @@ private void EmbedDeasktopView_Loaded(object sender, RoutedEventArgs e)
         private void EmbedDeasktopView_Closing(object sender, CancelEventArgs e)
         {
             Win32Api.UnRegisterDesktop(true);
+            string json = JsonHelper.Serialize(mainVM.ApplicationList.Where(x=>x.IsDrag == true).OrderBy(x => x.Group));
+            FileHelper.WriteFile(Common.ConvertJsonString(json), Common.LocalTemporaryApplicationJson);
         }
 
         protected override void OnSourceInitialized(EventArgs e)
@@ -294,16 +303,28 @@ private void UnToggleButtonMini_Checked(object sender, RoutedEventArgs e)
         #endregion
 
 
-        private void Grid_DragOver(object sender, DragEventArgs e)
+        private void DragCanvas_DragOver(object sender, DragEventArgs e)
         {
-            if (e.Data.GetDataPresent(DataFormats.FileDrop))
+            try
             {
-               var msg = ((System.Array)e.Data.GetData(DataFormats.FileDrop)).GetValue(0).ToString();
-                DragTextBlock.Text = System.IO.Path.GetFileName(msg);
-                DragImage.Source = (BitmapSource)Common.GetIcon(msg);
-                var point = e.GetPosition(this);
-                Canvas.SetLeft(DragStackPanel, point.X - DragStackPanel.ActualWidth / 2);
-                Canvas.SetTop(DragStackPanel, point.Y - DragStackPanel.ActualHeight / 2);
+                if (e.Data.GetDataPresent(DataFormats.FileDrop))
+                {
+                    var msg = ((System.Array)e.Data.GetData(DataFormats.FileDrop)).GetValue(0).ToString();
+                    filePath = msg;
+                    DragTextBlock.Text = System.IO.Path.GetFileName(filePath);
+                    var icon = (BitmapSource)Common.GetIcon(filePath);
+                    fileIcon = icon;
+                    DragImage.Source = fileIcon;
+                    var point = e.GetPosition(this);
+                    var x = point.X - DragStackPanel.ActualWidth / 2;
+                    var y = point.Y - DragStackPanel.ActualHeight / 2;
+                    Canvas.SetLeft(DragStackPanel, x);
+                    Canvas.SetTop(DragStackPanel, y);
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.Error("DragCanvas_DragOver:" + ex.Message);
             }
 
         }
@@ -312,14 +333,26 @@ private void embedDeasktopView_DragEnter(object sender, DragEventArgs e)
         {
             AppSwitchListEmbedded.IsHitTestVisible = false;
             AppSwitchList.IsHitTestVisible = false;
-            DragScaleTransform.ScaleX = 1;
-            DragScaleTransform.ScaleY = 1;
+            var doubleXAnimation = new DoubleAnimation
+            {
+                From = 0,
+                To = 1,
+                Duration = new Duration(TimeSpan.FromSeconds(0)),
+            };
+            DragScaleTransform.BeginAnimation(ScaleTransform.ScaleXProperty,doubleXAnimation);
+            var doubleYAnimation = new DoubleAnimation
+            {
+                From = 0,
+                To = 1,
+                Duration = new Duration(TimeSpan.FromSeconds(0)),
+            };
+            DragScaleTransform.BeginAnimation(ScaleTransform.ScaleYProperty, doubleXAnimation);
             DragCanvas.Visibility = Visibility.Visible;
         }
 
         private void embedDeasktopView_DragLeave(object sender, DragEventArgs e)
         {
-            //DragInitial();
+            DragInitial();
         }
         void DisposeDrag()
         {
@@ -329,6 +362,7 @@ void DisposeDrag()
                 From = 1,
                 To = 0,
                 Duration = new Duration(TimeSpan.FromSeconds(0.5)),
+                EasingFunction = new BackEase { EasingMode = EasingMode.EaseIn },
             };
             Storyboard.SetTargetName(doubleXAnimation, "DragStackPanel");
             Storyboard.SetTargetProperty(doubleXAnimation, new PropertyPath("(StackPanel.RenderTransform).(ScaleTransform.ScaleX)"));
@@ -337,6 +371,7 @@ void DisposeDrag()
                 From = 1,
                 To = 0,
                 Duration = new Duration(TimeSpan.FromSeconds(0.5)),
+                EasingFunction = new BackEase { EasingMode = EasingMode.EaseIn },
             };
             Storyboard.SetTargetName(doubleYAnimation, "DragStackPanel");
             Storyboard.SetTargetProperty(doubleYAnimation, new PropertyPath("(StackPanel.RenderTransform).(ScaleTransform.ScaleY)"));
@@ -345,18 +380,58 @@ void DisposeDrag()
             storyboard.Completed += delegate 
             {
                 DragInitial();
+                var model = new ApplicationModel();
+                model.ExePath = filePath;
+                model.Name = DragTextBlock.Text;
+                var iconPath = System.IO.Path.Combine(Common.TemporaryIconFile, model.Name);
+                iconPath = iconPath + ".png";
+                model.IconPath = iconPath;
+                model.IsDrag = true;
+                var firstModel = mainVM.ApplicationList.FirstOrDefault(x => x.Name == model.Name && x.ExePath == model.ExePath);
+                if (firstModel != null) return;
+                string first = model.Name.Substring(0, 1);
+                if (!Common.IsChinese(first))
+                {
+                    if (char.IsUpper(first.ToCharArray()[0]))
+                        model.Group = first;
+                    model.Group = model.Name.Substring(0, 1).ToUpper();
+                }
+                else
+                {
+                    model.Group = Common.GetCharSpellCode(first);
+                }
+                mainVM.ApplicationList.Insert(0, model);
+                if (File.Exists(iconPath))
+                    return;
+                Common.SaveImage(fileIcon, iconPath);
             };
             storyboard.Begin(DragStackPanel);
         }
         void DragInitial()
         {
-            DragCanvas.Visibility = Visibility.Collapsed;
-            AppSwitchListEmbedded.IsHitTestVisible = true;
-            AppSwitchList.IsHitTestVisible = true;
+            try
+            {
+                DragCanvas.Visibility = Visibility.Collapsed;
+                AppSwitchListEmbedded.IsHitTestVisible = true;
+                AppSwitchList.IsHitTestVisible = true;
+            }
+            catch (Exception ex)
+            {
+
+                Log.Error("DragInitial:" + ex.Message);
+            }
         }
         private void DragCanvas_Drop(object sender, DragEventArgs e)
         {
+            if (string.IsNullOrWhiteSpace(filePath))
+            {
+                DragInitial();
+                return; 
+            }
             DisposeDrag();
         }
+
+        
+
     }
 }