ReAdd Vinno.FIS.Sonopost.csproj

FISLib.sln

@@ -46,12 +46,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vinno.FIS.Sonopost.Upgrade"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vinno.FIS.Sonopost.Wireless", "Vinno.FIS.Sonopost.Wireless\Vinno.FIS.Sonopost.Wireless.csproj", "{115E0A13-31AB-4115-939A-E4A1887AB7DC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vinno.FIS.Sonopost", "Vinno.FIS.Sonopost\Vinno.FIS.Sonopost.csproj", "{D4A0B6F5-78BE-4D10-85C3-6EE407EBF7C8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4F0150C2-B5C0-48C4-AD72-1007D7AA32A1} = {4F0150C2-B5C0-48C4-AD72-1007D7AA32A1}
-		{D105C078-EF22-47B0-B376-91AB1E06FA2E} = {D105C078-EF22-47B0-B376-91AB1E06FA2E}
-		{F6848DDA-DC5A-48F9-BE6A-ADF1033DBA37} = {F6848DDA-DC5A-48F9-BE6A-ADF1033DBA37}
-	EndProjectSection
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vinno.FIS.Sonopost", "Vinno.FIS.Sonopost\Vinno.FIS.Sonopost.csproj", "{FEAAF991-8EA5-4D96-BE1A-A8580D05B697}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -119,10 +114,10 @@ Global
 		{115E0A13-31AB-4115-939A-E4A1887AB7DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{115E0A13-31AB-4115-939A-E4A1887AB7DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{115E0A13-31AB-4115-939A-E4A1887AB7DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D4A0B6F5-78BE-4D10-85C3-6EE407EBF7C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D4A0B6F5-78BE-4D10-85C3-6EE407EBF7C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D4A0B6F5-78BE-4D10-85C3-6EE407EBF7C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D4A0B6F5-78BE-4D10-85C3-6EE407EBF7C8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FEAAF991-8EA5-4D96-BE1A-A8580D05B697}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FEAAF991-8EA5-4D96-BE1A-A8580D05B697}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FEAAF991-8EA5-4D96-BE1A-A8580D05B697}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FEAAF991-8EA5-4D96-BE1A-A8580D05B697}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Vinno.FIS.Sonopost/App.config

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <configuration>
-	<startup>
-		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
-	</startup>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
+    </startup>
 	<runtime>
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 			<probing privatePath="x64;TRTC;" />

Vinno.FIS.Sonopost/App.xaml

@@ -1,7 +1,9 @@
 <Application x:Class="Vinno.FIS.Sonopost.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:Vinno.FIS.Sonopost"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
+         
     </Application.Resources>
-</Application>
+</Application>

Vinno.FIS.Sonopost/Properties/AssemblyInfo.cs

@@ -1,4 +1,6 @@
 using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Windows;
 
@@ -10,7 +12,7 @@ using System.Windows;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Vinno.FIS.Sonopost")]
-[assembly: AssemblyCopyright("Copyright ©  2021")]
+[assembly: AssemblyCopyright("Copyright ©  2023")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -28,6 +30,7 @@ using System.Windows;
 
 //[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
 
+
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //主题特定资源词典所处位置
                                      //(未在页面中找到资源时使用，
@@ -37,7 +40,8 @@ using System.Windows;
                                               //、应用程序或任何主题专用资源字典中找到时使用)
 )]
 
-// 程序集的版本信息由下列四个值组成:
+
+// 程序集的版本信息由下列四个值组成: 
 //
 //      主版本
 //      次版本

Vinno.FIS.Sonopost/Properties/Resources.Designer.cs

