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/Constant.java | 1
app/src/main/java/safeluck/drive/evaluation/app.java | 3 +
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java | 20 ++++++++++
app/src/main/java/safeluck/drive/evaluation/bean/AbsInitialData.java | 2
app/src/main/java/safeluck/drive/evaluation/bean/RTKModuleInfo.java | 34 +++++++++++++++++
app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java | 8 ++++
6 files changed, 67 insertions(+), 1 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/Constant.java b/app/src/main/java/safeluck/drive/evaluation/Constant.java
index 4ca6c60..883e528 100644
--- a/app/src/main/java/safeluck/drive/evaluation/Constant.java
+++ b/app/src/main/java/safeluck/drive/evaluation/Constant.java
@@ -98,6 +98,7 @@
public static final String RTK_INFO_SAT_QF = "RTK_INFO_SAT_QF";//浠嶳TK info涓幏鍙栫殑鍗槦棰楁暟鍜宷f 缁勬垚鐨刯son
public static final int SUBJECT_III = 3;//璺��
public static final int LEFT_RIGHT_DISTANCE = 0x0020;
+ public static final int RTK_MODLUE_STATUS= 0x0023;
public static final String NEED_MAPS_CAR = "need_maps_car";
//鐢ㄤ簬鍦板浘杞﹁締绉诲姩 鍧愭爣
public static final String BIND_RTK_INFO_MAP = "bind_rtk_info_map";
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 8ca6023..01d67bd 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -543,6 +543,9 @@
}
CEventCenter.dispatchEvent(Constant.BIND_MCUINFO_TOPIC,cmd,0,json);
break;
+ case Constant.RTK_MODLUE_STATUS:
+ ExamPlatformData.getInstance().setRTKModuleInfo(json);
+ break;
case Constant.IC_ID:
CEventCenter.dispatchEvent(Constant.BIND_SPEED_TOPIC,cmd,0,json);
diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/AbsInitialData.java b/app/src/main/java/safeluck/drive/evaluation/bean/AbsInitialData.java
index 73ab536..96bbf48 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/AbsInitialData.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/AbsInitialData.java
@@ -115,7 +115,7 @@
MyLog.i(DataInitKt.getSendVehiSucc()?String.format("杞﹁締妯″瀷鍙戦�佹垚鍔�"):"杞﹁締妯″瀷鍙戦�佸け璐�");
Toast.makeText(app.getAppContext(), "鍦板浘鎴栬溅妯″瀷涓嶅瓨鍦紝璇锋鏌ュ钩鍙伴厤缃垨鎵嬪伐閰嶇疆", Toast.LENGTH_SHORT).show();
}
- },1, TimeUnit.SECONDS);
+ },2, TimeUnit.SECONDS);
}else{
diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java b/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
index eefdab1..77c7852 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
@@ -591,6 +591,26 @@
public String getSMCanBrief(){
return smCanBriefString;
}
+ private String rtkModuleInfoStr;
+ public void setRTKModuleInfo(String json) {
+ if (rtkModuleInfoStr != null && rtkModuleInfoStr.equalsIgnoreCase(json)){
+
+ }else{
+ rtkModuleInfoStr = json;
+ }
+ }
+
+ /***
+ * code = 0x0023;
+ * {
+ * "model":"K726",
+ * "status":1 // 1 - ok, 0 - failure 涓ラ噸闂
+ * }
+ * @return
+ */
+ public String getRTKMoudleInfo(){
+ return rtkModuleInfoStr;
+ }
public void setMcuSN(String sn) {
this.mcuSN = sn;
diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/RTKModuleInfo.java b/app/src/main/java/safeluck/drive/evaluation/bean/RTKModuleInfo.java
new file mode 100644
index 0000000..396e639
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/RTKModuleInfo.java
@@ -0,0 +1,34 @@
+package safeluck.drive.evaluation.bean;
+
+/**
+ * DriveJudge
+ * Created by lzw on 2020/12/28. 17:03:57
+ * 閭锛�632393724@qq.com
+ * All Rights Saved! Chongqing AnYun Tech co. LTD
+ */
+public class RTKModuleInfo {
+
+ /**
+ * model : K726
+ * status : 1 // 1 - ok, 0 - failure 涓ラ噸闂
+ */
+
+ private String model;
+ private int status;
+
+ public String getModel() {
+ return model;
+ }
+
+ public void setModel(String model) {
+ this.model = model;
+ }
+
+ public int getStatus() {
+ return status;
+ }
+
+ public void setStatus(int status) {
+ this.status = status;
+ }
+}
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