From d5f837a50f9874e4d08d786bfaeaed23dc7fe745 Mon Sep 17 00:00:00 2001
From: 陈力 <chenli@lotaai.com>
Date: 星期三, 14 六月 2023 15:32:44 +0800
Subject: [PATCH] 存餐、取餐、管理员取出
---
app/src/main/java/com/lotaai/canguiayw/TakeActivity.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/lotaai/canguiayw/TakeActivity.java b/app/src/main/java/com/lotaai/canguiayw/TakeActivity.java
index a0c56b2..8dfae03 100644
--- a/app/src/main/java/com/lotaai/canguiayw/TakeActivity.java
+++ b/app/src/main/java/com/lotaai/canguiayw/TakeActivity.java
@@ -71,14 +71,16 @@
// 调用后台
String gridNo = editable.toString();
if (null == gridNo || "".equals(gridNo.trim())) {
- Toast.makeText(context, "取餐码不能为空。", Toast.LENGTH_SHORT).show();
+ DynamicToast.makeError(context, "取餐码不能为空。", 3).show();
return;
} else {
if (gridNo.length() !=6) {
- Toast.makeText(context, "取餐码输入错误，请重试。", Toast.LENGTH_SHORT).show();
+ editText.setText("");
+ DynamicToast.makeError(context, "取餐码输入错误，请重试。", 3).show();
return;
}
//调用判断是否可以取餐
+ editText.setText("");
takeCheckCode(gridNo);
}
} else {
@@ -159,10 +161,16 @@
json.put(DeviceAction.jiareIsOpen.name(), "0");
json.put(DeviceAction.dengGuangIsOpen.name(), "0");
json.put("gridNo", g);
+ json.put("qucan","1");
DeviceMessage deviceMessage = new DeviceMessage();
deviceMessage.setMessageType(MessageType.MQTT.ordinal());
deviceMessage.setMsgString(json.toJSONString());
EventBus.getDefault().post(deviceMessage);
+ String string = obj.getString("msg");
+ Message msg = new Message();
+ msg.what = 1;
+ msg.obj = "取餐格口:" + g;
+ showHandler.sendMessage(msg);
} else {
String string = obj.getString("msg");
Message msg = new Message();
--
Gitblit v1.7.1