From 6d13023b5737f331a541ed00de66f774a5315b4a Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 12 八月 2024 14:19:37 +0800
Subject: [PATCH] #
---
app/src/main/java/com/example/agvcontroller/MainActivity.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 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..4b3d37a 100644
--- a/app/src/main/java/com/example/agvcontroller/MainActivity.java
+++ b/app/src/main/java/com/example/agvcontroller/MainActivity.java
@@ -4,16 +4,19 @@
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.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,6 +32,7 @@
private Button vibrateButton;
private Socket socket;
SocketManager socketManager;
+ NettyServerHandler nettyServerHandler;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -43,8 +47,8 @@
// 璁剧疆绔彛鍙峰苟鍚姩鏈嶅姟绔�
//SocketManager.getInstance().setPort(8080);
- socketManager = new SocketManager();
- socketManager.startServer(8080);
+ //socketManager = new SocketManager();
+ //socketManager.startServer(8080);
// 鍚姩鏈嶅姟绔�
//new Thread(() -> {
@@ -54,21 +58,23 @@
vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
vibrateButton = findViewById(R.id.btn_stop);
+ Intent intent = getIntent();
+ String clientId = intent.getStringExtra("message");
+ Log.i("message1",clientId);
+
vibrateButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (vibrator != null && vibrator.hasVibrator()) {
- vibrator.vibrate(500);
+ //vibrator.vibrate(500);
}
- //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[] message1 = new byte[]{0x01, 0x02, 0x03, 0x04}; // 绀轰緥娑堟伅
+ Log.i("message2",clientId);
+ Log.i("message3", Arrays.toString(message1));
- String clientId = "/192.168.4.188:63160";
- byte[] message = new byte[]{0x01, 0x02, 0x03, 0x04}; // 绀轰緥娑堟伅
- socketManager.sendMessage(clientId, message); // 鍙戦�佹秷鎭埌瀹㈡埛绔�
+ nettyServerHandler.sendMessageToClient(clientId, message1); // 鍙戦�佹秷鎭埌瀹㈡埛绔�
}
});
@@ -80,6 +86,6 @@
//SocketManager.getInstance().disconnect();
//SocketManager.getInstance().stopServer();
- socketManager.stopServer(); // 鍋滄鏈嶅姟鍣�
+ //socketManager.stopServer(); // 鍋滄鏈嶅姟鍣�
}
}
\ No newline at end of file
--
Gitblit v1.9.1