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/Constant.java | 2 +
app/src/main/java/safeluck/drive/evaluation/app.java | 2 +
app/src/main/java/safeluck/drive/evaluation/adapter/SimpleFragmentAdapter.java | 10 ++--
app/src/main/java/safeluck/drive/evaluation/bean/ProductTestData.java | 62 +++++++++++++++++++++++++++++++
app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java | 12 +++++
5 files changed, 82 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/Constant.java b/app/src/main/java/safeluck/drive/evaluation/Constant.java
index c54040d..01fb449 100644
--- a/app/src/main/java/safeluck/drive/evaluation/Constant.java
+++ b/app/src/main/java/safeluck/drive/evaluation/Constant.java
@@ -98,6 +98,8 @@
public static final String BIND_ROUTE_COLLECT_TOPIC = "BIND_ROUTE_COLLECT_TOPIC";
public static final int ENTER_OR_EXIT_ROAD_ID = 0x0015;
public static final int ENTER_OR_EXIT_ROADCROSS_ID = 0x0016;
+ //鐢ㄤ簬鎺ュ彈浜ф祴鏁版嵁
+ public static final int ID_SM_CAN_BRIEF = 0x0021;
public static String exam_enter_exitdata="exam_enter_exitdata";
public static int Chang_di = 2;
public static int DaoLu_night = 3;
diff --git a/app/src/main/java/safeluck/drive/evaluation/adapter/SimpleFragmentAdapter.java b/app/src/main/java/safeluck/drive/evaluation/adapter/SimpleFragmentAdapter.java
index cd92432..7b2f7b0 100644
--- a/app/src/main/java/safeluck/drive/evaluation/adapter/SimpleFragmentAdapter.java
+++ b/app/src/main/java/safeluck/drive/evaluation/adapter/SimpleFragmentAdapter.java
@@ -20,7 +20,8 @@
* All Rights Saved! Chongqing AnYun Tech co. LTD
*/
public class SimpleFragmentAdapter extends FragmentPagerAdapter {
- private String[] mTitles = new String[]{"鍩虹鏁版嵁","鑰冭瘯绯荤粺璁剧疆"};
+ private String[] mTitles = new String[]{"鍩虹鏁版嵁","GNSS淇℃伅"};
+// private String[] mTitles = new String[]{"鍩虹鏁版嵁","GNSS淇℃伅","鑰冭瘯绯荤粺璁剧疆"};
public SimpleFragmentAdapter(FragmentManager fm) {
super(fm);
}
@@ -38,11 +39,10 @@
// //ftp
// break;
// case 2:
-// supportFragment = JiaXiaoFragment.newInstance();
-// //椹炬牎淇℃伅
+// supportFragment = SysExamSettingFragment.newInstance();
// break;
- case 1:
- supportFragment = SysExamSettingFragment.newInstance();
+ case 1:
+ supportFragment = GpsInfoFragment.newInstance();
break;
default:break;
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 5f4e898..a454e27 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -527,6 +527,8 @@
case Constant.ENTER_OR_EXIT_ROADCROSS_ID:
CEventCenter.dispatchEvent(Constant.BIND_ROUTE_COLLECT_TOPIC,cmd,0,json);
break;
+ case Constant. ID_SM_CAN_BRIEF:
+ break;
}
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/ProductTestData.java b/app/src/main/java/safeluck/drive/evaluation/bean/ProductTestData.java
new file mode 100644
index 0000000..9f0b937
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/ProductTestData.java
@@ -0,0 +1,62 @@
+package safeluck.drive.evaluation.bean;
+
+/**
+ * DriveJudge
+ * Created by lzw on 2020/9/29. 14:40:19
+ * 閭锛�632393724@qq.com
+ * All Rights Saved! Chongqing AnYun Tech co. LTD
+ */
+public class ProductTestData {
+
+ /**
+ * gpio : 32
+ * rpm : 1200
+ * speed : 55.6
+ * voltage : 6.3
+ *
+ *
+ * {
+ * "gpio": int 鍙栦綆16浣嶏紝鍏蜂綋瀹氫箟涓嶆檽寰楁槸鍟�
+ * "rpm": int 杞�/鍒�
+ * "speed": double 鍏噷/鏃�
+ * "voltage": double 浼忕壒
+ * }
+ */
+
+ private int gpio;
+ private int rpm;
+ private double speed;
+ private double voltage;
+
+ public int getGpio() {
+ return gpio;
+ }
+
+ public void setGpio(int gpio) {
+ this.gpio = gpio;
+ }
+
+ public int getRpm() {
+ return rpm;
+ }
+
+ public void setRpm(int rpm) {
+ this.rpm = rpm;
+ }
+
+ public double getSpeed() {
+ return speed;
+ }
+
+ public void setSpeed(double speed) {
+ this.speed = speed;
+ }
+
+ public double getVoltage() {
+ return voltage;
+ }
+
+ public void setVoltage(double voltage) {
+ this.voltage = voltage;
+ }
+}
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