feat: 基础方法补充

App.xaml

@@ -1,13 +1,14 @@
 <Application x:Class="SparkClient.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:SparkClient"
-             xmlns:hc="https://handyorg.github.io/handycontrol"
-             xmlns:baseWindow="clr-namespace:SparkClient.Views.BaseWindow"
-             xmlns:baseWindow1="clr-namespace:SparkClient.ViewModel.BaseWindow"
+             xmlns:baseView="clr-namespace:SparkClient.Views.BaseWindow"
+             xmlns:baseVM="clr-namespace:SparkClient.ViewModel.BaseWindow"
              xmlns:views="clr-namespace:SparkClient.Views"
-             xmlns:configuration="clr-namespace:SparkClient.ViewModel.Configuration"
-             xmlns:configuration1="clr-namespace:SparkClient.Views.Configuration"
+             xmlns:configVM="clr-namespace:SparkClient.ViewModel.Configuration"
+             xmlns:configView="clr-namespace:SparkClient.Views.Configuration"
+             xmlns:gradingView="clr-namespace:SparkClient.Views.Grading"
+             xmlns:gradingVM="clr-namespace:SparkClient.ViewModel.Grading"
+             xmlns:viewModel="clr-namespace:SparkClient.ViewModel"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary>
@@ -21,28 +22,36 @@
             <ResourceDictionary x:Key="en" Source="/Language/en_US.xaml"/>
             
             <!-- V-VM全局映射 -->
-            <DataTemplate DataType="{x:Type baseWindow1:HomeWindowVM}">
-                <baseWindow:HomeWindow/>
+            <DataTemplate DataType="{x:Type baseVM:HomeWindowVM}">
+                <baseView:HomeWindow/>
             </DataTemplate>
-            <DataTemplate DataType="{x:Type baseWindow1:BaseControlVM}">
-                <baseWindow:BaseControl/>
+            <DataTemplate DataType="{x:Type baseVM:BaseControlVM}">
+                <baseView:BaseControl/>
             </DataTemplate>
-            <DataTemplate DataType="{x:Type baseWindow1:HelperPageVM}">
+            <!-- 帮助页映射 -->
+            <DataTemplate DataType="{x:Type viewModel:HelperPageVM}">
                 <views:HelperPage/>
             </DataTemplate>
-            <DataTemplate DataType="{x:Type configuration:ConfigMenuPageVM}">
-                <configuration1:ConfigMenuPage/>
+            <!-- 配置管理、配置相关映射 -->
+            <DataTemplate DataType="{x:Type configVM:ConfigMenuPageVM}">
+                <configView:ConfigMenuPage/>
             </DataTemplate>
-            <DataTemplate DataType="{x:Type configuration:LevelConfigVM}">
-                <configuration1:LevelConfigPage/>
+            <DataTemplate DataType="{x:Type configVM:LevelConfigVM}">
+                <configView:LevelConfigPage/>
             </DataTemplate>
-            <DataTemplate DataType="{x:Type configuration:CutConfigVM}">
-                <configuration1:CutConfigPage/>
+            <DataTemplate DataType="{x:Type configVM:CutConfigVM}">
+                <configView:CutConfigPage/>
             </DataTemplate>
-            <DataTemplate DataType="{x:Type configuration:AlgorithmConfigVM}">
-                <configuration1:AlgorithmConfigPage/>
+            <DataTemplate DataType="{x:Type configVM:AlgorithmConfigVM}">
+                <configView:AlgorithmConfigPage/>
+            </DataTemplate>
+            <!-- 检测、检测结果映射 -->
+            <DataTemplate DataType="{x:Type gradingVM:DiamondSelectVM}">
+                <gradingView:DiamondSelect />
+            </DataTemplate>
+            <DataTemplate DataType="{x:Type gradingVM:GradingResultVM}">
+                <gradingView:GradingResult/>
             </DataTemplate>
-      
         </ResourceDictionary>
     </Application.Resources>
 </Application>

MainWindow.xaml

@@ -11,13 +11,15 @@
            WindowStyle="None"
            ResizeMode="CanResizeWithGrip"
            WindowStartupLocation="CenterScreen"
-           d:DesignHeight="800" 
-           d:DesignWidth="1400"
+
            MinHeight="400"
            MinWidth="800"
            
            Loaded="MainWindow_OnLoaded"
