From 2307694481c810b96a2a224bdcb383c93dd9cc26 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期一, 02 三月 2020 11:22:20 +0800
Subject: [PATCH] 平台协议增加speed编码器；修改基础数据UI；
---
app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java | 23 +++++++++++------------
app/src/main/java/safeluck/drive/evaluation/platformMessage/JK2019MessageBase.java | 4 ++++
2 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
index 120ddc6..fa69236 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
@@ -83,10 +83,13 @@
if (fields[i].getName().equalsIgnoreCase("version")){
String version = (String) fields[i].get(mcuInfo);
version = new String(BytesUtils.hexStringToBytes(version),"GBK");
- Log.i(TAG, "onCEvent: "+version);
- datas.add(fields[i].getName() + ":" + version);
- }else
- datas.add(fields[i].getName() + ":" + fields[i].get(mcuInfo));
+ datas.add("鐗堟湰鍙凤細" + version);
+ }else if(fields[i].getName().equalsIgnoreCase("sn")){
+ datas.add( "璁惧搴忓垪鍙凤細" + fields[i].get(mcuInfo));
+ }else if(fields[i].getName().equalsIgnoreCase("selftest")){
+ datas.add( "鑷鐘舵�侊細" + fields[i].get(mcuInfo));
+ }
+
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (UnsupportedEncodingException e) {
@@ -101,17 +104,13 @@
datas.add("鐪両D锛�"+mRtkConfig.getProvince());
datas.add("甯侷D锛�"+mRtkConfig.getCity());
datas.add("鐢佃瘽锛�"+mRtkConfig.getPhone());
- datas.add("RTK骞冲彴鍦板潃锛�"+mRtkConfig.getIp());
- datas.add("RTK骞冲彴绔彛锛�"+mRtkConfig.getPort());
+ datas.add("RTK骞冲彴鍦板潃锛�"+mRtkConfig.getIp()+":"+mRtkConfig.getPort());
- datas.add("鑰冭瘯骞冲彴鍦板潃锛�"+ExamPlatformData.getInstance().getPlatformIP());
- datas.add("鑰冭瘯骞冲彴绔彛锛�"+ExamPlatformData.getInstance().getPlatformPort());
+ datas.add("鑰冭瘯骞冲彴鍦板潃锛�"+ExamPlatformData.getInstance().getPlatformIP()+":"+ExamPlatformData.getInstance().getPlatformPort());
}
if (appStatus != null){
- datas.add("RTK骞冲彴杩炴帴鐘舵�侊細"+appStatus.getRtk_connect_status());
- datas.add("RTK骞冲彴鐧诲綍鐘舵�侊細"+appStatus.getRtk_login_code());
- datas.add("鑰冭瘯骞冲彴杩炴帴鐘舵�侊細"+appStatus.getRtk_connect_status());
- datas.add("鑰冭瘯骞冲彴鐧诲綍鐘舵�侊細"+appStatus.getRtk_login_code());
+ datas.add("RTK骞冲彴鐘舵�侊細"+appStatus.getRtk_connect_status());
+ datas.add("鑰冭瘯骞冲彴鐘舵�侊細"+appStatus.getRtk_connect_status());
}
gpsInfoAdapter.addAll(datas);
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JK2019MessageBase.java b/app/src/main/java/safeluck/drive/evaluation/platformMessage/JK2019MessageBase.java
index 0845036..7a0bf74 100644
--- a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JK2019MessageBase.java
+++ b/app/src/main/java/safeluck/drive/evaluation/platformMessage/JK2019MessageBase.java
@@ -18,11 +18,15 @@
import safeluck.drive.evaluation.platformMessage.decoder.JWDCoder;
import safeluck.drive.evaluation.platformMessage.decoder.Phone;
import safeluck.drive.evaluation.platformMessage.decoder.PhoneCoder;
+import safeluck.drive.evaluation.platformMessage.decoder.SPEED;
+import safeluck.drive.evaluation.platformMessage.decoder.SpeedCoder;
public class JK2019MessageBase extends BinMessageBase {
static {
AnnotationRegister.register(JWD.class, new JWDCoder());
AnnotationRegister.register(Phone.class, new PhoneCoder());
+ //澧炲姞speed 缂栫爜鍣�
+ AnnotationRegister.register(SPEED.class, new SpeedCoder());
}
static Int16Coder coder = new Int16Coder();
--
Gitblit v1.8.0