From cf55dd98225897f49fbdc82b697adebb74c8c708 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期二, 29 九月 2020 15:30:42 +0800
Subject: [PATCH] 加入产测数据展示，隐藏考试系统设置为GNSS信息，为合并到主分支做准备
---
app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 651b909..269f30d 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
@@ -62,6 +62,7 @@
import safeluck.drive.evaluation.bean.ExamPlatformData;
import safeluck.drive.evaluation.bean.MCUInfo;
import safeluck.drive.evaluation.bean.MapInfoHead;
+import safeluck.drive.evaluation.bean.ProductTestData;
import safeluck.drive.evaluation.cEventCenter.CEventCenter;
import safeluck.drive.evaluation.cEventCenter.ICEventListener;
import safeluck.drive.evaluation.util.CThreadPoolExecutor;
@@ -89,12 +90,13 @@
private ICEventListener icEventListener = new ICEventListener() {
@Override
public void onCEvent(String topic, int msgCode, int resultCode, Object obj) {
+ datas.clear();
if (msgCode == Constant.MCU_SN){
String mcuinfoStr = (String)obj;
if (gson != null){
final MCUInfo mcuInfo=gson.fromJson(mcuinfoStr, MCUInfo.class);
Field [] fields = mcuInfo.getClass().getDeclaredFields();
- datas.clear();
+
for (int i = 0; i < fields.length; i++) {
fields[i].setAccessible(true);
@@ -153,6 +155,14 @@
}
}
+ if (msgCode == Constant.ID_SM_CAN_BRIEF){
+ ProductTestData productTestData = gson.fromJson((String) obj, ProductTestData.class);
+
+ datas.add(new BaseDataUIBean(str2SpannableString("杈撳叆鐘舵��"),R.mipmap.version_pic,str2FouregourdSpannableString(productTestData.getGpio()+""),"",1,null));
+ datas.add(new BaseDataUIBean(str2SpannableString("鍙戝姩鏈鸿浆閫�"),R.mipmap.version_pic,str2FouregourdSpannableString(productTestData.getRpm()+""),"",1,null));
+ datas.add(new BaseDataUIBean(str2SpannableString("杞﹂��"),R.mipmap.version_pic,str2FouregourdSpannableString(productTestData.getSpeed()+""),"",1,null));
+ datas.add(new BaseDataUIBean(str2SpannableString("鐢靛帇"),R.mipmap.version_pic,str2FouregourdSpannableString(productTestData.getVoltage()+""),"",1,null));
+ }
}
};
--
Gitblit v1.8.0