+           WindowState="Maximized"
            Background="{DynamicResource SecondaryRegionBrush}">
+    
+    
     <!-- WindowState="Maximized" -->
     <!-- ~1~ 自定义标题栏 @1@ -->
     <!-- <hc:Window.NonClientAreaContent> -->

Model/Helper/MultilingualHelper.cs

@@ -8,6 +8,12 @@ namespace SparkClient.Model.Helper;
 /// </summary>
 public class MultilingualHelper
 {
+    /// <summary>
+    /// 获取多语言字符
+    /// </summary>
+    /// <param name="key">KEY</param>
+    /// <returns>文字</returns>
+    /// <exception cref="NullReferenceException"></exception>
     public static string getString(string key)
     {
         var result = Application.Current.TryFindResource(key);
@@ -18,12 +24,20 @@ public class MultilingualHelper
         return (string)result;
     }
 
+    /// <summary>
+    /// 设置语言
+    /// </summary>
+    /// <param name="language"></param>
     public static void setLanguage(string language)
     {
         LoadResources(language);
         ConfigHelper.Instance.SetLang(language);
     }
     
+    /// <summary>
+    /// 加载语言配置
+    /// </summary>
+    /// <param name="resourceKey"></param>
     private static void LoadResources(string resourceKey)
     {
         // 获取当前应用程序的App实例

ViewModel/BaseWindow/BaseControlVM.cs

@@ -21,20 +21,44 @@ public class BaseControlVM : BaseViewModel
     
     public object Content { get; }
     public ICommand CloseCommand { get; }
+    /// <summary>
+    /// 构造：创建一个带有子页面的模板，并指定子窗口标题，并指定右侧按钮事件内容
+    /// </summary>
+    /// <param name="vm">子页面</param>
+    /// <param name="windowTitle">子窗口标题</param>
+    /// <param name="Function">事件内哦那个</param>
+    public BaseControlVM(BaseViewModel vm, string windowTitle, ICommand Function)
+    {
+        Content = vm;
+        WindowTitle = windowTitle;
+        CloseCommand = new RelayCommand(CloseVM);
+    }
 
+    /// <summary>
+    /// 构造：创建一个带有子页面的模板，并指定子窗口标题
+    /// </summary>
+    /// <param name="vm">子页面</param>
+    /// <param name="windowTitle">子窗口标题</param>
     public BaseControlVM(BaseViewModel vm, string windowTitle)
     {
         Content = vm;
         WindowTitle = windowTitle;
         CloseCommand = new RelayCommand(CloseVM);
     }
-    
+    /// <summary>
+    /// 构造：创建一个带有子页面的模板
+    /// </summary>
+    /// <param name="vm"></param>
     public BaseControlVM(BaseViewModel vm)
     {
         Content = vm;
         CloseCommand = new RelayCommand(CloseVM);
     }
-
+    
+    /// <summary>
+    /// 关闭并退回至上一个页面
+    /// </summary>
+    /// <param name="parameter"></param>
     public void CloseVM(object parameter)
     {
         WindowManager.mainViewModel.Content = WindowManager.PreviousVM();

ViewModel/BaseWindow/HomeWindowVM.cs

@@ -4,6 +4,7 @@ using System.Windows.Input;
 using HandyControl.Controls;
 using SparkClient.Model.Helper;
 using SparkClient.ViewModel.Configuration;
+using SparkClient.ViewModel.Grading;
 
 namespace SparkClient.ViewModel.BaseWindow;
 
@@ -12,11 +13,13 @@ public class HomeWindowVM : BaseViewModel
    public ICommand ShowHelperPageCommand { get; }
    
    public ICommand ShowConfigPageCommand { get; }
+   public ICommand ShowDiamondSelPageCommand { get; }
 
    public HomeWindowVM()
    {
       ShowHelperPageCommand = new RelayCommand(ShowHelperPage);
       ShowConfigPageCommand = new RelayCommand(ShowConfigPage);
+      ShowDiamondSelPageCommand = new RelayCommand(ShowDiamlondSelPage);
    }
 
    public void ShowHelperPage(object parameter)
@@ -32,4 +35,11 @@ public class HomeWindowVM : BaseViewModel
       WindowManager.mainViewModel.Content = vm;
       WindowManager.openContent.Add(vm);
    }
+   
+   public void ShowDiamlondSelPage(object parameter)
+   {
+      BaseControlVM vm = new BaseControlVM(new DiamondSelectVM(), MultilingualHelper.getString("DiamondSelect"));
+      WindowManager.mainViewModel.Content = vm;
+      WindowManager.openContent.Add(vm);
+   }
 }

ViewModel/BaseWindow/MainViewModel.cs

@@ -12,6 +12,9 @@ public class MainViewModel : BaseViewModel
     public ICommand SetZhcnLanguage { get; }
     public ICommand SetEnLanguage { get; }
 
+    /// <summary>
+    /// 构造
+    /// </summary>
     public MainViewModel()
     {
         Content = new HomeWindowVM();
@@ -21,11 +24,19 @@ public class MainViewModel : BaseViewModel
         SetEnLanguage = new RelayCommand(setEnLanguage);
     }
 
+    /// <summary>
+    /// 设置语言为ZH-CN
+    /// </summary>
+    /// <param name="parameter"></param>
     public void setZhLanguage(object parameter)
     {
         MultilingualHelper.setLanguage("zh-cn");
     }
     
+    /// <summary>
+    /// 设置语言为EN
+    /// </summary>
+    /// <param name="parameter"></param>
     public void setEnLanguage(object parameter)
     {
         MultilingualHelper.setLanguage("en");

ViewModel/Configuration/AlgorithmConfigVM.cs

@@ -2,5 +2,47 @@
 
 public class AlgorithmConfigVM : BaseViewModel
 {
+
+  public AlgorithmConfigVM()
+  {
+    // 初始化VIEW层参数
+    // 初始化VIEW层Command
+    this.InitAlgorithmData(null);
+  }
+  
+  /// <summary>
+  /// 初始化算法数据
+  /// </summary>
+  /// <param name="param"></param>
+  public void InitAlgorithmData(object param)
+  {
+  }
+
+  /// <summary>
+  /// 添加行
+  /// </summary>
+  /// <param name="row">行数</param>
+  public void AddRows(object row)
+  {
+    
+  }
+
+  /// <summary>
+  /// 保存数据
+  /// </summary>
+  /// <param name="param"></param>
+  public void SaveAlgorithmData(object param)
+  {
     
+  }
+
+  /// <summary>
+  /// 删除一行数据
+  /// </summary>
+  /// <param name="row">行</param>
+  public void DelAlgorRow(object row)
+  {
+    
+  }
+
 }

ViewModel/Configuration/ConfigMenuPageVM.cs

@@ -7,7 +7,6 @@ namespace SparkClient.ViewModel.Configuration;
 public class ConfigMenuPageVM : BaseViewModel
 {
     public ICommand CloseCommand { get; }
-
     public ICommand LevelConfigCommand { get; }
     public ICommand AlgorithmConfigCommand { get; }
     public ICommand CutConfigCommand { get; }
@@ -19,24 +18,38 @@ public class ConfigMenuPageVM : BaseViewModel
         CutConfigCommand = new RelayCommand(CutConfig);
     }
 
-
+    /// <summary>
+    /// 关闭并退回至上一页面
+    /// </summary>
+    /// <param name="parameter"></param>
     public void CloseVM(object parameter)
     {
         WindowManager.mainViewModel.Content = WindowManager.PreviousVM();
     }
-
+    /// <summary>
+    /// 打开定级配置页面
+    /// </summary>
+    /// <param name="parameter"></param>
     public void LevelConfig(object parameter)
     {
         BaseControlVM vm = new BaseControlVM(new LevelConfigVM(), MultilingualHelper.getString("LevelConfig"));
         WindowManager.mainViewModel.Content = vm;
         WindowManager.openContent.Add(vm);
     }
+    /// <summary>
+    /// 打开算法配置页面
+    /// </summary>
+    /// <param name="parameter"></param>
     public void AlgorithmConfig(object parameter)
     {
         BaseControlVM vm = new BaseControlVM(new AlgorithmConfigVM(), MultilingualHelper.getString("AlgorithmConfig"));
         WindowManager.mainViewModel.Content = vm;
         WindowManager.openContent.Add(vm);
     }
+    /// <summary>
+    /// 打开切工仪配置页面
+    /// </summary>
+    /// <param name="parameter"></param>
     public void CutConfig(object parameter)
     {
         BaseControlVM vm = new BaseControlVM(new CutConfigVM(), MultilingualHelper.getString("CutConfig"));

ViewModel/Configuration/CutConfigVM.cs

@@ -3,4 +3,45 @@
 public class CutConfigVM: BaseViewModel
 {
     
+    public CutConfigVM()
+    {
+        // 初始化VIEW层参数
+        // 初始化VIEW层Command
+        this.InitCutConfigData(null);
+    }
+
+    /// <summary>
+    /// 初始化切工仪数据
+    /// </summary>
+    /// <param name="param"></param>
+    public void InitCutConfigData(object param)
+    {
+    }
+
+    /// <summary>
+    /// 添加行
+    /// </summary>
+    /// <param name="row">行数</param>
+    public void AddRows(object row)
+    {
+    
+    }
+
+    /// <summary>
+    /// 保存数据
+    /// </summary>
+    /// <param name="param"></param>
+    public void SaveCutConfigData(object param)
+    {
+    
+    }
+
+    /// <summary>
+    /// 删除一行数据
+    /// </summary>
+    /// <param name="row">行</param>
+    public void DelCutRow(object row)
+    {
+    
+    }
 }

ViewModel/Configuration/LevelConfigVM.cs

@@ -9,4 +9,46 @@ public class LevelConfigVM: BaseViewModel
     {
         _levels = new List<string>(){"12314", "3455623", "4567894"};
     }
+
+    /// <summary>
+    /// 加载顶级配置的数据
+    /// </summary>
+    /// <param name="param"></param>
+    public void InitLevelConfig(object param)
+    {
+        
+    }
+
+    /// <summary>
+    /// 更新保存响应
+    /// </summary>
+    /// <param name="param"></param>
+    public void SaveLevelConfig(object param)
+    {
+        
+    }
+    /// <summary>
+    /// 删除配置响应
+    /// </summary>
+    /// <param name="param"></param>
+    public void DelLevelConfig(object param)
+    {
+    }
+
+    /// <summary>
+    /// 导入配置响应
+    /// </summary>
+    /// <param name="param"></param>
+    public void LoadLevelConfig(object param)
+    {
+        
+    }
+
+    /// <summary>
+    /// 切换定级响应
+    /// </summary>
+    /// <param name="param"></param>
+    public void ChangeLevelModel(object param)
+    {
+    }
 }

ViewModel/Grading/DiamondSelectVM.cs

@@ -0,0 +1,6 @@
+namespace SparkClient.ViewModel.Grading;
+
+public class DiamondSelectVM:BaseViewModel
+{
+    
+}

ViewModel/Grading/GradingResultVM.cs

@@ -0,0 +1,6 @@
+namespace SparkClient.ViewModel.Grading;
+
+public class GradingResultVM: BaseViewModel
+{
+    
+}

ViewModel/HelperPageVM.cs

@@ -1,4 +1,4 @@
-namespace SparkClient.ViewModel.BaseWindow;
+namespace SparkClient.ViewModel;
 
 public class HelperPageVM: BaseViewModel
 {

Views/BaseWindow/HomeWindow.xaml

@@ -32,7 +32,7 @@
 
             <!-- 第一排按钮 -->
             <Button Grid.Row="0"  Height="500"
-                    Background="Transparent" BorderBrush="Transparent" >
+                    Background="Transparent" BorderBrush="Transparent" Command="{Binding ShowDiamondSelPageCommand}">
                 <Border  BorderBrush="Silver"  BorderThickness="1" CornerRadius="20" MouseLeave="UIElement_OnMouseLeave" MouseEnter="UIElement_OnMouseEnter">
                     <Border.Background>
                         <RadialGradientBrush GradientOrigin="0.5,0.5" Center="0.5,0.5" RadiusX="0.5" RadiusY="0.5">

Views/Configuration/LevelConfigPage.xaml

@@ -20,7 +20,7 @@
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
-            <ComboBox Grid.Column="0" Width="140" hc:DropDownElement.ConsistentWidth="False" ItemsSource="{Binding Levels}"  Margin="10 0" />
+            <ComboBox Grid.Column="0" Width="140" hc:DropDownElement.ConsistentWidth="False" SelectedIndex="0" ItemsSource="{Binding Levels}"  Margin="10 0" />
             <Button Grid.Column="1" Content="{DynamicResource Save}"  Margin="10 0"/>
             <Button Grid.Column="2" Content="{DynamicResource DeleteConfig}"  Margin="10 0"/>
             <Button Grid.Column="4" Content="{DynamicResource ImportConfig}"  Margin="10 0" HorizontalAlignment="Right"/>

Views/Grading/DiamondSelect.xaml

@@ -4,8 +4,23 @@
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:local="clr-namespace:SparkClient.Views.Grading"
+      xmlns:hc="https://handyorg.github.io/handycontrol"
+      d:DesignWidth="1000"
+      d:DesignHeight="600"
       mc:Ignorable="d">
-    <Grid Background="Blue">
-        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="80">钻石选择</TextBlock>
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition MinWidth="300" Width="1*" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition MinWidth="300" Width="5*" />
+        </Grid.ColumnDefinitions>
+        <Border Grid.Column="0" Background="Aqua">
+            
+        </Border>
+        <GridSplitter Grid.Column="1" Width="3" HorizontalAlignment="Stretch"></GridSplitter>
+        <Border Grid.Column="2" Background="Aquamarine">
+            
+            
+        </Border>
     </Grid>
 </Border>

obj/Debug/net8.0-windows/SparkClient.csproj.FileListAbsolute.txt

@@ -190,3 +190,112 @@ F:\WorkSpace\Rider\SparkClient\bin\Debug\net8.0-windows\Microsoft.Web.WebView2.C
 F:\WorkSpace\Rider\SparkClient\bin\Debug\net8.0-windows\Microsoft.Web.WebView2.WinForms.xml
 F:\WorkSpace\Rider\SparkClient\bin\Debug\net8.0-windows\Microsoft.Web.WebView2.Wpf.xml
 F:\WorkSpace\Rider\SparkClient\bin\Debug\net8.0-windows\Resource\Document\Helper.pdf
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\win-x86\native\WebView2Loader.dll
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\win-x64\native\WebView2Loader.dll
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\win-arm64\native\WebView2Loader.dll
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\SparkClient.exe
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\Resource\Document\Helper.pdf
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\log4net.config
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\SparkClient.deps.json
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\SparkClient.runtimeconfig.json
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\SparkClient.dll
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\SparkClient.pdb
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\CommunityToolkit.Mvvm.dll
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\HandyControl.dll
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\log4net.dll
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\Microsoft.Data.Sqlite.dll
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\Newtonsoft.Json.dll
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\SQLitePCLRaw.batteries_v2.dll
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\SQLitePCLRaw.core.dll
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\SQLitePCLRaw.provider.e_sqlcipher.dll
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\SQLitePCLRaw.provider.e_sqlite3.dll
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\en\HandyControl.resources.dll
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\zh-CN\HandyControl.resources.dll
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\browser-wasm\nativeassets\net8.0\e_sqlcipher.a
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\linux-arm\native\libe_sqlcipher.so
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\linux-arm64\native\libe_sqlcipher.so
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\linux-armel\native\libe_sqlcipher.so
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\linux-mips64\native\libe_sqlcipher.so
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\linux-musl-arm\native\libe_sqlcipher.so
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\linux-musl-arm64\native\libe_sqlcipher.so
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\linux-musl-s390x\native\libe_sqlcipher.so
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\linux-musl-x64\native\libe_sqlcipher.so
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\linux-ppc64le\native\libe_sqlcipher.so
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\linux-s390x\native\libe_sqlcipher.so
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\linux-x64\native\libe_sqlcipher.so
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\linux-x86\native\libe_sqlcipher.so
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\maccatalyst-arm64\native\libe_sqlcipher.dylib
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\maccatalyst-x64\native\libe_sqlcipher.dylib
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\osx-arm64\native\libe_sqlcipher.dylib
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\osx-x64\native\libe_sqlcipher.dylib
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\win-arm\native\e_sqlcipher.dll
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\win-arm64\native\e_sqlcipher.dll
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\win-x64\native\e_sqlcipher.dll
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\win-x86\native\e_sqlcipher.dll
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\browser-wasm\nativeassets\net8.0\e_sqlite3.a
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\linux-arm\native\libe_sqlite3.so
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\linux-arm64\native\libe_sqlite3.so
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\linux-armel\native\libe_sqlite3.so
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\linux-mips64\native\libe_sqlite3.so
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\linux-musl-arm\native\libe_sqlite3.so
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\linux-musl-arm64\native\libe_sqlite3.so
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\linux-musl-s390x\native\libe_sqlite3.so
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\linux-musl-x64\native\libe_sqlite3.so
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\linux-ppc64le\native\libe_sqlite3.so
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\linux-s390x\native\libe_sqlite3.so
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\linux-x64\native\libe_sqlite3.so
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\linux-x86\native\libe_sqlite3.so
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\maccatalyst-arm64\native\libe_sqlite3.dylib
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\maccatalyst-x64\native\libe_sqlite3.dylib
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\osx-arm64\native\libe_sqlite3.dylib
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\osx-x64\native\libe_sqlite3.dylib
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\win-arm\native\e_sqlite3.dll
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\win-arm64\native\e_sqlite3.dll
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\win-x64\native\e_sqlite3.dll
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\runtimes\win-x86\native\e_sqlite3.dll
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\Microsoft.Web.WebView2.Core.dll
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\Microsoft.Web.WebView2.WinForms.dll
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\Microsoft.Web.WebView2.Wpf.dll
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\Microsoft.Web.WebView2.Core.xml
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\Microsoft.Web.WebView2.WinForms.xml
+D:\WorkSpace\spark\SparkClient\bin\Debug\net8.0-windows\Microsoft.Web.WebView2.Wpf.xml
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\SparkClient.csproj.AssemblyReference.cache
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\Language\en_US.baml
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\Language\zh_CN.baml
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\Views\BaseWindow\BaseControl.baml
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\MainWindow.g.cs
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\Views\BaseWindow\BaseControl.g.cs
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\Views\BaseWindow\HomeWindow.g.cs
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\Views\Configuration\AlgorithmConfigPage.g.cs
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\Views\Configuration\ConfigMenuPage.g.cs
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\Views\Configuration\CutConfigPage.g.cs
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\Views\Configuration\LevelConfigPage.g.cs
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\Views\Grading\DiamondSelect.g.cs
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\Views\Grading\GradingResult.g.cs
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\Views\HelperPage.g.cs
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\App.g.cs
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\SparkClient_Content.g.cs
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\GeneratedInternalTypeHelper.g.cs
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\SparkClient_MarkupCompile.cache
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\SparkClient_MarkupCompile.lref
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\App.baml
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\MainWindow.baml
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\Views\BaseWindow\HomeWindow.baml
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\Views\Configuration\AlgorithmConfigPage.baml
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\Views\Configuration\ConfigMenuPage.baml
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\Views\Configuration\CutConfigPage.baml
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\Views\Configuration\LevelConfigPage.baml
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\Views\Grading\DiamondSelect.baml
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\Views\Grading\GradingResult.baml
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\Views\HelperPage.baml
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\SparkClient.g.resources
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\SparkClient.GeneratedMSBuildEditorConfig.editorconfig
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\SparkClient.AssemblyInfoInputs.cache
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\SparkClient.AssemblyInfo.cs
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\SparkClient.csproj.CoreCompileInputs.cache
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\SparkCli.BE712714.Up2Date
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\SparkClient.dll
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\refint\SparkClient.dll
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\SparkClient.pdb
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\SparkClient.genruntimeconfig.cache
+D:\WorkSpace\spark\SparkClient\obj\Debug\net8.0-windows\ref\SparkClient.dll

obj/SparkClient.csproj.nuget.dgspec.json

@@ -1,25 +1,21 @@
 {
   "format": 1,
   "restore": {
-    "F:\\WorkSpace\\Rider\\SparkClient\\SparkClient.csproj": {}
+    "D:\\WorkSpace\\spark\\SparkClient\\SparkClient.csproj": {}
   },
   "projects": {
-    "F:\\WorkSpace\\Rider\\SparkClient\\SparkClient.csproj": {
+    "D:\\WorkSpace\\spark\\SparkClient\\SparkClient.csproj": {
       "version": "1.0.0",
       "restore": {
-        "projectUniqueName": "F:\\WorkSpace\\Rider\\SparkClient\\SparkClient.csproj",
+        "projectUniqueName": "D:\\WorkSpace\\spark\\SparkClient\\SparkClient.csproj",
         "projectName": "SparkClient",
-        "projectPath": "F:\\WorkSpace\\Rider\\SparkClient\\SparkClient.csproj",
+        "projectPath": "D:\\WorkSpace\\spark\\SparkClient\\SparkClient.csproj",
         "packagesPath": "C:\\Users\\tongg\\.nuget\\packages\\",
-        "outputPath": "F:\\WorkSpace\\Rider\\SparkClient\\obj\\",
+        "outputPath": "D:\\WorkSpace\\spark\\SparkClient\\obj\\",
         "projectStyle": "PackageReference",
         "UsingMicrosoftNETSdk": false,
-        "fallbackFolders": [
-          "D:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
-        ],
         "configFilePaths": [
           "C:\\Users\\tongg\\AppData\\Roaming\\NuGet\\NuGet.Config",
-          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
         ],
         "originalTargetFrameworks": [
@@ -27,7 +23,6 @@
         ],
         "sources": {
           "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-          "C:\\Program Files\\dotnet\\library-packs": {},
           "https://api.nuget.org/v3/index.json": {}
         },
         "frameworks": {
@@ -107,7 +102,7 @@
               "privateAssets": "none"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.300/PortableRuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.403/PortableRuntimeIdentifierGraph.json"
         }
       }
     }

obj/SparkClient.csproj.nuget.g.props

@@ -5,13 +5,12 @@
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
     <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\tongg\.nuget\packages\;D:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\tongg\.nuget\packages\</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
     <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.12.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <SourceRoot Include="C:\Users\tongg\.nuget\packages\" />
-    <SourceRoot Include="D:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
   </ItemGroup>
   <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <PkgMicrosoft_Web_WebView2 Condition=" '$(PkgMicrosoft_Web_WebView2)' == '' ">C:\Users\tongg\.nuget\packages\microsoft.web.webview2\1.0.2903.40</PkgMicrosoft_Web_WebView2>

obj/project.assets.json

@@ -1226,25 +1226,20 @@
     ]
   },
   "packageFolders": {
-    "C:\\Users\\tongg\\.nuget\\packages\\": {},
-    "D:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}
+    "C:\\Users\\tongg\\.nuget\\packages\\": {}
   },
   "project": {
     "version": "1.0.0",
     "restore": {
-      "projectUniqueName": "F:\\WorkSpace\\Rider\\SparkClient\\SparkClient.csproj",
+      "projectUniqueName": "D:\\WorkSpace\\spark\\SparkClient\\SparkClient.csproj",
       "projectName": "SparkClient",
-      "projectPath": "F:\\WorkSpace\\Rider\\SparkClient\\SparkClient.csproj",
+      "projectPath": "D:\\WorkSpace\\spark\\SparkClient\\SparkClient.csproj",
       "packagesPath": "C:\\Users\\tongg\\.nuget\\packages\\",
-      "outputPath": "F:\\WorkSpace\\Rider\\SparkClient\\obj\\",
+      "outputPath": "D:\\WorkSpace\\spark\\SparkClient\\obj\\",
       "projectStyle": "PackageReference",
       "UsingMicrosoftNETSdk": false,
-      "fallbackFolders": [
-        "D:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
-      ],
       "configFilePaths": [
         "C:\\Users\\tongg\\AppData\\Roaming\\NuGet\\NuGet.Config",
-        "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
         "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
       ],
       "originalTargetFrameworks": [
@@ -1252,7 +1247,6 @@
       ],
       "sources": {
         "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-        "C:\\Program Files\\dotnet\\library-packs": {},
         "https://api.nuget.org/v3/index.json": {}
       },
       "frameworks": {
@@ -1332,7 +1326,7 @@
             "privateAssets": "none"
           }
         },
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.300/PortableRuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.403/PortableRuntimeIdentifierGraph.json"
       }
     }
   }

obj/project.nuget.cache

@@ -1,8 +1,8 @@
 {
   "version": 2,
-  "dgSpecHash": "evhdzCRbUQY=",
+  "dgSpecHash": "puDO4zX87Qc=",
   "success": true,
-  "projectFilePath": "F:\\WorkSpace\\Rider\\SparkClient\\SparkClient.csproj",
+  "projectFilePath": "D:\\WorkSpace\\spark\\SparkClient\\SparkClient.csproj",
   "expectedPackageFiles": [
     "C:\\Users\\tongg\\.nuget\\packages\\communitytoolkit.mvvm\\8.3.2\\communitytoolkit.mvvm.8.3.2.nupkg.sha512",
     "C:\\Users\\tongg\\.nuget\\packages\\handycontrol\\3.5.1\\handycontrol.3.5.1.nupkg.sha512",

obj/project.packagespec.json

@@ -1 +1 @@
-"restore":{"projectUniqueName":"F:\\WorkSpace\\Rider\\SparkClient\\SparkClient.csproj","projectName":"SparkClient","projectPath":"F:\\WorkSpace\\Rider\\SparkClient\\SparkClient.csproj","outputPath":"F:\\WorkSpace\\Rider\\SparkClient\\obj\\","projectStyle":"PackageReference","UsingMicrosoftNETSdk":false,"fallbackFolders":["D:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net8.0-windows"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"C:\\Program Files\\dotnet\\library-packs":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net8.0-windows7.0":{"targetAlias":"net8.0-windows","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"}}"frameworks":{"net8.0-windows7.0":{"targetAlias":"net8.0-windows","dependencies":{"CommunityToolkit.Mvvm":{"target":"Package","version":"[8.3.2, )"},"HandyControl":{"target":"Package","version":"[3.5.1, )"},"HandyControl.Lang.en":{"target":"Package","version":"[3.5.1, )"},"HandyControls.Lang.zh-CN":{"target":"Package","version":"[3.5.3, )"},"Microsoft.Data.Sqlite":{"target":"Package","version":"[9.0.0, )"},"Microsoft.Web.WebView2":{"target":"Package","version":"[1.0.2903.40, )"},"Newtonsoft.Json":{"target":"Package","version":"[13.0.3, )"},"SQLitePCLRaw.bundle_e_sqlcipher":{"target":"Package","version":"[2.1.10, )"},"log4net":{"target":"Package","version":"[3.0.3, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"},"Microsoft.WindowsDesktop.App.WPF":{"privateAssets":"none"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\8.0.300/PortableRuntimeIdentifierGraph.json"}}
+"restore":{"projectUniqueName":"D:\\WorkSpace\\spark\\SparkClient\\SparkClient.csproj","projectName":"SparkClient","projectPath":"D:\\WorkSpace\\spark\\SparkClient\\SparkClient.csproj","outputPath":"D:\\WorkSpace\\spark\\SparkClient\\obj\\","projectStyle":"PackageReference","UsingMicrosoftNETSdk":false,"originalTargetFrameworks":["net8.0-windows"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net8.0-windows7.0":{"targetAlias":"net8.0-windows","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"}}"frameworks":{"net8.0-windows7.0":{"targetAlias":"net8.0-windows","dependencies":{"CommunityToolkit.Mvvm":{"target":"Package","version":"[8.3.2, )"},"HandyControl":{"target":"Package","version":"[3.5.1, )"},"HandyControl.Lang.en":{"target":"Package","version":"[3.5.1, )"},"HandyControls.Lang.zh-CN":{"target":"Package","version":"[3.5.3, )"},"Microsoft.Data.Sqlite":{"target":"Package","version":"[9.0.0, )"},"Microsoft.Web.WebView2":{"target":"Package","version":"[1.0.2903.40, )"},"Newtonsoft.Json":{"target":"Package","version":"[13.0.3, )"},"SQLitePCLRaw.bundle_e_sqlcipher":{"target":"Package","version":"[2.1.10, )"},"log4net":{"target":"Package","version":"[3.0.3, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"},"Microsoft.WindowsDesktop.App.WPF":{"privateAssets":"none"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\8.0.403/PortableRuntimeIdentifierGraph.json"}}

obj/rider.project.model.nuget.info

@@ -1 +1 @@
-17322841452751745
+17324970701103175

obj/rider.project.restore.info

@@ -1 +1 @@
-17324348137981623
+17324970890369256