From e54492fb532366faac8aa5d46ad8905ea3ff38d5 Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期四, 15 八月 2024 15:20:16 +0800 Subject: [PATCH] # --- app/src/main/java/com/example/agvcontroller/protocol/HandleCmdType.java | 8 ++++++++ app/src/main/java/com/example/agvcontroller/MainActivity.java | 8 ++++---- app/src/main/java/com/example/agvcontroller/action/ForceSwitchAction.java | 3 ++- app/src/main/java/com/example/agvcontroller/protocol/AgvAction.java | 6 +----- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/example/agvcontroller/MainActivity.java b/app/src/main/java/com/example/agvcontroller/MainActivity.java index 9eba106..3b2a5ee 100644 --- a/app/src/main/java/com/example/agvcontroller/MainActivity.java +++ b/app/src/main/java/com/example/agvcontroller/MainActivity.java @@ -16,8 +16,8 @@ import android.widget.Button; import com.example.agvcontroller.protocol.AgvAction; -import com.example.agvcontroller.protocol.ForceSwitchAction; -import com.example.agvcontroller.protocol2.PackagePart; +import com.example.agvcontroller.action.ForceSwitchAction; +import com.example.agvcontroller.action.HandOutAction; import com.example.agvcontroller.socket.NettyServerHandler; import com.example.agvcontroller.socket.SocketManager; import com.example.agvcontroller.utils.SnowflakeIdWorker; @@ -93,9 +93,9 @@ if (vibrator != null && vibrator.hasVibrator()) { vibrator.vibrate(500); } - String substring = String.valueOf(new SnowflakeIdWorker().nextId()).substring(0,15); + String substring = String.valueOf(new SnowflakeIdWorker().nextId()).substring(0,16); - AgvAction agvAction = new AgvAction<>(ForceSwitchAction.class) + AgvAction agvAction = new AgvAction<>(HandOutAction.class) .setAgvNo("12") .setSerialNo(substring) .setVal(1) diff --git a/app/src/main/java/com/example/agvcontroller/protocol/ForceSwitchAction.java b/app/src/main/java/com/example/agvcontroller/action/ForceSwitchAction.java similarity index 85% rename from app/src/main/java/com/example/agvcontroller/protocol/ForceSwitchAction.java rename to app/src/main/java/com/example/agvcontroller/action/ForceSwitchAction.java index 52b77c2..f995a55 100644 --- a/app/src/main/java/com/example/agvcontroller/protocol/ForceSwitchAction.java +++ b/app/src/main/java/com/example/agvcontroller/action/ForceSwitchAction.java @@ -1,5 +1,6 @@ -package com.example.agvcontroller.protocol; +package com.example.agvcontroller.action; +import com.example.agvcontroller.protocol.IActionBody; import com.example.agvcontroller.socket.RadixTools; import java.io.Serializable; 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 4746c25..b18ce49 100644 --- a/app/src/main/java/com/example/agvcontroller/protocol/AgvAction.java +++ b/app/src/main/java/com/example/agvcontroller/protocol/AgvAction.java @@ -2,14 +2,10 @@ +import com.example.agvcontroller.action.ForceSwitchAction; import com.example.agvcontroller.socket.NettyServerHandler; -import com.example.agvcontroller.socket.RadixTools; - -import org.json.JSONObject; import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; /** diff --git a/app/src/main/java/com/example/agvcontroller/protocol/HandleCmdType.java b/app/src/main/java/com/example/agvcontroller/protocol/HandleCmdType.java index ea73339..1cdd119 100644 --- a/app/src/main/java/com/example/agvcontroller/protocol/HandleCmdType.java +++ b/app/src/main/java/com/example/agvcontroller/protocol/HandleCmdType.java @@ -1,7 +1,15 @@ package com.example.agvcontroller.protocol; +import com.example.agvcontroller.action.ForceSwitchAction; +import com.example.agvcontroller.action.HandInAction; +import com.example.agvcontroller.action.HandOutAction; + public enum HandleCmdType { + HAND_OUT(0x00, "鎺ㄥ嚭鎵嬪姩妯″紡", HandOutAction.class), + + HAND_IN(0x01, "杩涘叆鎵嬪姩妯″紡", HandInAction.class), + FORCE_SWITCH(0x80, "寮�鍚�/鍏抽棴寮哄埗", ForceSwitchAction.class), ; -- Gitblit v1.9.1