From 2583078fdf32b87da154b1594f3e616a77824175 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 12 八月 2024 17:10:31 +0800
Subject: [PATCH] #
---
app/src/main/java/com/example/agvcontroller/MainActivity.java | 80 +++++++++++++++++++++++-----------------
1 files changed, 46 insertions(+), 34 deletions(-)
diff --git a/app/src/main/java/com/example/agvcontroller/MainActivity.java b/app/src/main/java/com/example/agvcontroller/MainActivity.java
index 7d9de0f..2df3a7f 100644
--- a/app/src/main/java/com/example/agvcontroller/MainActivity.java
+++ b/app/src/main/java/com/example/agvcontroller/MainActivity.java
@@ -4,16 +4,21 @@
import androidx.recyclerview.widget.RecyclerView;
import android.content.Context;
+import android.content.Intent;
import android.os.Bundle;
import android.os.Vibrator;
import android.util.Log;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
import android.view.View;
import android.widget.Button;
+import com.example.agvcontroller.socket.NettyServerHandler;
import com.example.agvcontroller.socket.SocketManager;
import com.example.agvcontroller.socket.SocketTask;
import java.net.Socket;
+import java.util.Arrays;
import java.util.List;
import io.netty.buffer.ByteBuf;
@@ -29,57 +34,64 @@
private Button vibrateButton;
private Socket socket;
SocketManager socketManager;
+
+ String clientId;
+ NettyServerHandler nettyServerHandler;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
- // 浣滀负瀹㈡埛绔繛鎺�
- //SocketManager.getInstance().setHostAndPort("192.168.4.188", 802);
- //SocketManager.getInstance().connect();
-
- //SocketManager.getInstance().setPort(8080);
- //SocketManager.getInstance().startServer();
-
- // 璁剧疆绔彛鍙峰苟鍚姩鏈嶅姟绔�
- //SocketManager.getInstance().setPort(8080);
- socketManager = new SocketManager();
- socketManager.startServer(8080);
-
- // 鍚姩鏈嶅姟绔�
- //new Thread(() -> {
- // SocketManager.getInstance().startServer();
- //}).start();
-
vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
vibrateButton = findViewById(R.id.btn_stop);
- vibrateButton.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- if (vibrator != null && vibrator.hasVibrator()) {
- vibrator.vibrate(500);
- }
+ Intent intent = getIntent();
+ //String clientId = intent.getStringExtra("message");
+ clientId = intent.getStringExtra("message");
+ Log.i("message1",clientId);
+ // 鍒濆鍖栧崟杞翠娇鑳�
+ byte[] message2 = new byte[]{0x01, 0x02, 0x03, 0x06}; // 绀轰緥娑堟伅
+ nettyServerHandler.sendMessageToClient(clientId, message2); // 鍙戦�佹秷鎭埌瀹㈡埛绔�
- //socket = new Socket();
- //new SocketTask().execute("192.168.4.188", 802);
- //ByteBuf message = Unpooled.copiedBuffer("Hello, Netty!", CharsetUtil.UTF_8);
- //SocketManager.getInstance().sendMessage(message);
-
- String clientId = "/192.168.4.188:63160";
- byte[] message = new byte[]{0x01, 0x02, 0x03, 0x04}; // 绀轰緥娑堟伅
- socketManager.sendMessage(clientId, message); // 鍙戦�佹秷鎭埌瀹㈡埛绔�
- }
- });
+ //vibrateButton.setOnClickListener(new View.OnClickListener() {
+ // @Override
+ // public void onClick(View v) {
+ // if (vibrator != null && vibrator.hasVibrator()) {
+ // //vibrator.vibrate(500);
+ // }
+ //
+ // //String clientId = "/192.168.4.188:63160";
+ // byte[] message1 = new byte[]{0x01, 0x02, 0x03, 0x04}; // 绀轰緥娑堟伅
+ // Log.i("message2",clientId);
+ // Log.i("message3", Arrays.toString(message1));
+ //
+ // nettyServerHandler.sendMessageToClient(clientId, message1); // 鍙戦�佹秷鎭埌瀹㈡埛绔�
+ // }
+ //});
+ vibrateButton.setOnTouchListener(new CarTouchButton());
}
+ private class CarTouchButton implements View.OnTouchListener {
+
+ @Override
+ public boolean onTouch(View view, MotionEvent motionEvent) {
+ if (motionEvent.getAction() == KeyEvent.ACTION_DOWN) {
+ byte[] message2 = new byte[]{0x01, 0x02, 0x03, 0x06}; // 绀轰緥娑堟伅
+ nettyServerHandler.sendMessageToClient(clientId, message2); // 鍙戦�佹秷鎭埌瀹㈡埛绔�
+ } else if (motionEvent.getAction() == KeyEvent.ACTION_UP) {
+ byte[] message2 = new byte[]{0x01, 0x02, 0x03, 0x07}; // 绀轰緥娑堟伅
+ nettyServerHandler.sendMessageToClient(clientId, message2); // 鍙戦�佹秷鎭埌瀹㈡埛绔�
+ }
+ return false;
+ }
+ }
@Override
protected void onDestroy() {
super.onDestroy();
//SocketManager.getInstance().disconnect();
//SocketManager.getInstance().stopServer();
- socketManager.stopServer(); // 鍋滄鏈嶅姟鍣�
+ //socketManager.stopServer(); // 鍋滄鏈嶅姟鍣�
}
}
\ No newline at end of file
--
Gitblit v1.9.1