fix：心形图标改六边形图标

Language/zh_CN.xaml

@@ -57,7 +57,7 @@
     <sys:String x:Key="SaveFail">保存失败</sys:String>
     <!-- 钻石选择画面 -->
     <sys:String x:Key="圆形">圆形</sys:String>
-    <sys:String x:Key="心形">心形</sys:String>
+    <sys:String x:Key="六边形">六边形</sys:String>
     <sys:String x:Key="枕形">枕形</sys:String>
     <sys:String x:Key="梨形">梨形</sys:String>
     <sys:String x:Key="公主方形">公主方形</sys:String>

SparkClient.csproj

@@ -38,6 +38,8 @@
       <None Remove="Resource\Images\UIResource\Emerald_select.png" />
       <None Remove="Resource\Images\UIResource\Heart.png" />
       <None Remove="Resource\Images\UIResource\Heart_select.png" />
+      <None Remove="Resource\Images\UIResource\Hexagon.png" />
+      <None Remove="Resource\Images\UIResource\Hexagon_select.png" />
       <None Remove="Resource\Images\UIResource\Odd.png" />
       <None Remove="Resource\Images\UIResource\Odd_select.png" />
       <None Remove="Resource\Images\UIResource\oval.png" />
@@ -60,6 +62,8 @@
       <Resource Include="Resource\Images\UIResource\Emerald_select.png" />
       <Resource Include="Resource\Images\UIResource\Heart.png" />
       <Resource Include="Resource\Images\UIResource\Heart_select.png" />
+      <Resource Include="Resource\Images\UIResource\Hexagon.png" />
+      <Resource Include="Resource\Images\UIResource\Hexagon_select.png" />
       <Resource Include="Resource\Images\UIResource\Odd.png" />
       <Resource Include="Resource\Images\UIResource\Odd_select.png" />
       <Resource Include="Resource\Images\UIResource\oval.png" />

ViewModel/Configuration/AlgorithmConfigVM.cs

@@ -2,17 +2,19 @@
 using System.Text;
 using System.Windows.Input;
 using HandyControl.Controls;
+using log4net;
 using Microsoft.Data.Sqlite;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using SparkClient.Model.Entity;
 using SparkClient.Model.Helper;
 using SparkClient.ViewModel.Configuration.SettingsPages;
-
+using MessageBox = SparkClient.Views.Dialog.MessageBox;
 namespace SparkClient.ViewModel.Configuration;
 
 public class AlgorithmConfigVM : BaseViewModel
 {
+    private static readonly ILog Logger = LogManager.GetLogger(typeof(AlgorithmConfigVM));
     public ICommand SaveAlgorithmDataCommand { get; }
     public ICommand BeautifyJsonCommand { get; }
     public ICommand UglifyJsonCommand { get; }
@@ -60,6 +62,8 @@ public class AlgorithmConfigVM : BaseViewModel
     /// </summary>
     /// <param name="param"></param>
     public void SaveAlgorithmData(object param)
+    {
+        try
         {
             DataBaseHelper.BeginTransaction();
             string temp = JsonConvert.SerializeObject(JsonConvert.DeserializeObject(AlgorithmConfigJson));
@@ -111,6 +115,12 @@ public class AlgorithmConfigVM : BaseViewModel
                 DataBaseHelper.rollback();
             }
         }
+        catch (Exception ex)
+        {
+            Growl.Error(MultilingualHelper.getString("SaveFail"));
+            Logger.Error(ex);
+        }
+    }
     private void IsEnabledByRole (){
        string PERMISSIONS = Settings.SelectValueByName("PERMISSIONS");
         if ("admin".Equals(PERMISSIONS))

ViewModel/Grading/DiamondSelectVM.cs

@@ -70,7 +70,7 @@ public class DiamondSelectVM : BaseViewModel
     {
         List<ButtonInfo> buttonInfos = new List<ButtonInfo>();
         buttonInfos.Add(new ButtonInfo() { Type = "round", IsEnabled = true, ImageName = "round.png", ButtonName = MultilingualHelper.getString("圆形") });
-        buttonInfos.Add(new ButtonInfo() { Type = "Heart", IsEnabled = false, ImageName = "Heart.png", ButtonName = MultilingualHelper.getString("心形") });
+        buttonInfos.Add(new ButtonInfo() { Type = "Hexagon", IsEnabled = false, ImageName = "Hexagon.png", ButtonName = MultilingualHelper.getString("六边形") });
         buttonInfos.Add(new ButtonInfo() { Type = "cushion", IsEnabled = false, ImageName = "Cushion.png", ButtonName = MultilingualHelper.getString("枕形") });
         buttonInfos.Add(new ButtonInfo() { Type = "Pear", IsEnabled = false, ImageName = "Pear.png", ButtonName = MultilingualHelper.getString("梨形") });
         buttonInfos.Add(new ButtonInfo() { Type = "Princess", IsEnabled = false, ImageName = "Princess.png", ButtonName = MultilingualHelper.getString("公主方形") });
@@ -346,7 +346,7 @@ public class DiamondSelectVM : BaseViewModel
     public void GradingResult(AlgorithmResultEntity param)
     {
         
-        WindowManager.mainViewModel.Content = WindowManager.PreviousVM();
+        //WindowManager.mainViewModel.Content = WindowManager.PreviousVM();
         BaseControlVM vm = new BaseControlVM(new GradingResultVM(param), MultilingualHelper.getString("DetectionResult"));
         vm.ShowFunctionButton = System.Windows.Visibility.Hidden;
         WindowManager.mainViewModel.Content = vm;