diff --git a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj index 1fbb2759..5ab4bd64 100644 --- a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj +++ b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj @@ -171,10 +171,6 @@ - - - - diff --git a/BPASmartClient.DRCoffee/CoffeeMachine.cs b/BPASmartClient.DRCoffee/CoffeeMachine.cs index d1d8ebfd..acdff8f7 100644 --- a/BPASmartClient.DRCoffee/CoffeeMachine.cs +++ b/BPASmartClient.DRCoffee/CoffeeMachine.cs @@ -148,6 +148,7 @@ namespace BPASmartClient.DRCoffee lastRefreshTime = DateTime.Now; IsConnected = OnLine; + status["CoffeConnected"] = OnLine; new DRCoffee_CoffeEndCookEvent() { DeviceId = DeviceId }.Publish(); } else status["Status"] = package.Status; diff --git a/BPASmartClient.GSIceCream/IceCreamMachine.cs b/BPASmartClient.GSIceCream/IceCreamMachine.cs index 972a4b12..bf6f293d 100644 --- a/BPASmartClient.GSIceCream/IceCreamMachine.cs +++ b/BPASmartClient.GSIceCream/IceCreamMachine.cs @@ -88,12 +88,6 @@ namespace BPASmartClient.GSIceCream ThreadManage.GetInstance().StartLong(new Action(() => { - status["test"] = 0; - for (int i = 0; i < 1000; i++) - { - status["test"] = (int)status["test"] + 1; - Thread.Sleep(1000); - } ResolveMsg(); }), "冰淇淋解析线程"); } @@ -183,6 +177,7 @@ namespace BPASmartClient.GSIceCream private void ProcessHeart(ICMSG_Heart_UP heartUpMsg) { IsConnected = OnLine; + status["IceCreamIsConnected"] = OnLine; status["CurrentMode"] = heartUpMsg.MS; status["YLWD"] = BitConverter.ToInt16(new byte[] { heartUpMsg.YLWD_L,heartUpMsg.YLWD_H },0); status["HQWD"] = BitConverter.ToInt16(new byte[] { heartUpMsg.HQWD_L,heartUpMsg.HQWD_H },0); diff --git a/BPASmartClient.Lebai/LebaiRobot.cs b/BPASmartClient.Lebai/LebaiRobot.cs index d5496a31..654d4ac5 100644 --- a/BPASmartClient.Lebai/LebaiRobot.cs +++ b/BPASmartClient.Lebai/LebaiRobot.cs @@ -45,6 +45,7 @@ namespace BPASmartClient.Lebai ThreadManage.GetInstance().StartLong(() => { IsConnected = LebaiHelper.GetInstance().IsConnected; + status["RobotIsConnected"] = LebaiHelper.GetInstance().IsConnected; status["OK"] = LebaiHelper.GetInstance().GetValueAsync().Ok; status["Value"] = LebaiHelper.GetInstance().GetValueAsync().Value; if (LebaiHelper.GetInstance().robotData != null) status["RobotMode"] = LebaiHelper.GetInstance().robotData.RobotMode.Mode; diff --git a/BPASmartClient.MorkT/Control_MorkT.cs b/BPASmartClient.MorkT/Control_MorkT.cs index 675eafab..84befbb3 100644 --- a/BPASmartClient.MorkT/Control_MorkT.cs +++ b/BPASmartClient.MorkT/Control_MorkT.cs @@ -40,11 +40,7 @@ namespace BPASmartClient.MorkT morkT.MakeCoffeeOrder.OrderStatus = 1; }); int i = 0; - ////ThreadManage.GetInstance().StartLong(new Action(() => - ////{ - //// i = (int)Status.status["GSIceCream.IceCreamMachine.test"]; - - ////}),"test"); + MessageLog.GetInstance.Show("MORKT 设备初始化完成"); @@ -71,16 +67,6 @@ namespace BPASmartClient.MorkT public override void MainTask() { - GetStatus("RobotMode", new Action((o) => - { - - - })); - - - - - MakeCoffeeProcess(); EventBus.EventBus.GetInstance().Publish(new LebaiRobot_GetInputEvent { DeviceId = DeviceId, Pin = 0 },(o)=> { @@ -98,7 +84,10 @@ namespace BPASmartClient.MorkT public override void ReadData() { - + GetStatus("IsConnected", new Action((o) => + { + + })); } @@ -223,7 +212,7 @@ namespace BPASmartClient.MorkT private void Wait(int value = 101) { - while (!((bool)Status.status["Lebai.LebaiRobot.OK"] && (int)Status.status["Lebai.LebaiRobot.Value"] == value)) + while (!((bool)peripheralStatus["OK"] && (int)peripheralStatus["Value"] == value)) { Thread.Sleep(5); } @@ -364,14 +353,14 @@ namespace BPASmartClient.MorkT { if (IceCreamCanMake()) { - if(Status.status.ContainsKey("GSIceCream.IceCreamMachine.CurrentMode")) + if(peripheralStatus.ContainsKey("CurrentMode")) { - if ((MORKI_MODE)Status.status["GSIceCream.IceCreamMachine.CurrentMode"] != MORKI_MODE.制冷模式) new GSIceCream_ModeSetEvent() { Mode = MORKI_MODE.制冷模式 }.Publish(); + if ((MORKI_MODE)peripheralStatus["CurrentMode"] != MORKI_MODE.制冷模式) new GSIceCream_ModeSetEvent() { Mode = MORKI_MODE.制冷模式 }.Publish(); } - if(Status.status.ContainsKey("GSIceCream.IceCreamMachine.CBX")) + if(peripheralStatus.ContainsKey(".CBX")) { - if ((short)Status.status["GSIceCream.IceCreamMachine.CBX"] >= 86 && morkT.morkOrderPushesIceCream.Count > 0)//成型比大于86才可以制作 + if ((short)peripheralStatus["CBX"] >= 86 && morkT.morkOrderPushesIceCream.Count > 0)//成型比大于86才可以制作 { bool result = true; EventBus.EventBus.GetInstance().Publish(new LebaiRobot_GetInputEvent { DeviceId = DeviceId, Pin = 3 }, (res) => @@ -491,7 +480,7 @@ namespace BPASmartClient.MorkT { int count_1 = 0; - while ((short)Status.status["GSIceCream.IceCreamMachine.CBX"] <= 86) + while ((short)peripheralStatus["CBX"] <= 86) { Thread.Sleep(5); count_1++; diff --git a/BPASmartClient.MorkT/GLV_MorkT.cs b/BPASmartClient.MorkT/GLV_MorkT.cs index ae54fd74..d8adb56b 100644 --- a/BPASmartClient.MorkT/GLV_MorkT.cs +++ b/BPASmartClient.MorkT/GLV_MorkT.cs @@ -1,4 +1,8 @@ using BPASmartClient.Device; +using BPASmartClient.DRCoffee; +using BPASmartClient.GSIceCream; +using BPASmartClient.LebaiRobot; +using BPASmartClient.Model.冰淇淋.Enum; using Robotc; using System; using System.Collections.Concurrent; @@ -40,5 +44,60 @@ namespace BPASmartClient.MorkT /// 冰淇淋机器出料口传感器检测 /// public bool IceIsOK = true; + + #region + + [VariableMonitor("机器人连接状态")] + public bool RobotIsConnected; + + [VariableMonitor("机器人状态")] + public ELebaiRModel RobotMode; + + [VariableMonitor("冰淇淋连接状态")] + public bool IceCreamIsConnected; + + [VariableMonitor("冰淇淋机器预冷温度")] + public short YLWD; + + [VariableMonitor("冰淇淋机器回气温度")] + public short HQWD; + + [VariableMonitor("冰淇淋机器环境温度")] + public short HJWD; + + [VariableMonitor("冰淇淋机器电流")] + public short DL; + + [VariableMonitor("冰淇淋机器电压")] + public bool DY; + + [VariableMonitor("冰淇淋机器成型比")] + public byte CBX; + + [VariableMonitor("冰淇淋机器模式")] + public MORKI_MODE IceCreamMode; + + [VariableMonitor("冰淇淋机器故障")] + public MORKI_FAULT IceCreamFault; + + [VariableMonitor("冰淇淋机器打料是否完成")] + public bool DLCompleted; + + [VariableMonitor("咖啡机连接状态")] + public bool CoffeeIsConnected; + + [VariableMonitor("咖啡机状态")] + public DrCoffeeStatus DrCoffeeStatus; + + [VariableMonitor("咖啡机应用状态")] + public DrCoffeeAppStatus CoffeeAppStatus; + + [VariableMonitor("咖啡机告警")] + public DrCoffeeWarning CoffeeWarning; + + [VariableMonitor("咖啡机故障")] + public DrCoffeeFault CaffeeFault; + + #endregion } } diff --git a/BPASmartClient/App.config b/BPASmartClient/App.config index c435add3..3351221d 100644 --- a/BPASmartClient/App.config +++ b/BPASmartClient/App.config @@ -19,10 +19,10 @@ - + - - + +