@@ -1,61 +1,69 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
+//     运行时版本: 4.0.30319.42000
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Vinno.FIS.Sonopost.Properties {
-    using System;
-    
-    
+namespace Vinno.FIS.Sonopost.Properties
+{
+
+
     /// <summary>
-    ///   一个强类型的资源类，用于查找本地化的字符串等。
+    ///   强类型资源类，用于查找本地化字符串等。
     /// </summary>
     // 此类是由 StronglyTypedResourceBuilder
     // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
     // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
     // (以 /str 作为命令选项)，或重新生成 VS 项目。
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
+    internal class Resources
+    {
+
         private static global::System.Resources.ResourceManager resourceMan;
-        
+
         private static global::System.Globalization.CultureInfo resourceCulture;
-        
+
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
+        internal Resources()
+        {
         }
-        
+
         /// <summary>
-        ///   返回此类使用的缓存的 ResourceManager 实例。
+        ///   返回此类使用的缓存 ResourceManager 实例。
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
+        internal static global::System.Resources.ResourceManager ResourceManager
+        {
+            get
+            {
+                if ((resourceMan == null))
+                {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Vinno.FIS.Sonopost.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-        
+
         /// <summary>
         ///   重写当前线程的 CurrentUICulture 属性，对
         ///   使用此强类型资源类的所有资源查找执行重写。
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
+        internal static global::System.Globalization.CultureInfo Culture
+        {
+            get
+            {
                 return resourceCulture;
             }
-            set {
+            set
+            {
                 resourceCulture = value;
             }
         }

Vinno.FIS.Sonopost/Properties/Settings.Designer.cs

@@ -1,24 +1,28 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Vinno.FIS.Sonopost.Properties {
-    
-    
+namespace Vinno.FIS.Sonopost.Properties
+{
+
+
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+    {
+
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
+
+        public static Settings Default
+        {
+            get
+            {
                 return defaultInstance;
             }
         }

Vinno.FIS.Sonopost/Vinno.FIS.Sonopost.csproj

@@ -2,25 +2,21 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{D4A0B6F5-78BE-4D10-85C3-6EE407EBF7C8}</ProjectGuid>
+    <ProjectGuid>{FEAAF991-8EA5-4D96-BE1A-A8580D05B697}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Vinno.FIS.Sonopost</RootNamespace>
-    <AssemblyName>Sonopost</AssemblyName>
+    <AssemblyName>Vinno.FIS.Sonopost</AssemblyName>
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -28,22 +24,18 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\Bin\WindowsSonopost\</OutputPath>
+    <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Dicom.Core">
       <HintPath>..\packages\Dicom\Dicom.Core.dll</HintPath>
@@ -51,34 +43,77 @@
     <Reference Include="Dicom.Native64">
       <HintPath>..\packages\Dicom\Dicom.Native64.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
     <Reference Include="System" />
-    <Reference Include="System.Core" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.IO.Compression" />
     <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Management" />
-    <Reference Include="System.Management.Automation" />
+    <Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\System.Management.Automation.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
     <Reference Include="Vinno.IUS.Common">
       <HintPath>..\packages\Vinno.IUS.Common.dll</HintPath>
     </Reference>
     <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
     <ApplicationDefinition Include="App.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="WebApi\BaseController.cs" />
+    <Compile Include="WebApi\Controllers\DicomController.cs" />
+    <Compile Include="WebApi\Controllers\LiveController.cs" />
+    <Compile Include="WebApi\Controllers\NetworkController.cs" />
+    <Compile Include="WebApi\Controllers\ServerController.cs" />
+    <Compile Include="WebApi\Controllers\SystemController.cs" />
+    <Compile Include="WebApi\Models\DicomFailActionRequest.cs" />
+    <Compile Include="WebApi\Models\DicomFailListRequest.cs" />
+    <Compile Include="WebApi\Models\DicomSonoSettingModel.cs" />
+    <Compile Include="WebApi\Models\DicomStationSettingModel.cs" />
+    <Compile Include="WebApi\Models\LivePreviewRequest.cs" />
+    <Compile Include="WebApi\Models\MicDeviceInfoModel.cs" />
+    <Compile Include="WebApi\Models\NetworkAdvanceSettingItem.cs" />
+    <Compile Include="WebApi\Models\NetworkAdvaneSettingListModel.cs" />
+    <Compile Include="WebApi\Models\NetworkBaseRequest.cs" />
+    <Compile Include="WebApi\Models\NetworkConnectWifiRequest.cs" />
+    <Compile Include="WebApi\Models\NetworkInterfaceModel.cs" />
+    <Compile Include="WebApi\Models\NetworkWifiInfoResult.cs" />
+    <Compile Include="WebApi\Models\NetworkWireListModel.cs" />
+    <Compile Include="WebApi\Models\PagedListRequest.cs" />
+    <Compile Include="WebApi\Models\PagedListResponse.cs" />
+    <Compile Include="WebApi\Models\RainbowImageDetectSettingItem.cs" />
+    <Compile Include="WebApi\Models\Result.cs" />
+    <Compile Include="WebApi\Models\ServerLoginInfoResult.cs" />
+    <Compile Include="WebApi\Models\ServerLoginRequest.cs" />
+    <Compile Include="WebApi\Models\ServerLoginResult.cs" />
+    <Compile Include="WebApi\Models\ServerNodeRequest.cs" />
+    <Compile Include="WebApi\Models\ServerRegisterRequest.cs" />
+    <Compile Include="WebApi\Models\SetMiniOledLanguageRequest.cs" />
+    <Compile Include="WebApi\Models\SonoInfoModel.cs" />
+    <Compile Include="WebApi\Models\SystemGetLogRequest.cs" />
+    <Compile Include="WebApi\Models\VCloudLoginRequest.cs" />
+    <Compile Include="WebApi\Models\VideoDeviceInfoModel.cs" />
+    <Compile Include="WebApi\Models\WifiPointModel.cs" />
+    <Compile Include="WebApi\WebApiAttribute.cs" />
+    <Compile Include="WebApi\WebApiEngine.cs" />
+    <Compile Include="WebHost.cs" />
+    <Page Include="MainWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -92,19 +127,19 @@
     <Compile Include="Features\AfterSales\PushPatchAfterSalesTask.cs" />
     <Compile Include="Features\Config\DicomSetting.cs" />
     <Compile Include="Features\Config\HardwareSetting.cs" />
+    <Compile Include="Features\Config\NetworkSetting.cs" />
     <Compile Include="Features\Config\OledSetting.cs" />
     <Compile Include="Features\Config\ServerSetting.cs" />
-    <Compile Include="Features\Config\SonopostUserDefinedSettingInfo.cs" />
     <Compile Include="Features\Config\SonopostSystemSettingInfo.cs" />
-    <Compile Include="Features\Config\NetworkSetting.cs" />
+    <Compile Include="Features\Config\SonopostUserDefinedSettingInfo.cs" />
     <Compile Include="Features\Config\UpdateSetting.cs" />
     <Compile Include="Features\Config\WebSetting.cs" />
     <Compile Include="Features\Dicom\AcceptedTypes.cs" />
     <Compile Include="Features\Dicom\DicomCacheDB.cs" />
+    <Compile Include="Features\Dicom\DicomFileExtension.cs" />
     <Compile Include="Features\Dicom\DicomForwardQueue.cs" />
     <Compile Include="Features\Dicom\DicomLog.cs" />
     <Compile Include="Features\Dicom\DicomOperateQueue.cs" />
-    <Compile Include="Features\Dicom\DicomFileExtension.cs" />
     <Compile Include="Features\Dicom\DicomResourceConstant.cs" />
     <Compile Include="Features\Dicom\DicomUploadContext.cs" />
     <Compile Include="Features\Dicom\DicomUploadQueue.cs" />
@@ -139,7 +174,15 @@
     <Compile Include="Helpers\UpgradeHelper.cs" />
     <Compile Include="MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
+      <SubType>Code</SubType>
     </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Managers\AfterSalesManager.cs" />
+    <Compile Include="Managers\AppManager.cs" />
+    <Compile Include="Managers\ConfigManager.cs" />
+    <Compile Include="Managers\DeviceManager.cs" />
+    <Compile Include="Managers\DicomServerManager.cs" />
     <Compile Include="Managers\ExternalMemoryManager.cs" />
     <Compile Include="Managers\FISManager.cs" />
     <Compile Include="Managers\Interfaces\IAfterSalesManager.cs" />
@@ -150,18 +193,13 @@
     <Compile Include="Managers\Interfaces\IFISManager.cs" />
     <Compile Include="Managers\Interfaces\ILiveVideoManager.cs" />
     <Compile Include="Managers\Interfaces\ILoginManager.cs" />
-    <Compile Include="Managers\Interfaces\IOledManager.cs" />
     <Compile Include="Managers\Interfaces\INetworkManager.cs" />
+    <Compile Include="Managers\Interfaces\IOledManager.cs" />
     <Compile Include="Managers\Interfaces\IRemedicalManager.cs" />
     <Compile Include="Managers\Interfaces\ISonopostManager.cs" />
     <Compile Include="Managers\Interfaces\ITerminalClientManager.cs" />
     <Compile Include="Managers\Interfaces\ITestManager.cs" />
     <Compile Include="Managers\Interfaces\IVersionCheckManager.cs" />
-    <Compile Include="Managers\AfterSalesManager.cs" />
-    <Compile Include="Managers\AppManager.cs" />
-    <Compile Include="Managers\ConfigManager.cs" />
-    <Compile Include="Managers\DeviceManager.cs" />
-    <Compile Include="Managers\DicomServerManager.cs" />
     <Compile Include="Managers\LiveVideoManager.cs" />
     <Compile Include="Managers\LoginManager.cs" />
     <Compile Include="Managers\NetworkManager.cs" />
@@ -184,133 +222,89 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <Compile Include="WebApi\BaseController.cs" />
-    <Compile Include="WebApi\Controllers\DicomController.cs" />
-    <Compile Include="WebApi\Controllers\LiveController.cs" />
-    <Compile Include="WebApi\Controllers\NetworkController.cs" />
-    <Compile Include="WebApi\Controllers\ServerController.cs" />
-    <Compile Include="WebApi\Controllers\SystemController.cs" />
-    <Compile Include="WebApi\Models\DicomFailListRequest.cs" />
-    <Compile Include="WebApi\Models\DicomFailActionRequest.cs" />
-    <Compile Include="WebApi\Models\DicomSonoSettingModel.cs" />
-    <Compile Include="WebApi\Models\DicomStationSettingModel.cs" />
-    <Compile Include="WebApi\Models\LivePreviewRequest.cs" />
-    <Compile Include="WebApi\Models\MicDeviceInfoModel.cs" />
-    <Compile Include="WebApi\Models\NetworkAdvanceSettingItem.cs" />
-    <Compile Include="WebApi\Models\NetworkAdvaneSettingListModel.cs" />
-    <Compile Include="WebApi\Models\NetworkBaseRequest.cs" />
-    <Compile Include="WebApi\Models\NetworkConnectWifiRequest.cs" />
-    <Compile Include="WebApi\Models\NetworkInterfaceModel.cs" />
-    <Compile Include="WebApi\Models\NetworkWifiInfoResult.cs" />
-    <Compile Include="WebApi\Models\NetworkWireListModel.cs" />
-    <Compile Include="WebApi\Models\PagedListRequest.cs" />
-    <Compile Include="WebApi\Models\PagedListResponse.cs" />
-    <Compile Include="WebApi\Models\RainbowImageDetectSettingItem.cs" />
-    <Compile Include="WebApi\Models\Result.cs" />
-    <Compile Include="WebApi\Models\ServerLoginInfoResult.cs" />
-    <Compile Include="WebApi\Models\ServerLoginRequest.cs" />
-    <Compile Include="WebApi\Models\ServerLoginResult.cs" />
-    <Compile Include="WebApi\Models\ServerNodeRequest.cs" />
-    <Compile Include="WebApi\Models\ServerRegisterRequest.cs" />
-    <Compile Include="WebApi\Models\SetMiniOledLanguageRequest.cs" />
-    <Compile Include="WebApi\Models\SonoInfoModel.cs" />
-    <Compile Include="WebApi\Models\SystemGetLogRequest.cs" />
-    <Compile Include="WebApi\Models\VCloudLoginRequest.cs" />
-    <Compile Include="WebApi\Models\VideoDeviceInfoModel.cs" />
-    <Compile Include="WebApi\Models\WifiPointModel.cs" />
-    <Compile Include="WebApi\WebApiAttribute.cs" />
-    <Compile Include="WebApi\WebApiEngine.cs" />
-    <Compile Include="WebHost.cs" />
-    <Page Include="MainWindow.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
     <None Include="app.manifest" />
+    <None Include="Assets\wwwroot\css\index.less" />
+    <None Include="Assets\wwwroot\lang\en-us.json" />
+    <None Include="Assets\wwwroot\lang\zh-cn.json" />
+    <None Include="Assets\wwwroot\libs\jquery\jquery.min.map" />
+    <None Include="Assets\wwwroot\libs\layui\font\iconfont.eot" />
+    <Resource Include="Assets\wwwroot\libs\layui\font\iconfont.ttf" />
+    <None Include="Assets\wwwroot\libs\layui\font\iconfont.woff" />
+    <None Include="Assets\wwwroot\libs\layui\font\iconfont.woff2" />
+    <None Include="Assets\wwwroot\README.md" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <None Include="Resources\UploadVidTags.conf">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
+    <None Include="Resources\UploadVidTags.conf" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Assets\wwwroot\libs\jquery\jquery.js" />
-    <EmbeddedResource Include="Assets\wwwroot\libs\jquery\jquery.min.js" />
-    <EmbeddedResource Include="Assets\wwwroot\libs\jquery\jquery.min.map" />
-    <EmbeddedResource Include="Assets\wwwroot\libs\jquery\jquery.qrcode.min.js" />
-    <EmbeddedResource Include="Assets\wwwroot\libs\layui\css\layui.css" />
-    <EmbeddedResource Include="Assets\wwwroot\libs\layui\css\modules\code.css" />
-    <EmbeddedResource Include="Assets\wwwroot\libs\layui\css\modules\laydate\default\laydate.css" />
-    <EmbeddedResource Include="Assets\wwwroot\libs\layui\css\modules\layer\default\icon-ext.png" />
-    <EmbeddedResource Include="Assets\wwwroot\libs\layui\css\modules\layer\default\icon.png" />
-    <EmbeddedResource Include="Assets\wwwroot\libs\layui\css\modules\layer\default\layer.css" />
-    <EmbeddedResource Include="Assets\wwwroot\libs\layui\css\modules\layer\default\loading-0.gif" />
-    <EmbeddedResource Include="Assets\wwwroot\libs\layui\css\modules\layer\default\loading-1.gif" />
-    <EmbeddedResource Include="Assets\wwwroot\libs\layui\css\modules\layer\default\loading-2.gif" />
-    <EmbeddedResource Include="Assets\wwwroot\libs\layui\font\iconfont.svg" />
-    <EmbeddedResource Include="Assets\wwwroot\libs\layui\font\iconfont.eot" />
-    <EmbeddedResource Include="Assets\wwwroot\libs\layui\font\iconfont.ttf" />
-    <EmbeddedResource Include="Assets\wwwroot\libs\layui\font\iconfont.woff" />
-    <EmbeddedResource Include="Assets\wwwroot\libs\layui\font\iconfont.woff2" />
-    <EmbeddedResource Include="Assets\wwwroot\libs\layui\layui.js" />
-    <EmbeddedResource Include="Assets\wwwroot\libs\polyfill\polyfill.js" />
-    <EmbeddedResource Include="Assets\wwwroot\libs\polyfill\polyfill.min.js" />
-    <EmbeddedResource Include="Assets\wwwroot\lang\en-us.json" />
-    <EmbeddedResource Include="Assets\wwwroot\lang\zh-cn.json" />
-    <EmbeddedResource Include="Assets\wwwroot\favicon.ico" />
-    <EmbeddedResource Include="Assets\wwwroot\css\index.css" />
-    <EmbeddedResource Include="Assets\wwwroot\js\index.js" />
-    <EmbeddedResource Include="Assets\wwwroot\js\prepare.js" />
-    <EmbeddedResource Include="Assets\wwwroot\index.html" />
-    <EmbeddedResource Include="Assets\wwwroot\pages\404.html" />
-    <EmbeddedResource Include="Assets\wwwroot\images\icon\success.png" />
-    <EmbeddedResource Include="Assets\wwwroot\images\icon\warning.png" />
-    <EmbeddedResource Include="Assets\wwwroot\images\icon\wifi-1.png" />
-    <EmbeddedResource Include="Assets\wwwroot\images\icon\wifi-2.png" />
-    <EmbeddedResource Include="Assets\wwwroot\images\icon\wifi-3.png" />
-    <EmbeddedResource Include="Assets\wwwroot\images\icon\wifi-4.png" />
-    <EmbeddedResource Include="Assets\wwwroot\images\headlogo_h100.png" />
-    <EmbeddedResource Include="Assets\wwwroot\images\live-preview.png" />
-    <EmbeddedResource Include="Assets\wwwroot\pages\server\login.html" />
-    <EmbeddedResource Include="Assets\wwwroot\pages\server\networkcheck.html" />
-    <EmbeddedResource Include="Assets\wwwroot\pages\dicom\faillist.html" />
-    <EmbeddedResource Include="Assets\wwwroot\pages\dicom\sono.html" />
-    <EmbeddedResource Include="Assets\wwwroot\pages\dicom\station.html" />
-    <EmbeddedResource Include="Assets\wwwroot\pages\live\sono.html" />
-    <EmbeddedResource Include="Assets\wwwroot\pages\live\camera01.html" />
-    <EmbeddedResource Include="Assets\wwwroot\pages\live\camera02.html" />
-    <EmbeddedResource Include="Assets\wwwroot\pages\live\mic.html" />
-    <EmbeddedResource Include="Assets\wwwroot\pages\network\dns.html" />
-    <EmbeddedResource Include="Assets\wwwroot\pages\network\wifi.html" />
-    <EmbeddedResource Include="Assets\wwwroot\pages\network\wire.html" />
-    <EmbeddedResource Include="Assets\wwwroot\pages\network\advance.html" />
-    <EmbeddedResource Include="Assets\wwwroot\pages\system\log.html" />
-    <EmbeddedResource Include="Assets\wwwroot\pages\system\oledlang.html" />
-    <EmbeddedResource Include="Assets\wwwroot\pages\system\recover.html" />
-    <EmbeddedResource Include="Assets\wwwroot\pages\system\restart.html" />
-    <EmbeddedResource Include="Assets\wwwroot\pages\system\version.html" />
-    <EmbeddedResource Include="Assets\wwwroot\pages\system\rainbowimage.html" />
-    <EmbeddedResource Include="Assets\wwwroot\pages\system\vcloudlogin.html" />
-    <EmbeddedResource Include="Assets\wwwroot\components\DeviceWsPreview.html" />
-    <EmbeddedResource Include="Assets\wwwroot\components\WifiConnectionItem.html" />
-    <EmbeddedResource Include="Assets\wwwroot\components\NetworkSettingForm.html" />
-    <EmbeddedResource Include="Assets\wwwroot\components\NetworkAdapterItem.html" />
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\wifi_1.png" />
-    <EmbeddedResource Include="Resources\wifi_2.png" />
-    <EmbeddedResource Include="Resources\wifi_3.png" />
-    <EmbeddedResource Include="Resources\wifi_4.png" />
+    <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Assets\wwwroot\README.md" />
-    <None Include="Assets\wwwroot\css\index.less" />
+    <Content Include="Assets\wwwroot\components\DeviceWsPreview.html" />
+    <Content Include="Assets\wwwroot\components\NetworkAdapterItem.html" />
+    <Content Include="Assets\wwwroot\components\NetworkSettingForm.html" />
+    <Content Include="Assets\wwwroot\components\WifiConnectionItem.html" />
+    <Content Include="Assets\wwwroot\css\index.css" />
+    <Resource Include="Assets\wwwroot\favicon.ico" />
+    <Resource Include="Assets\wwwroot\images\headlogo_h100.png" />
+    <Resource Include="Assets\wwwroot\images\icon\success.png" />
+    <Resource Include="Assets\wwwroot\images\icon\warning.png" />
+    <Resource Include="Assets\wwwroot\images\icon\wifi-1.png" />
+    <Resource Include="Assets\wwwroot\images\icon\wifi-2.png" />
+    <Resource Include="Assets\wwwroot\images\icon\wifi-3.png" />
+    <Resource Include="Assets\wwwroot\images\icon\wifi-4.png" />
+    <Resource Include="Assets\wwwroot\images\live-preview.png" />
+    <Content Include="Assets\wwwroot\index.html" />
+    <Content Include="Assets\wwwroot\js\index.js" />
+    <Content Include="Assets\wwwroot\js\prepare.js" />
+    <Content Include="Assets\wwwroot\libs\jquery\jquery.js" />
+    <Content Include="Assets\wwwroot\libs\jquery\jquery.min.js" />
+    <Content Include="Assets\wwwroot\libs\jquery\jquery.qrcode.min.js" />
+    <Content Include="Assets\wwwroot\libs\layui.js" />
+    <Content Include="Assets\wwwroot\libs\layui\css\layui.css" />
+    <Content Include="Assets\wwwroot\libs\layui\css\modules\code.css" />
+    <Content Include="Assets\wwwroot\libs\layui\css\modules\laydate\default\laydate.css" />
+    <Resource Include="Assets\wwwroot\libs\layui\css\modules\layer\default\icon-ext.png" />
+    <Resource Include="Assets\wwwroot\libs\layui\css\modules\layer\default\icon.png" />
+    <Content Include="Assets\wwwroot\libs\layui\css\modules\layer\default\layer.css" />
+    <Resource Include="Assets\wwwroot\libs\layui\css\modules\layer\default\loading-0.gif" />
+    <Resource Include="Assets\wwwroot\libs\layui\css\modules\layer\default\loading-1.gif" />
+    <Resource Include="Assets\wwwroot\libs\layui\css\modules\layer\default\loading-2.gif" />
+    <Content Include="Assets\wwwroot\libs\layui\font\iconfont.svg" />
+    <Content Include="Assets\wwwroot\libs\layui\layui.js" />
+    <Content Include="Assets\wwwroot\libs\polyfill\polyfill.js" />
+    <Content Include="Assets\wwwroot\libs\polyfill\polyfill.min.js" />
+    <Content Include="Assets\wwwroot\pages\404.html" />
+    <Content Include="Assets\wwwroot\pages\dicom\faillist.html" />
+    <Content Include="Assets\wwwroot\pages\dicom\sono.html" />
+    <Content Include="Assets\wwwroot\pages\dicom\station.html" />
+    <Content Include="Assets\wwwroot\pages\live\camera01.html" />
+    <Content Include="Assets\wwwroot\pages\live\camera02.html" />
+    <Content Include="Assets\wwwroot\pages\live\mic.html" />
+    <Content Include="Assets\wwwroot\pages\live\sono.html" />
+    <Content Include="Assets\wwwroot\pages\network\advance.html" />
+    <Content Include="Assets\wwwroot\pages\network\dns.html" />
+    <Content Include="Assets\wwwroot\pages\network\wifi.html" />
+    <Content Include="Assets\wwwroot\pages\network\wire.html" />
+    <Content Include="Assets\wwwroot\pages\server\login.html" />
+    <Content Include="Assets\wwwroot\pages\server\networkcheck.html" />
+    <Content Include="Assets\wwwroot\pages\system\log.html" />
+    <Content Include="Assets\wwwroot\pages\system\oledlang.html" />
+    <Content Include="Assets\wwwroot\pages\system\rainbowimage.html" />
+    <Content Include="Assets\wwwroot\pages\system\recover.html" />
+    <Content Include="Assets\wwwroot\pages\system\restart.html" />
+    <Content Include="Assets\wwwroot\pages\system\vcloudlogin.html" />
+    <Content Include="Assets\wwwroot\pages\system\version.html" />
+    <Resource Include="Resources\wifi_1.png" />
+    <Resource Include="Resources\wifi_2.png" />
+    <Resource Include="Resources\wifi_3.png" />
+    <Resource Include="Resources\wifi_4.png" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FISSDK\FISIMPL\FISIMPL.csproj">
@@ -334,6 +328,11 @@
       <Name>Vinno.vCloud.FIS.CrossPlatform.Windows</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Text.Json">
+      <Version>5.0.2</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>if not exist "$(TargetDir)x64" mkdir "$(TargetDir)x64"