diamond-cut
/
SparkClient
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 46fbe37e21.
master
sunhonglei 5 months ago
parent 2b51b94193
commit 6dad916ace
6 changed files with 38 additions and 52 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Language/zh_CN.xaml
  2. BIN
      Resource/Images/UIResource/Hexagon.png
  3. BIN
      Resource/Images/UIResource/Hexagon_select.png
  4. 4
      SparkClient.csproj
  5. 80
      ViewModel/Configuration/AlgorithmConfigVM.cs
  6. 4
      ViewModel/Grading/DiamondSelectVM.cs

2
Language/zh_CN.xaml
Unescape View File

@ -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>

BIN
Resource/Images/UIResource/Hexagon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.5 KiB

BIN
Resource/Images/UIResource/Hexagon_select.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.5 KiB

4
SparkClient.csproj
Unescape View File

@ -38,8 +38,6 @@
<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" />
@ -62,8 +60,6 @@
<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" />

80
ViewModel/Configuration/AlgorithmConfigVM.cs
Unescape View File

@ -2,19 +2,17 @@
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; }
@ -63,62 +61,54 @@ public class AlgorithmConfigVM : BaseViewModel
/// <param name="param"></param>
public void SaveAlgorithmData(object param)
{
try
DataBaseHelper.BeginTransaction();
string temp = JsonConvert.SerializeObject(JsonConvert.DeserializeObject(AlgorithmConfigJson));
string deleteSql = @"DELETE FROM ALGORITHM_CONFIG";
DataBaseHelper.ExecuteNonQuery(deleteSql);
int order = 0;
int insertCount = 0;
while (temp.Length > 2000)
{
DataBaseHelper.BeginTransaction();
string temp = JsonConvert.SerializeObject(JsonConvert.DeserializeObject(AlgorithmConfigJson));
string deleteSql = @"DELETE FROM ALGORITHM_CONFIG";
DataBaseHelper.ExecuteNonQuery(deleteSql);
int order = 0;
int insertCount = 0;
while (temp.Length > 2000)
AlgorithmConfigEntity entity = new AlgorithmConfigEntity()
{
AlgorithmConfigEntity entity = new AlgorithmConfigEntity()
{
GUID = Guid.NewGuid(),
JsonOrder = order++,
Json = temp.Substring(0, 2000),
};
temp = temp.Substring(2000);
string sql = entity.GenerateInsertSQL();
SqliteParameter[] sqliteParameters = {
GUID = Guid.NewGuid(),
JsonOrder = order++,
Json = temp.Substring(0, 2000),
};
temp = temp.Substring(2000);
string sql = entity.GenerateInsertSQL();
SqliteParameter[] sqliteParameters = {
new SqliteParameter("@Json", entity.Json),
new SqliteParameter("@JsonOrder", entity.JsonOrder),
new SqliteParameter("@GUID", entity.GUID),
};
insertCount += DataBaseHelper.ExecuteNonQuery(sql, sqliteParameters);
}
if (temp.Length > 0)
insertCount += DataBaseHelper.ExecuteNonQuery(sql, sqliteParameters);
}
if (temp.Length > 0)
{
AlgorithmConfigEntity entity = new AlgorithmConfigEntity()
{
AlgorithmConfigEntity entity = new AlgorithmConfigEntity()
{
GUID = Guid.NewGuid(),
JsonOrder = order++,
Json = temp
};
string sql = entity.GenerateInsertSQL();
SqliteParameter[] sqliteParameters = {
GUID = Guid.NewGuid(),
JsonOrder = order++,
Json = temp
};
string sql = entity.GenerateInsertSQL();
SqliteParameter[] sqliteParameters = {
new SqliteParameter("@Json", entity.Json),
new SqliteParameter("@JsonOrder", entity.JsonOrder),
new SqliteParameter("@GUID", entity.GUID.ToString()),
};
insertCount += DataBaseHelper.ExecuteNonQuery(sql, sqliteParameters);
}
if (insertCount >= 0)
{
Growl.Info(MultilingualHelper.getString("SaveSuccess"));
DataBaseHelper.commit();
}
else
{
Growl.Error(MultilingualHelper.getString("SaveFail"));
DataBaseHelper.rollback();
}
insertCount += DataBaseHelper.ExecuteNonQuery(sql, sqliteParameters);
}
catch (Exception ex)
if (insertCount >= 0)
{
Growl.Info(MultilingualHelper.getString("SaveSuccess"));
DataBaseHelper.commit();
}
else
{
Growl.Error(MultilingualHelper.getString("SaveFail"));
Logger.Error(ex);
DataBaseHelper.rollback();
}
}
private void IsEnabledByRole (){

4
ViewModel/Grading/DiamondSelectVM.cs
Unescape View File

@ -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 = "Hexagon", IsEnabled = false, ImageName = "Hexagon.png", ButtonName = MultilingualHelper.getString("六边形") });
buttonInfos.Add(new ButtonInfo() { Type = "Heart", IsEnabled = false, ImageName = "Heart.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;

Write Preview
Loading…
Cancel
Save