Merge branch 'master' of ssh://git.kaiyili-lab.com:2022/huangsucan/ADP

ADP.sln

@@ -45,6 +45,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CANModule", "CANModule\CANM
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "加密狗", "加密狗\加密狗.csproj", "{A35CA316-7B5B-4183-8636-4ECA532B1489}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CurveModule", "CurveModule\CurveModule.csproj", "{84006890-9288-44C4-9D17-FA88F3FDECFA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -131,6 +133,10 @@ Global
 		{A35CA316-7B5B-4183-8636-4ECA532B1489}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A35CA316-7B5B-4183-8636-4ECA532B1489}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A35CA316-7B5B-4183-8636-4ECA532B1489}.Release|Any CPU.Build.0 = Release|Any CPU
+		{84006890-9288-44C4-9D17-FA88F3FDECFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{84006890-9288-44C4-9D17-FA88F3FDECFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{84006890-9288-44C4-9D17-FA88F3FDECFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{84006890-9288-44C4-9D17-FA88F3FDECFA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -145,5 +151,6 @@ Global
 		{170AD4C1-189D-4FBE-B10D-2A4304527834} = {1E92D601-68FC-45F6-8251-BD0F39226E5B}
 		{31F84D0E-3634-4C70-A830-21AF412E3BBF} = {1E92D601-68FC-45F6-8251-BD0F39226E5B}
 		{AF2533DD-599D-49D7-942B-B0C26534D15F} = {1E92D601-68FC-45F6-8251-BD0F39226E5B}
+		{84006890-9288-44C4-9D17-FA88F3FDECFA} = {1E92D601-68FC-45F6-8251-BD0F39226E5B}
 	EndGlobalSection
 EndGlobal

CurveModule/CurveModule.cs

@@ -0,0 +1,20 @@
+
+using CurveModule.Views;
+using System.Reflection;
+
+namespace CurveModule
+{
+    public class CurveModule: IModule
+    {
+        public void OnInitialized(IContainerProvider containerProvider)
+        {
+            IRegionManager regionManager = containerProvider.Resolve<IRegionManager>();
+        }
+
+        public void RegisterTypes(IContainerRegistry containerRegistry)
+        {
+            containerRegistry.RegisterForNavigation<CurveRecallView>("CurveRecallView");
+        }
+    }
+
+}

CurveModule/CurveModule.csproj

@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWPF>true</UseWPF>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Service\Service.csproj" />
+    <ProjectReference Include="..\UIShare\UIShare.csproj" />
+  </ItemGroup>
+
+
+	<ItemGroup>
+		<PackageReference Include="OxyPlot.Wpf" Version="2.2.0" />
+	</ItemGroup>
+
+</Project>

CurveModule/ViewModels/CurveRecallViewModel.cs

@@ -0,0 +1,68 @@
+using Logger;
+using MahApps.Metro.Controls;
+using Model.Entity;
+using Model.Models;
+using NLog.Targets;
+using OxyPlot;
+using Service.Interface;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Data;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using System.Windows.Threading;
+using UIShare.GlobalVariable;
+using UIShare.UIViewModel;
+using UIShare.ViewModelBase;
+
+namespace CurveModule.ViewModels
+{
+    public class CurveRecallViewModel : NavigateViewModelBase, IRegionMemberLifetime, IDisposable
+    {
+        #region 属性
+        public bool KeepAlive => true;
+        #endregion
+
+        #region 命令
+
+        #endregion
+
+        #region 私有字段
+
+        #endregion
+        public CurveRecallViewModel(IContainerProvider containerProvider) : base(containerProvider)
+        {
+
+        }
+
+        #region 命令处理
+
+     
+
+        #endregion
+
+        #region 辅助方法
+
+
+        #endregion
+        #region 生命周期
+
+        public override void OnNavigatedTo(NavigationContext navigationContext)
+        {
+           
+        }
+
+        public void Dispose()
+        {
+          
+        }
+
+        #endregion
+
+    }
+}

CurveModule/Views/CurveRecallView.xaml

@@ -0,0 +1,14 @@
+<UserControl x:Class="CurveModule.Views.CurveRecallView"
+                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+     mc:Ignorable="d"
+     xmlns:prism="http://prismlibrary.com/"
+     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+     prism:ViewModelLocator.AutoWireViewModel="True"
+     d:DesignHeight="1080" d:DesignWidth="1920">
+    <Grid>
+            
+    </Grid>
+</UserControl>

CurveModule/Views/CurveRecallView.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace CurveModule.Views
+{
+    /// <summary>
+    /// CurveRecallView.xaml 的交互逻辑
+    /// </summary>
+    public partial class CurveRecallView : UserControl
+    {
+        public CurveRecallView()
+        {
+            InitializeComponent();
+        }
+    }
+}