From 318bd727e2fe02e4f541dfe943f77606af41d509 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 06 二月 2025 14:30:11 +0800
Subject: [PATCH] #
---
app/src/main/java/com/example/agvcontroller/MainActivity.java | 164 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 155 insertions(+), 9 deletions(-)
diff --git a/app/src/main/java/com/example/agvcontroller/MainActivity.java b/app/src/main/java/com/example/agvcontroller/MainActivity.java
index a374ad3..33187b5 100644
--- a/app/src/main/java/com/example/agvcontroller/MainActivity.java
+++ b/app/src/main/java/com/example/agvcontroller/MainActivity.java
@@ -9,6 +9,7 @@
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
+import android.os.Looper;
import android.os.Message;
import android.os.Vibrator;
import android.util.Log;
@@ -20,6 +21,7 @@
import android.widget.GridLayout;
import android.widget.RelativeLayout;
import android.widget.Switch;
+import android.widget.TextView;
import com.example.agvcontroller.action.AllResetAction;
import com.example.agvcontroller.action.BackPaddle;
@@ -44,7 +46,12 @@
import com.example.agvcontroller.utils.DialogUtil;
import com.example.agvcontroller.utils.SnowflakeIdWorker;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
import java.net.Socket;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -54,6 +61,24 @@
public static final Map<String, Object> map = new ConcurrentHashMap();
public static final Map<String, Object> car_num = new ConcurrentHashMap();
+
+ private static TextView recentLogTextView;
+ private static Handler mainHandler;
+ private static List<String> logList = AGVApplication.getLogList();
+ private static final int MAX_RECENT_LOGS = 10; // 鏈�澶氭樉绀� 10 鏉℃渶鏂版棩蹇�
+
+ private static TextView agvBattery;
+ 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 Vibrator vibrator;
private Button stopBtn; // 鎬ュ仠鎸夐挳
@@ -111,11 +136,13 @@
private Button axleFrontBtn9;
private Button axleBackBtn9;
+ private Button viewAllLogsButton;
+
private Button bodySwitchBtn; // 搴曠洏/璐у弶鍒囨崲
private Socket socket;
- private String AgvNo = "1";
+
private RelativeLayout layout_bottom;
private RelativeLayout layout_top;
private GridLayout layout_single;
@@ -367,14 +394,30 @@
return false;
}
});
-
+ static String AgvNo = "1";
static String clientId;
NettyServerHandler nettyServerHandler;
+
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
+
+ agvBattery = findViewById(R.id.agv_battery);
+ 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);
+
+
+
// 鎸夐挳闇囧姩
@@ -444,15 +487,39 @@
liftResetBtn = findViewById(R.id.btn_lift_reset);
allResetBtn = findViewById(R.id.btn_all_reset);
+ viewAllLogsButton = findViewById(R.id.view_all_logs_button);
+ recentLogTextView = findViewById(R.id.recent_log_text_view);
+ mainHandler = new Handler(Looper.getMainLooper());
+
+ // 鍒濆鍖栨棩蹇楁樉绀�
+ updateRecentLogTextView();
+
+ // 鍚姩涓�涓畾鏃朵换鍔℃潵瀹氭湡妫�鏌ユ棩蹇楀垪琛ㄧ殑鍙樺寲
+ handler.postDelayed(new Runnable() {
+ @Override
+ public void run() {
+ updateLogDisplay();
+ handler.postDelayed(this, 1000); // 姣忕妫�鏌ヤ竴娆�
+ }
+ }, 100);
+
+ // 娉ㄥ唽 EventBus
+ EventBus.getDefault().register(this);
+
+ // 璁剧疆鏌ョ湅鍏ㄩ儴鏃ュ織鎸夐挳鐨勭偣鍑讳簨浠�
+ viewAllLogsButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ showAllLogsActivity();
+ }
+ });
Intent intent = getIntent();
if (intent != null) {
- String newClientId = intent.getStringExtra("clientId");
- if (newClientId != null) {
- clientId = newClientId;
- AgvNo = intent.getStringExtra("agvNo");
- }
+ AGVCar car = (AGVCar) intent.getSerializableExtra("item");
+ clientId = car.getClientId();
+ AgvNo = car.getAgvNo();
}
Log.i("message1",clientId);
@@ -1124,6 +1191,25 @@
}
+ private void updateLogDisplay() {
+ // 鑾峰彇鏈�鏂扮殑鏃ュ織鍒楄〃
+ List<String> logs = AGVApplication.getLogList();
+ // 鑾峰彇鏈�鍚庝袱鏉℃棩蹇�
+ int size = logs.size();
+ if (size == 0) {
+ recentLogTextView.setText("");
+ } else if (size == 1) {
+ recentLogTextView.setText(logs.get(0));
+ } else {
+ String logText = logs.get(size - 2) + "\n" + // 鑾峰彇鍊掓暟绗簩鏉℃棩蹇�
+ logs.get(size - 1); // 鑾峰彇鏈�鍚庝竴鏉℃棩蹇�
+ // 鏇存柊 TextView 鐨勬樉绀哄唴瀹�
+ Log.d("logs", "updateLogDisplay: " + logText);
+ recentLogTextView.setText(logText);
+ }
+ }
+
+
private class CarTouchButton implements View.OnTouchListener {
@Override
@@ -1357,9 +1443,69 @@
//SocketManager.getInstance().disconnect();
//SocketManager.getInstance().stopServer();
//socketManager.stopServer(); // 鍋滄鏈嶅姟鍣�
+ // 绉婚櫎瀹氭椂浠诲姟锛岄伩鍏嶅唴瀛樻硠婕�
+ handler.removeCallbacksAndMessages(null);
}
- public static void upClient(String newClientId) {
- clientId = newClientId;
+
+
+
+
+
+
+
+
+ public static void upClient(AGVCar agvCar) {
+ clientId = agvCar.getClientId();
+ AgvNo = agvCar.getAgvNo();
+ agvNo.setText("AGV缂栧彿锛�" + AgvNo);
+ agvBattery.setText("鐢甸噺锛�" + agvCar.getBattery() + "%");
+ 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() + "%");
+ }
+
+ private static void updateAgvBatteryText(String batteryLevel) {
+ if (agvBattery != null) {
+ agvBattery.setText(batteryLevel);
+ }
+ }
+
+ // EventBus 璁㈤槄鏂规硶锛氭帴鏀舵棩蹇楀瓧绗︿覆
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void onLogMessageReceived(String logMessage) {
+ addLog(logMessage);
+ }
+ // 鏂规硶锛氭洿鏂版渶杩戠殑鏃ュ織鏄剧ず
+ public static void updateRecentLogTextView() {
+ mainHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ StringBuilder logBuilder = new StringBuilder();
+ int start = Math.max(0, logList.size() - MAX_RECENT_LOGS);
+ for (int i = start; i < logList.size(); i++) {
+ logBuilder.append(logList.get(i)).append("\n");
+ }
+ recentLogTextView.setText(logBuilder.toString());
+ }
+ });
+ }
+ // 闈欐�佹柟娉曪細娣诲姞鏃ュ織
+ public static void addLog(String log) {
+ logList.add(log);
+ updateRecentLogTextView();
+ }
+
+ // 鏂规硶锛氬惎鍔� LogActivity 骞朵紶閫掓棩蹇楁暟鎹�
+ private void showAllLogsActivity() {
+ Intent intent = new Intent(this, LogActivity.class);
+ intent.putStringArrayListExtra("log_list", new ArrayList<>(logList));
+ startActivity(intent);
}
}
\ No newline at end of file
--
Gitblit v1.9.1