From b81d0cf47a08b3b5de01bf753fb71f6d1fda783a Mon Sep 17 00:00:00 2001
From: fctom1215 <fctom1215@outlook.com>
Date: 星期日, 23 二月 2020 15:21:02 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
index 82a703a..b636ff8 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
@@ -17,6 +17,7 @@
import androidx.lifecycle.Observer;
import com.anyun.exam.lib.util.Speaker;
+import com.anyun.im_lib.listener.IMSConnectStatusCallback;
import com.anyun.im_lib.util.ByteUtil;
import com.google.android.material.textfield.TextInputEditText;
import com.safeluck.aykj.utils.BytesUtils;
@@ -137,7 +138,22 @@
String hosts = "[{\"host\":\"47.93.157.103\", \"port\":2020}]";
// String hosts = "[{\"host\":\"192.168.31.77\", \"port\":12125}]";
- IMSClientBootstrap.getInstance().init(userId,token,hosts,1);
+ IMSClientBootstrap.getInstance().init(userId, token, hosts, 1, new IMSConnectStatusCallback() {
+ @Override
+ public void onConnecting() {
+
+ }
+
+ @Override
+ public void onConnected() {
+
+ }
+
+ @Override
+ public void onConnectFailed() {
+
+ }
+ });
break;
case R.id.btn_send:
// if (connectThread != null){
@@ -243,12 +259,21 @@
"{\"utc\":\"20070101062157.00\",\"sat_num\":0,\"qf\":0,\"latitude\":0.0,\"longitude\":0.0,\"altitude\":-6378154.162,\"speed\":0.0}";
jkMessage0206.length = jkMessage0206.json.length();
AttachInfo attachInfo = new AttachInfo();
- attachInfo.attach_message_id = 0x40;
- attachInfo.attach_message_length = 18;
- attachInfo.attach_data="12345678901";
+ attachInfo.attach_message_id = Integer.parseInt(port.getText().toString().trim());
+ attachInfo.attach_message_length = 4;
+ Log.i(TAG, "attachInfo.attach_message_id ="+attachInfo.attach_message_id );
+ if (attachInfo.attach_message_id == 0x41){
+ Log.i(TAG, "onClick: 41");
+ attachInfo.attach_data="00000000";
+ }else{
+
+ //18涓瓧鑺� ascii
+ attachInfo.attach_data="303030303030303030303030303030303030";
+ }
+
jkMessage0206.attachInfo = attachInfo;
Log.i(TAG, "浣嶇疆涓婃姤="+jkMessage0206.toString());
-
+ MessageProcessor.getInstance().sendMessage(jkMessage0206);
break;
case R.id.btn_stop_exam:
JKMessage0204 jkMessage0204 = new JKMessage0204();
@@ -266,7 +291,7 @@
@Override
public void run() {
JKMessage0002 jkMessage0002 = new JKMessage0002();
- jkMessage0002.checksum = 0x7e;
+// jkMessage0002.checksum = 0x7e;
MessageProcessor.getInstance().sendMessage(jkMessage0002);
Log.i(TAG, "run: 5s涓�娆�");
}
--
Gitblit v1.8.0