Browse Source

冰淇凌修改

master
itachilee 2 years ago
parent
commit
bdc60aea0c
3 changed files with 10 additions and 2 deletions
  1. +7
    -0
      HBLConsole.Communication/LebaiHelper.cs
  2. +2
    -1
      HBLConsole.MORKIC/Control_MORKIC.cs
  3. +1
    -1
      HBLConsole/App.config

+ 7
- 0
HBLConsole.Communication/LebaiHelper.cs View File

@@ -147,6 +147,13 @@ namespace HBLConsole.Communication
{
if (robotData == null || client == null) return;
client?.RunScene(id);

//var res = GetValueAsync();
//while (res.Value!=id)
//{
//}

TaskInfo res = client.GetTask(id).Result;
while (res.Status != Lebai.SDK.Dtos.TaskStatus.RunSuccess)
{


+ 2
- 1
HBLConsole.MORKIC/Control_MORKIC.cs View File

@@ -372,6 +372,7 @@ namespace HBLConsole.MORKIC
Thread.Sleep(5);
}
MessageLog.GetInstance.Show("机器人到达顾客取咖啡位置");
SimpleFactory.GetInstance.OrderChanged(subOrderId, BPA.Message.Enum.ORDER_STATUS.COMPLETED_COOK);
LebaiHelper.GetInstance.Scene(LebaiHelper.SENCE_有无咖啡检测);
while (!(lebai.Ok && lebai.Value == 6))
{
@@ -405,7 +406,7 @@ namespace HBLConsole.MORKIC
}
MessageLog.GetInstance.Show("机器人复位");
//订单状态改变:完成
SimpleFactory.GetInstance.OrderChanged(subOrderId, BPA.Message.Enum.ORDER_STATUS.COMPLETED_COOK);
SimpleFactory.GetInstance.OrderChanged(subOrderId, BPA.Message.Enum.ORDER_STATUS.COMPLETED_TAKE);
#endregion
}



+ 1
- 1
HBLConsole/App.config View File

@@ -11,7 +11,7 @@

<!--客户端ID-->
<!--MorkD = 2,MorkS 且时且多 = 8,MorkS 珠海 = 9,冰淇淋 = 4,咖啡机 = 13-->
<add key="ClientId" value="4"/>
<add key="ClientId" value="12"/>

<add key="COM_Coffee" value="COM8"/>
<add key="BAUD_Coffee" value="115200"/>


Loading…
Cancel
Save