From 6e3da9a6d2bbcf11ada52f8ece41302e888fdb4c Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期一, 28 十二月 2020 17:21:49 +0800
Subject: [PATCH] 加入模块型号和状态
---
app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 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 a75e514..82e00cf 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
@@ -64,6 +64,7 @@
import safeluck.drive.evaluation.bean.MCUInfo;
import safeluck.drive.evaluation.bean.MapInfoHead;
import safeluck.drive.evaluation.bean.ProductTestData;
+import safeluck.drive.evaluation.bean.RTKModuleInfo;
import safeluck.drive.evaluation.cEventCenter.CEventCenter;
import safeluck.drive.evaluation.cEventCenter.ICEventListener;
import safeluck.drive.evaluation.util.CThreadPoolExecutor;
@@ -99,6 +100,7 @@
final MCUInfo mcuInfo=gson.fromJson(mcuinfoStr, MCUInfo.class);
Field [] fields = mcuInfo.getClass().getDeclaredFields();
String canBrief = ExamPlatformData.getInstance().getSMCanBrief();
+ String rtkMoudleInfoStr = ExamPlatformData.getInstance().getRTKMoudleInfo();
if (!TextUtils.isEmpty(canBrief)){
ProductTestData productTestData = gson.fromJson(canBrief, ProductTestData.class);
String Binarystr = Integer.toBinaryString(productTestData.getGpio());
@@ -108,6 +110,12 @@
datas.add(new BaseDataUIBean(str2SpannableString("鐢靛帇"),R.mipmap.version_pic,str2FouregourdSpannableString(productTestData.getVoltage()+""),"",1,null));
}
+ if (!TextUtils.isEmpty(rtkMoudleInfoStr)){
+ RTKModuleInfo rtkModuleInfo = gson.fromJson(rtkMoudleInfoStr,RTKModuleInfo.class);
+ datas.add(new BaseDataUIBean(str2SpannableString("妯″潡鍨嬪彿"),R.mipmap.version_pic,str2FouregourdSpannableString(rtkModuleInfo.getModel()+""),"",1,null));
+ datas.add(new BaseDataUIBean(str2SpannableString("妯″潡鐘舵��"),R.mipmap.version_pic,str2FouregourdSpannableString(rtkModuleInfo.getStatus()==1?"姝ｅ父":"涓ラ噸閿欒"),"",1,null));
+ }
+
for (int i = 0; i < fields.length; i++) {
fields[i].setAccessible(true);
try {
--
Gitblit v1.8.0