From 5bdad72f5d5077ca875dd03cfdaafb3d7aba93da Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 16 八月 2024 14:36:58 +0800
Subject: [PATCH] #
---
app/src/main/java/com/example/agvcontroller/MainActivity.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/example/agvcontroller/MainActivity.java b/app/src/main/java/com/example/agvcontroller/MainActivity.java
index 72f66e2..b08e87c 100644
--- a/app/src/main/java/com/example/agvcontroller/MainActivity.java
+++ b/app/src/main/java/com/example/agvcontroller/MainActivity.java
@@ -23,10 +23,16 @@
import com.example.agvcontroller.utils.SnowflakeIdWorker;
import java.net.Socket;
+import java.sql.Time;
import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeoutException;
public class MainActivity extends AppCompatActivity {
+
+ public static final Map<String, Object> map = new ConcurrentHashMap();
private RecyclerView recyclerView;
private ItemAdapter itemAdapter;
@@ -45,22 +51,46 @@
private boolean isDowm = false;
private boolean isOpen = false;
- String substring = String.valueOf(new SnowflakeIdWorker().nextId()).substring(0,16);
+
private Handler handler = new Handler(new Handler.Callback() {
@Override
public boolean handleMessage(Message msg) {
if (isDowm) {
+ String substring = String.valueOf(new SnowflakeIdWorker().nextId()).substring(0,16);
AgvAction agvAction = new AgvAction<>(ForceSwitchAction.class)
.setAgvNo("1")
.setSerialNo(substring)
.setVal(1)
.bodySync((action) -> action.setPwd((short) 21));
+
nettyServerHandler.sendMessageToClient(clientId, agvAction); // 鍙戦�佹秷鎭埌瀹㈡埛绔�
handler.sendEmptyMessageDelayed(0, 100);
+
+ boolean result = false;
+ long timestamp = System.currentTimeMillis();
+
+ while (System.currentTimeMillis() - timestamp < 5000) {
+
+ Object o = map.get(substring);
+
+ if (null != o) {
+ result = true;
+ map.remove(o);
+ break;
+ }
+ }
+
+ if (result) {
+ // alert ok
+ } else {
+ throw new TimeoutException("瓒呮椂");
+ }
+
}
if (isOpen) {
+ String substring = String.valueOf(new SnowflakeIdWorker().nextId()).substring(0,16);
AgvAction agvAction = new AgvAction<>(ForceSwitchAction.class)
.setAgvNo("12")
.setSerialNo(substring)
@@ -99,7 +129,7 @@
if (vibrator != null && vibrator.hasVibrator()) {
vibrator.vibrate(500);
}
-
+ String substring = String.valueOf(new SnowflakeIdWorker().nextId()).substring(0,16);
AgvAction agvAction = new AgvAction<>(HandOutAction.class)
.setAgvNo("12")
.setSerialNo(substring)
--
Gitblit v1.9.1