From 8e6d7c8275117ca2659e7f82051f8af19741aa9d Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 07 二月 2025 16:51:33 +0800
Subject: [PATCH] #
---
app/src/main/java/com/example/agvcontroller/MainActivity.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 58 insertions(+), 0 deletions(-)
diff --git a/app/src/main/java/com/example/agvcontroller/MainActivity.java b/app/src/main/java/com/example/agvcontroller/MainActivity.java
index 19e8749..0c45dd5 100644
--- a/app/src/main/java/com/example/agvcontroller/MainActivity.java
+++ b/app/src/main/java/com/example/agvcontroller/MainActivity.java
@@ -36,6 +36,7 @@
import com.example.agvcontroller.action.HandLift;
import com.example.agvcontroller.action.LiftResetAction;
import com.example.agvcontroller.action.LoadResetAction;
+import com.example.agvcontroller.action.LoginReset;
import com.example.agvcontroller.action.RotatopnLeftRight;
import com.example.agvcontroller.action.SingleSwitchAction;
import com.example.agvcontroller.action.SingleSwitchRunAction;
@@ -68,6 +69,19 @@
private static final int MAX_RECENT_LOGS = 10; // 鏈�澶氭樉绀� 10 鏉℃渶鏂版棩蹇�
private static TextView agvBattery;
+ private static TextView agvSocket;
+ private static TextView agvNo;
+ private static TextView agvStatus;
+ private static TextView agvPositionId;
+ private static TextView agvPositionX;
+ private static TextView agvPositionY;
+ private static TextView agvForkHeight;
+ private static TextView agvForkExtend;
+ private static TextView agvForkAngle;
+ private static TextView agvError;
+ private Button reLogin;
+
+
private Vibrator vibrator;
private Button stopBtn; // 鎬ュ仠鎸夐挳
@@ -395,6 +409,20 @@
setContentView(R.layout.activity_main);
agvBattery = findViewById(R.id.agv_battery);
+ agvSocket = findViewById(R.id.socket);
+ agvNo = findViewById(R.id.agv_no);
+ agvStatus = findViewById(R.id.agv_status);
+ agvPositionId = findViewById(R.id.agv_position_id);
+ agvPositionX = findViewById(R.id.agv_position_x);
+ agvPositionY = findViewById(R.id.agv_position_y);
+ agvForkHeight = findViewById(R.id.agv_position_height);
+ agvForkExtend = findViewById(R.id.agv_ford);
+ agvForkAngle = findViewById(R.id.agv_ratio);
+ agvError = findViewById(R.id.agv_error);
+ reLogin = findViewById(R.id.relogin_button);
+
+
+
@@ -502,6 +530,18 @@
Log.i("message1",clientId);
+ reLogin.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ String substring = String.valueOf(new SnowflakeIdWorker().nextId()).substring(0,16);
+ AgvAction agvAction = new AgvAction<>(LoginReset.class)
+ .setAgvNo(AgvNo)
+ .setSerialNo(substring)
+ .setVal(1)
+ .bodySync((action) -> action.setPwd((short) 1));
+ nettyServerHandler.sendMessageToClient(clientId, agvAction); // 鍙戦�佹秷鎭埌瀹㈡埛绔�
+ }
+ });
// 鍓嶆嫧鏉嗕几鍑�
frontPaddleExtendBtn.setOnClickListener(new View.OnClickListener() {
@Override
@@ -1425,10 +1465,28 @@
handler.removeCallbacksAndMessages(null);
}
+
+
+
+
+
+
+
+
public static void upClient(AGVCar agvCar) {
clientId = agvCar.getClientId();
AgvNo = agvCar.getAgvNo();
+ agvNo.setText("AGV缂栧彿锛�" + AgvNo);
agvBattery.setText("鐢甸噺锛�" + agvCar.getBattery() + "%");
+ agvSocket.setText(agvCar.getStatus() == 1 ? "宸茶繛鎺�" : "鏈繛鎺�");
+ agvStatus.setText("AGV鐘舵�侊細" + agvCar.getStatus());
+ agvPositionId.setText("ID锛�" + agvCar.getPositionID());
+ agvPositionX.setText("(X)锛�" + agvCar.getPositionX());
+ agvPositionY.setText("(Y)锛�" + agvCar.getPositionY());
+ agvForkHeight.setText("褰撳墠楂樺害锛�" + agvCar.getForkHeight() + "mm");
+ agvForkExtend.setText("璐у弶浼稿嚭璺濈锛�" + agvCar.getForkExtend() + "mm");
+ agvForkAngle.setText("璐у弶鏃嬭浆瑙掑害锛�" + agvCar.getForkAngle() + "掳");
+ agvError.setText("AGV鏁呴殰锛�" + agvCar.getAgvError());
// updateAgvBatteryText("鐢甸噺锛�" + agvCar.getBattery() + "%");
}
--
Gitblit v1.9.1