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 | 69 +++++++++++++++++++++++++++-------
1 files changed, 54 insertions(+), 15 deletions(-)
diff --git a/app/src/main/java/com/example/agvcontroller/MainActivity.java b/app/src/main/java/com/example/agvcontroller/MainActivity.java
index 3b2a5ee..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;
@@ -47,22 +53,51 @@
+
private Handler handler = new Handler(new Handler.Callback() {
@Override
public boolean handleMessage(Message msg) {
- String substring = String.valueOf(new SnowflakeIdWorker().nextId()).substring(0,15);
-
- AgvAction agvAction = new AgvAction<>(ForceSwitchAction.class)
- .setAgvNo("1")
- .setSerialNo(substring)
- .setVal(1)
- .bodySync((action) -> action.setPwd((short) 21));
-
-
if (isDowm) {
- System.out.println(agvAction);
+ 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);
+ 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)
+ .setVal(1)
+ .bodySync((action) -> action.setPwd((short) 21));
+ nettyServerHandler.sendMessageToClient(clientId, agvAction); // 鍙戦�佹秷鎭埌瀹㈡埛绔�
+ handler.sendEmptyMessageDelayed(0, 100);
}
return false;
}
@@ -87,6 +122,7 @@
clientId = intent.getStringExtra("message");
Log.i("message1",clientId);
+ // 杩涘嚭鎵嬪姩妯″紡
forceSwitchBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -94,7 +130,6 @@
vibrator.vibrate(500);
}
String substring = String.valueOf(new SnowflakeIdWorker().nextId()).substring(0,16);
-
AgvAction agvAction = new AgvAction<>(HandOutAction.class)
.setAgvNo("12")
.setSerialNo(substring)
@@ -114,15 +149,19 @@
@Override
public boolean onTouch(View view, MotionEvent motionEvent) {
if (view.getId() == R.id.btn_go_forward) {
- Log.i("message1","1111");
- } else if (view.getId() == R.id.btn_go_backward) {
- Log.i("message1","22222");
if (motionEvent.getAction() == KeyEvent.ACTION_DOWN) {
isDowm = true;
handler.sendEmptyMessage(0);
} else if (motionEvent.getAction() == KeyEvent.ACTION_UP) {
isDowm = false;
}
+ } else if (view.getId() == R.id.btn_go_backward) {
+ if (motionEvent.getAction() == KeyEvent.ACTION_DOWN) {
+ isOpen = true;
+ handler.sendEmptyMessage(0);
+ } else if (motionEvent.getAction() == KeyEvent.ACTION_UP) {
+ isOpen = false;
+ }
}
return false;
}
--
Gitblit v1.9.1