📦 Struct: Adjust name space.

Crequency · Feb 28, 2024 · 0e8e8e9 · 0e8e8e9
1 parent 5029651
commit 0e8e8e9
Show file tree

Hide file tree

Showing 20 changed files with 40 additions and 33 deletions.
diff --git a/KitX Dashboard/Converters/DeviceInfoConverters.cs b/KitX Dashboard/Converters/DeviceInfoConverters.cs
@@ -1,5 +1,5 @@
 using Avalonia.Data.Converters;
-using KitX.Shared.Device;
+using KitX.Shared.CSharp.Device;
 using System;
 using System.Globalization;
 

diff --git a/KitX Dashboard/Converters/OperatingSystemUtils.cs b/KitX Dashboard/Converters/OperatingSystemUtils.cs
@@ -1,5 +1,5 @@
 using Avalonia.Data.Converters;
-using KitX.Shared.Device;
+using KitX.Shared.CSharp.Device;
 using Material.Icons;
 using System;
 using System.Globalization;

diff --git a/KitX Dashboard/KitX.Dashboard.csproj b/KitX Dashboard/KitX.Dashboard.csproj
@@ -102,10 +102,10 @@
     </ItemGroup>
 
     <ItemGroup>
+        <ProjectReference Include="..\..\..\KitX Standard\KitX File Formats\KitX.FileFormats.CSharp\KitX.FileFormats.CSharp.csproj" />
+        <ProjectReference Include="..\..\..\KitX Standard\KitX Shared\KitX.Shared.CSharp\KitX.Shared.CSharp.csproj" />
         <ProjectReference Include="..\KitX Dashboard Assets\KitX.Dashboard.Assets.csproj" />
         <ProjectReference Include="..\KitX Dashboard Fonts\KitX.Dashboard.Fonts.csproj" />
-        <ProjectReference Include="..\..\..\KitX Standard\KitX.Shared\KitX.Shared.csproj" />
-        <ProjectReference Include="..\..\..\KitX Standard\KitX.FileFormats\KitX.FileFormats.csproj" />
         <ProjectReference Include="..\..\..\Reference\Common.Activity\Common.Activity\Common.Activity.csproj" />
         <ProjectReference Include="..\..\..\Reference\Common.BasicHelper\Common.BasicHelper\Common.BasicHelper.csproj" />
         <ProjectReference Include="..\..\..\Reference\Common.ExternalConsole\Common.ExternalConsole.ExternalConsole\Common.ExternalConsole.ExternalConsole.csproj" Condition="$(Is2Publish) == 'False'" />

diff --git a/KitX Dashboard/Managers/PluginsManager.cs b/KitX Dashboard/Managers/PluginsManager.cs
@@ -1,14 +1,15 @@
 using Common.BasicHelper.Utils.Extensions;
 using KitX.Dashboard.Models;
 using KitX.Dashboard.Services;
-using KitX.Shared.Loader;
-using KitX.Shared.Plugin;
+using KitX.Shared.CSharp.Loader;
+using KitX.Shared.CSharp.Plugin;
 using Serilog;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Text.Json;
+using Decoder = KitX.FileFormats.CSharp.ExtensionsPackage.Decoder;
 
 namespace KitX.Dashboard.Managers;
 
