#

whycq

2024-08-15 e54492fb532366faac8aa5d46ad8905ea3ff38d5

#

 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)

 app/src/main/java/com/example/agvcontroller/action/ForceSwitchAction.java

File was renamed from app/src/main/java/com/example/agvcontroller/protocol/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;

 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;


/**

 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),
    ;