From 6dcf2bb7720191cd73856e57c7883e84bed1b225 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期三, 19 二月 2020 19:16:58 +0800
Subject: [PATCH] 初步调试0206消息还是有错（位置上报），
---
app/src/main/java/safeluck/drive/evaluation/app.java | 3 +++
app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0203.java | 2 +-
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 8 ++++++++
app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java | 31 ++++++++++++++++++++++++++++++-
app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0206.java | 4 +++-
5 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index f347e2c..b026cf9 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -102,6 +102,9 @@
}
}).start();
+ //TODO 杩涜tcp杩炴帴
+
+ //TODO 鍒ゆ柇SPUtils 鏄惁淇濆瓨鏈塪es瀵嗙爜锛涘鏋滄病鏈夊垯杩涜娉ㄥ唽JKMessage0100锛屽鏋滄湁瀵嗙爜鍒欒繘琛岄壌鏉僇KMessage0101
}
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
index f6e9c9b..702c122 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -129,6 +129,7 @@
Collections.reverse(mArrayList);
mScoreAdapter.addDatas(mArrayList);
}
+ //TODO 鍙戦�丣KMessage0203 缁欏钩鍙帮紝杩欏効鏈夌偣澶嶆潅锛岀湅鎬庝箞澶勭悊
currTotalScore -=item_id;
if (currTotalScore < Constant.PASSING_SCORE){
MyLog.i(TAG,"浣庝簬80锛屼笉鍚堟牸");
@@ -241,6 +242,7 @@
private void initView(View view) {
+ view.findViewById(R.id.profile).setOnClickListener(this);
av_curve = view.findViewById(R.id.av3);
av_park = view.findViewById(R.id.av2);
av_podao = view.findViewById(R.id.av1);
@@ -295,6 +297,7 @@
failedProjViewModel.deleteAll();
sendExamJson(1);
iv_head.getDrawable().setLevel(1);
+ //TODO 鍙戦�丣KMessage0202 缁欏钩鍙帮紝寮�濮嬭�冭瘯
break;
case R.id.tv_stop:
Toast.makeText(_mActivity, "缁撴潫鑰冭瘯", Toast.LENGTH_SHORT).show();
@@ -310,6 +313,10 @@
break;
case R.id.btn_return:
_mActivity.onBackPressed();
+ break;
+ case R.id.profile:
+ MyLog.i(TAG,"绛惧埌锛岃幏鍙栬韩浠借瘉鐗╃悊鍗″彿");
+ //TODO 鑾峰緱鐗╃悊鍗″彿 鍙戦�丣KMessage0201缁欏钩鍙帮紝鑾峰彇濮撳悕銆佽韩浠借瘉銆乭ead_url
break;
}
}
@@ -335,6 +342,7 @@
OneTimeWorkRequest examStatusInitWork = OneTimeWorkRequest.from(ExamStatusInitWorker.class);
WorkManager.getInstance(_mActivity).enqueue(examStatusInitWork);
sendExamJson(0);
+ //TODO 鍙戦�丣KMessage0204缁欏钩鍙� 缁撴潫鑰冭瘯
}
private ICEventListener icEventListener = new ICEventListener() {
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 58c6177..82a703a 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
@@ -32,6 +32,7 @@
import safeluck.drive.evaluation.DB.criterias.viewmodel.CriteriaIViewModel;
import safeluck.drive.evaluation.R;
import safeluck.drive.evaluation.im.MessageProcessor;
+import safeluck.drive.evaluation.platformMessage.AttachInfo;
import safeluck.drive.evaluation.platformMessage.JKMessage0001;
import safeluck.drive.evaluation.platformMessage.JKMessage0002;
import safeluck.drive.evaluation.platformMessage.JKMessage0100;
@@ -41,6 +42,7 @@
import safeluck.drive.evaluation.platformMessage.JKMessage0203;
import safeluck.drive.evaluation.platformMessage.JKMessage0204;
import safeluck.drive.evaluation.im.IMSClientBootstrap;
+import safeluck.drive.evaluation.platformMessage.JKMessage0206;
import safeluck.drive.evaluation.util.SPUtils;
/**
@@ -159,13 +161,20 @@
Log.i(TAG, "onClick1: "+ str1+" ============");
String hex = "B7 A2 B6 AF BB FA C6 F4 B6 AF BA F3 A3 AC B2 BB BC B0 CA B1 CB C9 BF AA C6 F4 B6 AF BF AA B9 D8";
+ String jsonGps = "7B22757463223A2232303037303130313036323135362E3830222C227166223A302C22636F6F72645F78223A2D33303631313736332E3436312C22636F6F72645F785F646972223A224E222C22636F6F72645F79223A2D333236363036392E3635332C22636F6F72645F795F646972223A2245222C2268656164696E67223A302E302C227069746368223A302E302C22726F6C6C223A302E307D0A7B22757463223A2232303037303130313036323135372E3030222C227361745F6E756D223A302C227166223A302C226C61746974756465223A302E302C226C6F6E676974756465223A302E302C22616C746974756465223A2D363337383135342E3136322C227370656564223A302E307D";
+
String string = null;
try {
string = new String(BytesUtils.hexStringToBytes(hex.replace(" ","")),"GBK");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
+ }String json = null;
+ try {
+ json = new String(BytesUtils.hexStringToBytes(jsonGps),"GBK");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
}
- Log.i(TAG, "onClick: string="+string);
+ Log.i(TAG, "onClick: jsongps="+json);
break;
case R.id.btn_register:
String hexPwd = (String) SPUtils.get(getActivity(),SPUtils.DES_HEX_PWD,"");
@@ -220,6 +229,26 @@
MessageProcessor.getInstance().sendMessage(jkMessage0203);
break;
case R.id.btn_gps:
+ JKMessage0206 jkMessage0206 = new JKMessage0206();
+ jkMessage0206.alert = 0;
+ jkMessage0206.status = 0;
+ jkMessage0206.jd = 0.0;
+ jkMessage0206.wd = 0.0;
+ jkMessage0206.gaoCheng = 325;
+ jkMessage0206.speed = 1;
+ jkMessage0206.fangXiang = 12;
+ jkMessage0206.rf = 1;
+ jkMessage0206.timeBCD = "2020021916552490";
+ jkMessage0206.json = "{\"utc\":\"20070101062156.80\",\"qf\":0,\"coord_x\":-30611763.461,\"coord_x_dir\":\"N\",\"coord_y\":-3266069.653,\"coord_y_dir\":\"E\",\"heading\":0.0,\"pitch\":0.0,\"roll\":0.0}\n" +
+ "{\"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";
+ jkMessage0206.attachInfo = attachInfo;
+ Log.i(TAG, "浣嶇疆涓婃姤="+jkMessage0206.toString());
+
break;
case R.id.btn_stop_exam:
JKMessage0204 jkMessage0204 = new JKMessage0204();
diff --git a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0203.java b/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0203.java
index 6d4c71f..c5c6217 100644
--- a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0203.java
+++ b/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0203.java
@@ -27,7 +27,7 @@
@Order(5)
@Int8
public int fail_score;
- //TODO
+ //TODO Length 0 涔熷彲浠ュ畬鍏ㄦ樉绀哄瓧绗︿覆
@Order(6)
@Length(0)
@Ascii
diff --git a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0206.java b/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0206.java
index ef6260b..8d8154b 100644
--- a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0206.java
+++ b/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0206.java
@@ -29,6 +29,7 @@
public int fangXiang;
@Order(8)
+ @Length(8)
@Hex
public String timeBCD;
@@ -36,7 +37,7 @@
@Int8
public int rf;
@Order(10)
- @Int8
+ @Int16
public int length;
@Order(11)
@Length(lengthField = "length")
@@ -45,6 +46,7 @@
@Order(12)
@Message
+ @Length(20)
public AttachInfo attachInfo;
/**
* 鎶ヨ
--
Gitblit v1.8.0