@@ -28,7 +29,7 @@ internal static void ImportPlugin(string[] kxpfiles, bool inGraphic = false)
         {
             try
             {
-                var decoder = new FileFormats.ExtensionsPackage.Decoder(item);
+                var decoder = new Decoder(item);
 
                 var rst = decoder.GetLoaderAndPluginInfo();
 

diff --git a/KitX Dashboard/Models/DeviceCase.cs b/KitX Dashboard/Models/DeviceCase.cs
@@ -1,4 +1,4 @@
-using KitX.Shared.Device;
+using KitX.Shared.CSharp.Device;
 using ReactiveUI;
 
 namespace KitX.Dashboard.Models;

diff --git a/KitX Dashboard/Models/PluginInstallation.cs b/KitX Dashboard/Models/PluginInstallation.cs
@@ -1,6 +1,6 @@
-using KitX.Shared.Device;
-using KitX.Shared.Loader;
-using KitX.Shared.Plugin;
+using KitX.Shared.CSharp.Device;
+using KitX.Shared.CSharp.Loader;
+using KitX.Shared.CSharp.Plugin;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 

diff --git a/KitX Dashboard/Network/DevicesNetwork/DevicesDiscoveryServer.cs b/KitX Dashboard/Network/DevicesNetwork/DevicesDiscoveryServer.cs
@@ -3,7 +3,7 @@
 using KitX.Dashboard.Names;
 using KitX.Dashboard.Services;
 using KitX.Dashboard.Views;
-using KitX.Shared.Device;
+using KitX.Shared.CSharp.Device;
 using Serilog;
 using System;
 using System.Collections.Generic;

diff --git a/KitX Dashboard/Network/DevicesNetwork/DevicesOrganizer.cs b/KitX Dashboard/Network/DevicesNetwork/DevicesOrganizer.cs
@@ -2,7 +2,7 @@
 using KitX.Dashboard.Models;
 using KitX.Dashboard.Services;
 using KitX.Dashboard.Views;
-using KitX.Shared.Device;
+using KitX.Shared.CSharp.Device;
 using Serilog;
 using System;
 using System.Collections.Generic;

diff --git a/KitX Dashboard/Network/DevicesNetwork/DevicesServerControllers/DeviceController.cs b/KitX Dashboard/Network/DevicesNetwork/DevicesServerControllers/DeviceController.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Mvc;
+using KitX.Shared.CSharp.Device;
+using Microsoft.AspNetCore.Mvc;
 
 namespace KitX.Dashboard.Network.DevicesNetwork.DevicesServerControllers;
 
@@ -8,9 +9,14 @@ namespace KitX.Dashboard.Network.DevicesNetwork.DevicesServerControllers;
 public class DeviceController : ControllerBase
 {
     [ApiExplorerSettings(GroupName = "V1")]
-    [HttpGet("{name}", Name = nameof(GreetingTest))]
-    public string GreetingTest(string name)
+    [HttpGet("", Name = nameof(GetDeviceInfo))]
+    public DeviceInfo GetDeviceInfo()
     {
-        return $"Hello, {name} !";
+        return DevicesDiscoveryServer.Instance.DefaultDeviceInfo;
+    }
+
+    public void ExchangeKey()
+    {
+
     }
 }
diff --git a/KitX Dashboard/Network/NetworkHelper.cs b/KitX Dashboard/Network/NetworkHelper.cs
@@ -4,7 +4,7 @@
 using KitX.Dashboard.Converters;
 using KitX.Dashboard.Managers;
 using KitX.Dashboard.Views;
-using KitX.Shared.Device;
+using KitX.Shared.CSharp.Device;
 using Serilog;
 using System;
 using System.IO;

diff --git a/KitX Dashboard/Network/PluginsNetwork/PluginConnector.cs b/KitX Dashboard/Network/PluginsNetwork/PluginConnector.cs
@@ -2,10 +2,10 @@
 using Fleck;
 using KitX.Dashboard.Names;
 using KitX.Dashboard.Views;
-using KitX.Shared.Plugin;
-using KitX.Shared.WebCommand;
-using KitX.Shared.WebCommand.Details;
-using KitX.Shared.WebCommand.Infos;
+using KitX.Shared.CSharp.Plugin;
+using KitX.Shared.CSharp.WebCommand;
+using KitX.Shared.CSharp.WebCommand.Details;
+using KitX.Shared.CSharp.WebCommand.Infos;
 using Serilog;
 using System;
 using System.Text.Json;

diff --git a/KitX Dashboard/Network/PluginsNetwork/PluginsServer.cs b/KitX Dashboard/Network/PluginsNetwork/PluginsServer.cs
@@ -1,7 +1,7 @@
 using Fleck;
 using KitX.Dashboard.Configuration;
 using KitX.Dashboard.Services;
-using KitX.Shared.Plugin;
+using KitX.Shared.CSharp.Plugin;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reactive.Linq;

diff --git a/KitX Dashboard/Services/EventService.cs b/KitX Dashboard/Services/EventService.cs
@@ -1,4 +1,4 @@
-using KitX.Shared.Device;
+using KitX.Shared.CSharp.Device;
 using System.Reflection;
 using System;
 

diff --git a/KitX Dashboard/ViewModels/Pages/Controls/Settings_UpdateViewModel.cs b/KitX Dashboard/ViewModels/Pages/Controls/Settings_UpdateViewModel.cs
@@ -5,7 +5,7 @@
 using KitX.Dashboard.Converters;
 using KitX.Dashboard.Models;
 using KitX.Dashboard.Network.DevicesNetwork;
-using KitX.Shared.Device;
+using KitX.Shared.CSharp.Device;
 using MsBox.Avalonia;
 using MsBox.Avalonia.Enums;
 using ReactiveUI;

diff --git a/KitX Dashboard/ViewModels/Pages/LibPageViewModel.cs b/KitX Dashboard/ViewModels/Pages/LibPageViewModel.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 using KitX.Dashboard.Views;
-using KitX.Shared.Plugin;
+using KitX.Shared.CSharp.Plugin;
 using ReactiveUI;
 using System.Collections.ObjectModel;
 using System.Reactive;

diff --git a/KitX Dashboard/ViewModels/Pages/RepoPageViewModel.cs b/KitX Dashboard/ViewModels/Pages/RepoPageViewModel.cs
@@ -4,8 +4,8 @@
 using KitX.Dashboard.Services;
 using KitX.Dashboard.Views.Pages;
 using KitX.Dashboard.Views.Pages.Controls;
-using KitX.Shared.Loader;
-using KitX.Shared.Plugin;
+using KitX.Shared.CSharp.Loader;
+using KitX.Shared.CSharp.Plugin;
 using ReactiveUI;
 using Serilog;
 using System;

diff --git a/KitX Dashboard/ViewModels/PluginDetailWindowViewModel.cs b/KitX Dashboard/ViewModels/PluginDetailWindowViewModel.cs
@@ -3,7 +3,7 @@
 using Avalonia.Media;
 using Avalonia.Styling;
 using KitX.Dashboard.Services;
-using KitX.Shared.Plugin;
+using KitX.Shared.CSharp.Plugin;
 using ReactiveUI;
 using System.Collections.ObjectModel;
 using System.Reactive;

diff --git a/KitX Dashboard/ViewModels/PluginsLaunchWindowViewModel.cs b/KitX Dashboard/ViewModels/PluginsLaunchWindowViewModel.cs
@@ -2,8 +2,8 @@
 using Common.BasicHelper.Utils.Extensions;
 using KitX.Dashboard.Network.PluginsNetwork;
 using KitX.Dashboard.Views;
-using KitX.Shared.Plugin;
-using KitX.Shared.WebCommand;
+using KitX.Shared.CSharp.Plugin;
+using KitX.Shared.CSharp.WebCommand;
 using ReactiveUI;
 using System;
 using System.Collections.Generic;

diff --git a/KitX Dashboard/Views/PluginDetailWindow.axaml.cs b/KitX Dashboard/Views/PluginDetailWindow.axaml.cs
@@ -3,7 +3,7 @@
 using Common.BasicHelper.Graphics.Screen;
 using KitX.Dashboard.Services;
 using KitX.Dashboard.ViewModels;
-using KitX.Shared.Plugin;
+using KitX.Shared.CSharp.Plugin;
 using Serilog;
 using System;
 

diff --git a/KitX Dashboard/Views/ViewInstances.cs b/KitX Dashboard/Views/ViewInstances.cs
@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using KitX.Dashboard.Models;
 using KitX.Dashboard.Services;
-using KitX.Shared.Plugin;
+using KitX.Shared.CSharp.Plugin;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;