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