Commit 8f7d1a8c authored by Rabbit's avatar Rabbit
Browse files

修复了保存正计时Labels再读取时时间错误的问题 

修复了导入Label背景图时，由于文件占用导致崩溃的问题
parent 16d28534

CountDownList/Class/XML.cs

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ namespace CountDownList.Class 
                newElement.SetAttribute("IsCount", Convert.ToString(label.IsCountMode));

                newElement.SetAttribute("StartTime", label.StartTime.Ticks.ToString());

                newElement.SetAttribute("EndTime", label.EndTime.Ticks.ToString());

                newElement.SetAttribute("IsCount", Convert.ToString(label.DarkText));

                newElement.SetAttribute("DarkText", Convert.ToString(label.DarkText));



                if (label.LabelBackground.GetType() == new SolidColorBrush().GetType())

                {

CountDownList/UI/WindowFrame/EditWindow.xaml.cs

+15 −11
Original line number Diff line number Diff line
@@ -164,7 +164,9 @@ namespace CountDownList.UI.Window 
                FileInfo file = new FileInfo(dialog.FileName);

                if (file.Exists)

                {

                    // 创建文件流并读取文件

                    if (!new FileInfo($@"{AppDomain.CurrentDomain.BaseDirectory}Data\Image\{Path.GetFileName(dialog.FileName)}").Exists)

                    {

                        //文件已经在Data\Image下则直接使用，防止崩溃

                        using (FileStream sourceStream = new FileStream(dialog.FileName, FileMode.Open))

                        {

                            FileInfo info = new FileInfo($@"{AppDomain.CurrentDomain.BaseDirectory}Data\Image\{Path.GetFileName(dialog.FileName)}");
@@ -183,6 +185,8 @@ namespace CountDownList.UI.Window 
                                }

                            }

                        }

                    }

                    // 创建文件流并读取文件



                    ImageBrush i = new();

                    i.ImageSource = new BitmapImage(new Uri($@"Data\Image\{Path.GetFileName(dialog.FileName)}", UriKind.Relative));