1.调整命令控制枚举到Model

BPASmartClient.DRCoffee/CoffeeMachine.cs

@@ -3,6 +3,7 @@ using BPASmartClient.EventBus;
 using BPASmartClient.Helper;
 using BPASmartClient.Message;
 using BPASmartClient.Model;
+using BPASmartClient.Model.咖啡机.Enum;
 using BPASmartClient.Peripheral;
 using BPASmartClient.SerialPort;
 using System;
@@ -180,7 +181,7 @@ namespace BPASmartClient.DRCoffee
                     free = true;
                     Thread.Sleep(200);
                     drinksOrder.CommCmd = DrCoffeeCommCmd.饮品制作指令;
-                    drinksOrder.DrinksCode = (DrCoffeeDrinksCode)((DRCoffee_MakeCoffeeEvent)@event).DrinkCode;
+                    drinksOrder.DrinksCode = ((DRCoffee_MakeCoffeeEvent)@event).DrinkCode;
                     commProxy.SendData(DrCoffee.Packe(drinksOrder));
                     Thread.Sleep(200);
                     free = false;
@@ -217,7 +218,7 @@ namespace BPASmartClient.DRCoffee
                 {
                     free = true;
                     Thread.Sleep(200);
-                    drinksOrder.CommCmd = (DrCoffeeCommCmd)((DRCoffee_CoffeeCommCmdEvent)@event).CommCmd;
+                    drinksOrder.CommCmd = ((DRCoffee_CoffeeCommCmdEvent)@event).CommCmd;
                     commProxy.SendData(DrCoffee.Packe(drinksOrder));
                     Thread.Sleep(200);
                     free = false;

BPASmartClient.DRCoffee/Protocal/DrCoffeePackage.cs

@@ -1,4 +1,5 @@
-using System;
+using BPASmartClient.Model.咖啡机.Enum;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;

BPASmartClient.GSIceCream/IceCreamMachine.cs

@@ -2,6 +2,7 @@
 using BPASmartClient.Helper;
 using BPASmartClient.Message;
 using BPASmartClient.Model;
+using BPASmartClient.Model.冰淇淋.Enum;
 using BPASmartClient.Peripheral;
 using BPASmartClient.SerialPort;
 using System;
@@ -252,11 +253,11 @@ namespace BPASmartClient.GSIceCream
                 {
                     free = true;
                     Thread.Sleep(200);
-                    var data = IcPack.StructureToByte(ICMSG_MODE_DW.Build((MORKI_MODE)((GSIceCream_ModeSetEvent)@event).Mode));
+                    var data = IcPack.StructureToByte(ICMSG_MODE_DW.Build(((GSIceCream_ModeSetEvent)@event).Mode));
                     commProxy.SendData(data);
                     Thread.Sleep(200);
                     free = false;
-                    MessageLog.GetInstance.Show(string.Format("设置模式[{0}]",Enum.GetName(typeof(MORKI_MODE),(MORKI_MODE)((GSIceCream_ModeSetEvent)@event).Mode)));
+                    MessageLog.GetInstance.Show(string.Format("设置模式[{0}]",Enum.GetName(typeof(MORKI_MODE),((GSIceCream_ModeSetEvent)@event).Mode)));
                 }
                 catch (Exception ex)
                 {

BPASmartClient.GSIceCream/Protocal/ICMSG_Heart_DW.cs

@@ -1,4 +1,5 @@
-using System;
+using BPASmartClient.Model.冰淇淋.Enum;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;

BPASmartClient.GSIceCream/Protocal/ICMSG_Heart_UP.cs

@@ -1,4 +1,5 @@
-using System;
+using BPASmartClient.Model.冰淇淋.Enum;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;

BPASmartClient.GSIceCream/Protocal/ICMSG_MODE_DW.cs

@@ -1,4 +1,5 @@
-using System;
+using BPASmartClient.Model.冰淇淋.Enum;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;

BPASmartClient.GSIceCream/Protocal/ICMSG_MODE_UP.cs

@@ -1,4 +1,5 @@
-using System.Runtime.InteropServices;
+using BPASmartClient.Model.冰淇淋.Enum;
+using System.Runtime.InteropServices;
 using static BPASmartClient.GSIceCream.MessageDefine;
 
 namespace BPASmartClient.GSIceCream

BPASmartClient.Model/BPASmartClient.Model.csproj

@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="机器人\" />
+    <Folder Include="机器人\Enum\" />
   </ItemGroup>
 
 </Project>

BPASmartClient.GSIceCream/Protocal/MORKI_MODE.cs → BPASmartClient.Model/冰淇淋/Enum/MORKI_MODE.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.GSIceCream
+namespace BPASmartClient.Model.冰淇淋.Enum
 {
     /*
          * 模式	参数

BPASmartClient.Model/冰淇淋/GSIceCreamEvent.cs

@@ -1,4 +1,5 @@
-using System;
+using BPASmartClient.Model.冰淇淋.Enum;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -17,7 +18,7 @@ namespace BPASmartClient.Model
     /// </summary>
     public class GSIceCream_ModeSetEvent :BaseEvent
     {
-        public byte Mode { get; set; }
+        public MORKI_MODE Mode { get; set; }
     }
 
     /// <summary>

BPASmartClient.SCChip/Protocal/IC_CUP.cs → BPASmartClient.Model/单片机/Enum/IC_CUP.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.SCChip
+namespace BPASmartClient.Model.单片机.Enum
 {
     /// <summary>
     /// 杯子

BPASmartClient.SCChip/Protocal/IC_SE.cs → BPASmartClient.Model/单片机/Enum/IC_SE.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.SCChip
+namespace BPASmartClient.Model.单片机.Enum
 {
     /// <summary>
     /// 冰淇淋舵机

BPASmartClient.Model/单片机/SCChipEvent.cs

@@ -1,4 +1,5 @@
-using System;
+using BPASmartClient.Model.单片机.Enum;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -20,7 +21,7 @@ namespace BPASmartClient.Model.单片机
         /// <summary>
         /// 杯
         /// </summary>
-        public byte Cup { get; set; }
+        public IC_CUP Cup { get; set; }
     }
 
     /// <summary>
@@ -28,7 +29,7 @@ namespace BPASmartClient.Model.单片机
     /// </summary>
     public class SCChip_MakeIceCreamEvent :BaseEvent
     {
-        public byte SteeringEngine { get; set; }
+        public IC_SE SteeringEngine { get; set; }
     }
 
     /// <summary>
@@ -36,7 +37,7 @@ namespace BPASmartClient.Model.单片机
     /// </summary>
     public class SCChip_SESwitchCreamEvent :BaseEvent
     {
-        public byte SteeringEngine { get; set; }
+        public IC_SE SteeringEngine { get; set; }
         public bool IsOpen { get; set; }
     }
 

BPASmartClient.Model/咖啡机/DRCoffeeEvent.cs

@@ -1,4 +1,5 @@
-using System;
+using BPASmartClient.Model.咖啡机.Enum;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -17,7 +18,7 @@ namespace BPASmartClient.Model
     /// </summary>
     public class DRCoffee_MakeCoffeeEvent :BaseEvent
     {
-        public byte DrinkCode { get; set; }
+        public DrCoffeeDrinksCode DrinkCode { get; set; }
     }
 
     /// <summary>
@@ -33,7 +34,7 @@ namespace BPASmartClient.Model
     /// </summary>
     public class DRCoffee_CoffeeCommCmdEvent :BaseEvent
     {
-        public byte CommCmd { get; set; }
+        public DrCoffeeCommCmd CommCmd { get; set; }
     }
 
     /// <summary>

BPASmartClient.DRCoffee/Protocal/DrCoffeeCommCmd.cs → BPASmartClient.Model/咖啡机/Enum/DrCoffeeCommCmd.cs

@@ -4,12 +4,12 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.DRCoffee
+namespace BPASmartClient.Model.咖啡机.Enum
 {
     /// <summary>
     /// 通信指令
     /// </summary>
-    public enum DrCoffeeCommCmd : byte
+    public enum DrCoffeeCommCmd :byte
     {
         无指令 = 0x00,
         饮品制作指令 = 0x01,

BPASmartClient.DRCoffee/Protocal/DrCoffeeDrinksCode.cs → BPASmartClient.Model/咖啡机/Enum/DrCoffeeDrinksCode.cs

@@ -4,12 +4,12 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.DRCoffee
+namespace BPASmartClient.Model.咖啡机.Enum
 {
     /// <summary>
     /// 饮品编号
     /// </summary>
-    public enum DrCoffeeDrinksCode : byte
+    public enum DrCoffeeDrinksCode :byte
     {
         意式浓缩 = 1,
         美式咖啡 = 2,

BPASmartClient.SCChip/ICChipMachine.cs

@@ -3,6 +3,7 @@ using BPASmartClient.Helper;
 using BPASmartClient.Message;
 using BPASmartClient.Model;
 using BPASmartClient.Model.单片机;
+using BPASmartClient.Model.单片机.Enum;
 using BPASmartClient.Peripheral;
 using BPASmartClient.SerialPort;
 using System;
@@ -231,7 +232,7 @@ namespace BPASmartClient.SCChip
             {
                 try
                 {
-                    switch ((IC_CUP)(@event as SCChip_TakeCupEvent).Cup)
+                    switch ((@event as SCChip_TakeCupEvent).Cup)
                     {
                         case IC_CUP.CUP_ICECREAM:
                             status["CompletedTake_CPU_CUP_ICECREAM"] = false;
@@ -251,7 +252,7 @@ namespace BPASmartClient.SCChip
                         wait = DateTime.Now < waitTimeout;
                         if (wait)
                         {
-                            switch ((IC_CUP)(@event as SCChip_TakeCupEvent).Cup)
+                            switch ((@event as SCChip_TakeCupEvent).Cup)
                             {
                                 case IC_CUP.CUP_ICECREAM:
                                     wait = !(bool)status["CompletedTake_CPU_CUP_ICECREAM"];

BPASmartClient/MainWindow.xaml.cs

@@ -1,6 +1,8 @@
 using BPASmartClient.Business;
 using BPASmartClient.EventBus;
 using BPASmartClient.Model;
+using BPASmartClient.Model.冰淇淋.Enum;
+using BPASmartClient.Model.咖啡机.Enum;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -32,8 +34,8 @@ namespace BPASmartClient
         private void Button_Click(object sender, RoutedEventArgs e)
         {
             new Demo_MakeCoffeeEvent() { Id = "1" }.Publish();
-            new DRCoffee_MakeCoffeeEvent() { Id = "1", DrinkCode=120 }.Publish();
-            new DRCoffee_CoffeeCommCmdEvent() { Id = "1",CommCmd = 0x01 }.Publish();
+            new DRCoffee_MakeCoffeeEvent() { Id = "1", DrinkCode= DrCoffeeDrinksCode.两杯意式浓缩 }.Publish();
+            new DRCoffee_CoffeeCommCmdEvent() { Id = "1",CommCmd = DrCoffeeCommCmd.冲煮系统快速冲洗指令}.Publish();
 
         }
     }