From 1eb6c8b77d99bb43437a974787baea33dc67253c Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 14 八月 2024 17:01:21 +0800
Subject: [PATCH] #
---
app/src/main/java/com/example/agvcontroller/MainActivity.java | 16 +++++-----------
app/src/main/java/com/example/agvcontroller/protocol/ForceSwitchAction.java | 5 ++++-
app/src/main/java/com/example/agvcontroller/protocol/AgvAction.java | 2 +-
3 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/app/src/main/java/com/example/agvcontroller/MainActivity.java b/app/src/main/java/com/example/agvcontroller/MainActivity.java
index 13761d8..6bda580 100644
--- a/app/src/main/java/com/example/agvcontroller/MainActivity.java
+++ b/app/src/main/java/com/example/agvcontroller/MainActivity.java
@@ -17,19 +17,14 @@
import com.example.agvcontroller.protocol.AgvAction;
import com.example.agvcontroller.protocol.ForceSwitchAction;
-import com.example.agvcontroller.protocol2.AgvPackage;
import com.example.agvcontroller.protocol2.PackagePart;
import com.example.agvcontroller.socket.NettyServerHandler;
import com.example.agvcontroller.socket.SocketManager;
-import com.example.agvcontroller.socket.SocketTask;
+import com.example.agvcontroller.utils.SnowflakeIdWorker;
import java.net.Socket;
-import java.util.Arrays;
import java.util.List;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import io.netty.util.CharsetUtil;
public class MainActivity extends AppCompatActivity {
@@ -39,28 +34,27 @@
private Vibrator vibrator;
private Button vibrateButton;
private Socket socket;
+
SocketManager socketManager;
private boolean isDowm = false;
private Handler handler = new Handler(new Handler.Callback() {
@Override
public boolean handleMessage(Message msg) {
-
+ String substring = String.valueOf(new SnowflakeIdWorker().nextId()).substring(0,3);
AgvAction agvAction = new AgvAction<>(ForceSwitchAction.class)
.setAgvNo("1")
- .setSerialNo("asdsadsadsad")
+ .setSerialNo(substring)
.setVal(1)
.bodySync((action) -> action.setPwd((short) 21));
- // 鍦ㄨ繖閲岃繘琛屾墦鍗拌緭鍑�
- System.out.println("鎵撳嵃杈撳嚭");
if (isDowm) {
System.out.println(agvAction);
// byte[] message2 = new byte[]{0x01, 0x02, 0x03, 0x06}; // 绀轰緥娑堟伅
nettyServerHandler.sendMessageToClient(clientId, agvAction); // 鍙戦�佹秷鎭埌瀹㈡埛绔�
- handler.sendEmptyMessageDelayed(0, 100);
+// handler.sendEmptyMessageDelayed(0, 100);
}
return false;
}
diff --git a/app/src/main/java/com/example/agvcontroller/protocol/AgvAction.java b/app/src/main/java/com/example/agvcontroller/protocol/AgvAction.java
index 2ac3817..85c8775 100644
--- a/app/src/main/java/com/example/agvcontroller/protocol/AgvAction.java
+++ b/app/src/main/java/com/example/agvcontroller/protocol/AgvAction.java
@@ -42,7 +42,7 @@
byte[] bytes = actionBody.writeToBytes(); // 鍛戒护鍙傛暟
- return new byte[12];
+ return Utils.merge(cmdCode,valByte,bytes);
}
void readFromBytes(byte[] messageBodyBytes) {
diff --git a/app/src/main/java/com/example/agvcontroller/protocol/ForceSwitchAction.java b/app/src/main/java/com/example/agvcontroller/protocol/ForceSwitchAction.java
index d7e2c7a..52b77c2 100644
--- a/app/src/main/java/com/example/agvcontroller/protocol/ForceSwitchAction.java
+++ b/app/src/main/java/com/example/agvcontroller/protocol/ForceSwitchAction.java
@@ -1,5 +1,7 @@
package com.example.agvcontroller.protocol;
+import com.example.agvcontroller.socket.RadixTools;
+
import java.io.Serializable;
public class ForceSwitchAction implements IActionBody, Serializable {
@@ -10,7 +12,8 @@
@Override
public byte[] writeToBytes() {
- return new byte[0];
+ byte[] bytes = RadixTools.shortToByte(pwd);
+ return bytes;
}
@Override
--
Gitblit v1.9.1