修改命名空间

BPASmartClient.Tourism/Alarm.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.TourismCollege
+namespace BPASmartClient.MorkCL
 {
     public class Alarm : IAlarm
     {

BPASmartClient.Tourism/Control_MorkCL.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.TourismCollege
+namespace BPASmartClient.MorkCL
 {
     public class Control_MorkCL : BaseDevice
     {
@@ -22,12 +22,12 @@ namespace BPASmartClient.TourismCollege
 
         public override void MainTask()
         {
-            throw new NotImplementedException();
+            //throw new NotImplementedException();
         }
 
         public override void ReadData()
         {
-            throw new NotImplementedException();
+            //throw new NotImplementedException();
         }
 
         public override void ResetProgram()

BPASmartClient.Tourism/GVL_MorkCL.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.TourismCollege
+namespace BPASmartClient.MorkCL
 {
     public class GVL_MorkCL : IStatus
     {

BPASmartClient.Tourism/GlobalUsing.cs

@@ -7,9 +7,9 @@ global using BPA.Communication;
 global using BPA.Helper;
 global using BPASmartClient.Business;
 global using BPASmartClient.CustomResource;
-global using BPASmartClient.TourismCollege.View;
-global using BPASmartClient.TourismCollege.ViewModel;
-global using BPASmartClient.TourismCollege.Model;
+global using BPASmartClient.MorkCL.View;
+global using BPASmartClient.MorkCL.ViewModel;
+global using BPASmartClient.MorkCL.Model;
 global using System.Collections.Concurrent;
 global using System.Collections.ObjectModel;
 global using BPASmartClient.Device;

BPASmartClient.Tourism/Model/AccessoriesInfo.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.TourismCollege.Model
+namespace BPASmartClient.MorkCL.Model
 {
     /// <summary>
     /// 辅料信息

BPASmartClient.Tourism/Model/ControlData.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.TourismCollege.Model
+namespace BPASmartClient.MorkCL.Model
 {
     internal class ControlData
     {

BPASmartClient.Tourism/Model/EFunc.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.TourismCollege.Model
+namespace BPASmartClient.MorkCL.Model
 {
     /// <summary>
     /// 功能枚举列表

BPASmartClient.Tourism/Model/FuncPar.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.TourismCollege.Model
+namespace BPASmartClient.MorkCL.Model
 {
     /// <summary>
     /// 功能参数信息

BPASmartClient.Tourism/Model/IngredientsInfo.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.TourismCollege.Model
+namespace BPASmartClient.MorkCL.Model
 {
     /// <summary>
     /// 主料信息

BPASmartClient.Tourism/Model/InitData.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.TourismCollege.Model
+namespace BPASmartClient.MorkCL.Model
 {
     internal class InitData
     {

BPASmartClient.Tourism/Model/RawMaterial.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.TourismCollege.Model
+namespace BPASmartClient.MorkCL.Model
 {
     public class RawMaterial : NotifyBase
     {

BPASmartClient.Tourism/Model/SeasoningInfo.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.TourismCollege.Model
+namespace BPASmartClient.MorkCL.Model
 {
     /// <summary>
     /// 调料信息

BPASmartClient.Tourism/Server/DeviceControl.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.TourismCollege.Server
+namespace BPASmartClient.MorkCL.Server
 {
     /// <summary>
     /// 设备控制类

BPASmartClient.Tourism/Server/FryingPanServer.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.TourismCollege.Server
+namespace BPASmartClient.MorkCL.Server
 {
     /// <summary>
     /// 炒锅服务类

BPASmartClient.Tourism/Server/IServer.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.TourismCollege.Server
+namespace BPASmartClient.MorkCL.Server
 {
     internal interface IServer
     {

BPASmartClient.Tourism/Server/ModbusTcpBase.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.TourismCollege.Server
+namespace BPASmartClient.MorkCL.Server
 {
     internal abstract class ModbusTcpBase
     {

BPASmartClient.Tourism/Server/OtherServer.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.TourismCollege.Server
+namespace BPASmartClient.MorkCL.Server
 {
     /// <summary>
     /// 其它服务类

BPASmartClient.Tourism/Server/PressureCookerServer.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.TourismCollege.Server
+namespace BPASmartClient.MorkCL.Server
 {
     /// <summary>
     /// 压力锅服务类

BPASmartClient.Tourism/Server/RobotServer.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.TourismCollege.Server
+namespace BPASmartClient.MorkCL.Server
 {
     /// <summary>
     /// 机器人服务类

BPASmartClient.Tourism/View/AddRawMaterialView.xaml

@@ -1,11 +1,11 @@
 <UserControl
-    x:Class="BPASmartClient.TourismCollege.View.AddRawMaterialView"
+    x:Class="BPASmartClient.MorkCL.View.AddRawMaterialView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:BPASmartClient.TourismCollege.View"
+    xmlns:local="clr-namespace:BPASmartClient.MorkCL.View"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:vm="clr-namespace:BPASmartClient.TourismCollege.ViewModel"
+    xmlns:vm="clr-namespace:BPASmartClient.MorkCL.ViewModel"
     Width="800"
     Height="450"
     mc:Ignorable="d">

BPASmartClient.Tourism/View/AddRawMaterialView.xaml.cs

@@ -12,7 +12,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 
-namespace BPASmartClient.TourismCollege.View
+namespace BPASmartClient.MorkCL.View
 {
     /// <summary>
     /// AddRawMaterialView.xaml 的交互逻辑

BPASmartClient.Tourism/View/Debug.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="BPASmartClient.TourismCollege.View.Debug"
+<UserControl x:Class="BPASmartClient.MorkCL.View.Debug"
              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" 
-             xmlns:local="clr-namespace:BPASmartClient.TourismCollege.View"
+             xmlns:local="clr-namespace:BPASmartClient.MorkCL.View"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <UserControl.Resources>

BPASmartClient.Tourism/View/Debug.xaml.cs

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace BPASmartClient.TourismCollege.View
+namespace BPASmartClient.MorkCL.View
 {
     /// <summary>
     /// Debug.xaml 的交互逻辑

BPASmartClient.Tourism/View/ItemStorageView.xaml

@@ -1,9 +1,9 @@
 <UserControl
-    x:Class="BPASmartClient.TourismCollege.View.ItemStorageView"
+    x:Class="BPASmartClient.MorkCL.View.ItemStorageView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:BPASmartClient.TourismCollege.View"
+    xmlns:local="clr-namespace:BPASmartClient.MorkCL.View"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Name="库位状态"
     d:DesignHeight="450"

BPASmartClient.Tourism/View/ItemStorageView.xaml.cs

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace BPASmartClient.TourismCollege.View
+namespace BPASmartClient.MorkCL.View
 {
     /// <summary>
     /// ItemStorageView.xaml 的交互逻辑

BPASmartClient.Tourism/View/Monitor.xaml

@@ -1,11 +1,11 @@
 <UserControl
-    x:Class="BPASmartClient.TourismCollege.View.Monitor"
+    x:Class="BPASmartClient.MorkCL.View.Monitor"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:BPASmartClient.TourismCollege.View"
+    xmlns:local="clr-namespace:BPASmartClient.MorkCL.View"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:vm="clr-namespace:BPASmartClient.TourismCollege.ViewModel"
+    xmlns:vm="clr-namespace:BPASmartClient.MorkCL.ViewModel"
     Name="监控画面"
     d:DesignHeight="450"
     d:DesignWidth="800"

BPASmartClient.Tourism/View/Monitor.xaml.cs

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace BPASmartClient.TourismCollege.View
+namespace BPASmartClient.MorkCL.View
 {
     /// <summary>
     /// Monitor.xaml 的交互逻辑

BPASmartClient.Tourism/View/ParSet.xaml

@@ -1,9 +1,9 @@
 <UserControl
-    x:Class="BPASmartClient.TourismCollege.View.ParSet"
+    x:Class="BPASmartClient.MorkCL.View.ParSet"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:BPASmartClient.TourismCollege.View"
+    xmlns:local="clr-namespace:BPASmartClient.MorkCL.View"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     d:DesignHeight="450"
     d:DesignWidth="800"

BPASmartClient.Tourism/View/ParSet.xaml.cs

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace BPASmartClient.TourismCollege.View
+namespace BPASmartClient.MorkCL.View
 {
     /// <summary>
     /// ParSer.xaml 的交互逻辑

BPASmartClient.Tourism/View/RecipeManageView.xaml

@@ -1,9 +1,9 @@
 <UserControl
-    x:Class="BPASmartClient.TourismCollege.View.RecipeManageView"
+    x:Class="BPASmartClient.MorkCL.View.RecipeManageView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:BPASmartClient.TourismCollege.View"
+    xmlns:local="clr-namespace:BPASmartClient.MorkCL.View"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     d:DesignHeight="450"
     d:DesignWidth="800"

BPASmartClient.Tourism/View/RecipeManageView.xaml.cs

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace BPASmartClient.TourismCollege.View
+namespace BPASmartClient.MorkCL.View
 {
     /// <summary>
     /// RecipeManageView.xaml 的交互逻辑

BPASmartClient.Tourism/ViewModel/AddRawMaterialViewModel.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.TourismCollege.ViewModel
+namespace BPASmartClient.MorkCL.ViewModel
 {
     public class AddRawMaterialViewModel:NotifyBase
     {

BPASmartClient.Tourism/ViewModel/ItemStorageViewModel.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.TourismCollege.ViewModel
+namespace BPASmartClient.MorkCL.ViewModel
 {
     internal class ItemStorageViewModel
     {

BPASmartClient.Tourism/ViewModel/MonitorViewModel.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.TourismCollege.ViewModel
+namespace BPASmartClient.MorkCL.ViewModel
 {
     public class MonitorViewModel
     {

BPASmartClient.Tourism/ViewModel/RecipeManageViewModel.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.TourismCollege.ViewModel
+namespace BPASmartClient.MorkCL.ViewModel
 {
     public class RecipeManageViewModel
     {

BPASmartClient/BPASmartClient.csproj

@@ -45,7 +45,7 @@
     <ProjectReference Include="..\BPASmartClient.MorkT_Container\BPASmartClient.MorkT_Container.csproj" />
     <ProjectReference Include="..\BPASmartClient.MorkT_HQ\BPASmartClient.MorkTHQ.csproj" />
     <ProjectReference Include="..\BPASmartClient.SCChip\BPASmartClient.SCChip.csproj" />
-    <ProjectReference Include="..\BPASmartClient.Tourism\BPASmartClient.TourismCollege.csproj" />
+    <ProjectReference Include="..\BPASmartClient.Tourism\BPASmartClient.MorkCL.csproj" />
     <ProjectReference Include="..\BPASmartClient.ViewModel\BPASmartClient.ViewModel.csproj" />
   </ItemGroup>
 

SmartClient.sln

@@ -164,7 +164,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MorkMV1", "B
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.FoodStationTest", "BPASmartClient.FoodStationTest\BPASmartClient.FoodStationTest.csproj", "{82D5C479-7C38-41D6-8B42-24D4EC32D94F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BPASmartClient.TourismCollege", "BPASmartClient.Tourism\BPASmartClient.TourismCollege.csproj", "{52F2D7ED-6520-45EF-BCC4-565E5267973B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BPASmartClient.MorkCL", "BPASmartClient.Tourism\BPASmartClient.MorkCL.csproj", "{52F2D7ED-6520-45EF-BCC4-565E5267973B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution