From e9f78e3f56c8fe8df1569e0bab1ac7938686a958 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期一, 23 三月 2020 17:38:49 +0800
Subject: [PATCH] 查看车载信号 speed除以10.0； 修改信号物理索引
---
app/src/main/java/safeluck/drive/evaluation/fragment/InspectSignalFragment.java | 30 +++++++-------
app/src/main/res/layout/layout_signal_slice.xml | 2
app/src/main/assets/roadmap.json | 19 +++++++--
app/src/main/assets/signal_config_file.json | 30 +++++++-------
4 files changed, 46 insertions(+), 35 deletions(-)
diff --git a/app/src/main/assets/roadmap.json b/app/src/main/assets/roadmap.json
index 010b72f..c88777b 100644
--- a/app/src/main/assets/roadmap.json
+++ b/app/src/main/assets/roadmap.json
@@ -1,5 +1,6 @@
{
- "points": [0, 1, 1.6, 1, 2.55, 1, 3.05, 1, 4.55, 1, 5.003, 1, 6.003, 1, 9.003, 1, 9.003, 4, 0, 0.5, 9.003, 0.5, 0, 0, 1.6, 0, 2.55, 0, 3.05, 0, 4.55, 0, 5.003, 0, 5.003, -2, 5.003, -3, 5.003, -4, 6.003, -4, 7.003, -4, 9.003, -4, 10.003, -4, 10.003, -3, 10.003, 4, 6.003, 0, 9.003, 0, 6.003, 0, 6.003, -3, 9.003, -3, 9.003, 0, 5.503, 0, 5.503, -2, 5.503, -3.5, 7.003, -3.5, 9.503, -3.5, 9.503, 4, 1.6, 1, 1.6, 0, 2.55, 1, 2.55, 0, 3.05, 0, 3.05, 1, 4.55, 1, 4.55, 0, 5.003, 1, 5.003, 0, 6.003, 0, 6.003, 1, 6.003, -2, 5.003, -2, 6.003, -3, 5.003, -3, 5.003, -4, 6.003, -4, 9.003, -1, 10.003, -1, 9.003, 0, 10.003, 0, 10.003, 1, 9.003, 1],
+ "points": [0, 1, 1.6, 1, 2.55, 1, 3.05, 1, 4.55, 1, 5.003, 1, 6.003, 1, 9.003, 1, 9.003, 4, 0, 0.5, 9.003, 0.5, 0, 0, 1.6, 0, 2.55, 0, 3.05, 0, 4.55, 0, 5.003, 0, 5.003, -2, 5.003, -3, 5.003, -4, 6.003, -4, 7.003, -4, 9.003, -4, 10.003, -4, 10.003, -3, 10.003, 4, 6.003, 0, 9.003, 0, 6.003, 0, 6.003, -3, 9.003, -3, 9.003, 0, 5.503, 0, 5.503, -2, 5.503, -3.5, 7.003, -3.5, 9.503, -3.5, 9.503, 4, 1.6, 1, 1.6, 0, 2.55, 1, 2.55, 0, 3.05, 0, 3.05, 1, 4.55, 1, 4.55, 0, 5.003, 1, 5.003, 0, 6.003, 0, 6.003, 1, 6.003, -2, 5.003, -2, 6.003, -3, 5.003, -3, 5.003, -4, 6.003, -4, 9.003, -1, 10.003, -1, 9.003, 0, 10.003, 0, 10.003, 1, 9.003, 1,11.003,4,11.003,-4,10.5003,4,10.5003,-4,
+ 10.003,3,9.003,3,10.003,4,9.003,4,11.003,4,10.003,4,11.003,3,10.003,3],
"maps": [{
"id": 1000,
"item": 100,
@@ -7,17 +8,20 @@
[0, 1, 2, 3, 4, 5, 6, 7, 8],
[11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25],
[26, 27],
- [28, 29, 30, 31]
+ [28, 29, 30, 31],
+ [62,63]
],
"green_line": [
[9, 10],
- [32, 33, 34, 35, 36, 37]
+ [32, 33, 34, 35, 36, 37],
+ [64, 65]
],
"all_trigger_line": [
[1002, 39, 38],
[1003, 45, 44],
[1004, 57, 56],
- [1005, 51, 50]
+ [1005, 51, 50],
+ [1006, 66, 67]
],
"red_area": [
[40, 41, 42, 43]
@@ -54,5 +58,12 @@
"end_line": [54, 55],
"area": [50,51,54,55],
"stop_flag": 0
+ }, {
+ "id": 1006,
+ "item": 110,
+ "tts": "鍓嶆柟鎺夊ご",
+ "stop_line": [68, 69],
+ "area": [67,69,70,72],
+ "stop_flag": 0
}]
}
\ No newline at end of file
diff --git a/app/src/main/assets/signal_config_file.json b/app/src/main/assets/signal_config_file.json
index c41a934..c88de8c 100644
--- a/app/src/main/assets/signal_config_file.json
+++ b/app/src/main/assets/signal_config_file.json
@@ -1,56 +1,56 @@
[
{
- "signalName": "瀹夊叏甯�",
+ "signalName": "闆剧伅",
"index":1,
"id":0,
"highLevel":2,
"mainBoard":2
},
{
- "signalName": "宸﹁浆鍚�",
+ "signalName": "涓夋。",
"index":2,
"id":1,
"highLevel":2,
"mainBoard":2
},
{
- "signalName": "鍙宠浆鍚�",
+ "signalName": "鎵嬪埞",
"index":3,
"id":2,
"highLevel":2,
"mainBoard":2
},
{
- "signalName": "鎵嬪埞",
+ "signalName": "涓�妗�",
"index":4,
"id":3,
"highLevel":2,
"mainBoard":2
},
{
- "signalName": "鑴氬埞",
+ "signalName": "鍓埞",
"index":5,
"id":4,
"highLevel":2,
"mainBoard":2
},
{
- "signalName": "杩戝厜鐏�",
+ "signalName": "瀹夊叏甯�",
"index":6,
"id":5,
"highLevel":2,
"mainBoard":2
},
{
- "signalName": "杩滃厜鐏�",
+ "signalName": "浜屾。",
"index":7,
"id":6,
"highLevel":2,
"mainBoard":2
},
{
- "signalName": "闂ㄩ攣",
+ "signalName": "鑴氬埞",
"index":8,
"id":7,
"highLevel":2,
@@ -64,49 +64,49 @@
"mainBoard":2
},
{
- "signalName": "1妗�",
+ "signalName": "闂ㄩ攣",
"index":10,
"id":9,
"highLevel":2,
"mainBoard":2
},
{
- "signalName": "2妗�",
+ "signalName": "START浣�",
"index":11,
"id":10,
"highLevel":2,
"mainBoard":2
},
{
- "signalName": "3妗�",
+ "signalName": "杩滃厜",
"index":12,
"id":11,
"highLevel":2,
"mainBoard":2
},
{
- "signalName": "4妗�",
+ "signalName": "缁曡溅涓�",
"index":13,
"id":12,
"highLevel":2,
"mainBoard":2
},
{
- "signalName": "5妗�",
+ "signalName": "杩戝厜",
"index":14,
"id":13,
"highLevel":2,
"mainBoard":2
},
{
- "signalName": "鍊掓。",
+ "signalName": "宸﹁浆",
"index":15,
"id":14,
"highLevel":2,
"mainBoard":2
},
{
- "signalName": "START浣�",
+ "signalName": "鍙宠浆",
"index":16,
"id":15,
"highLevel":0,
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/InspectSignalFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/InspectSignalFragment.java
index 375615e..326c4da 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/InspectSignalFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/InspectSignalFragment.java
@@ -70,28 +70,28 @@
@Override
public void run() {
bingding.tvRoateSpeed.setText(String.valueOf(mcuInfo.getEngine()));
- bingding.tvDangweiNum.setText(String.valueOf(mcuInfo.getSpeed()));
+ bingding.tvDangweiNum.setText(String.valueOf(mcuInfo.getSpeed()/10.0));
for (int i = 0; i < gpios.size(); i++) {
Log.i(TAG, "run: gpio["+i+"]="+gpios.get(i));
}
- bingding.inpsetSignalSlice.tvSeatBelt.setCompoundDrawablesWithIntrinsicBounds(gpios.get(0)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
- bingding.inpsetSignalSlice.tvTrunLeft.setCompoundDrawablesWithIntrinsicBounds(gpios.get(1)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
- bingding.inpsetSignalSlice.tvTurnRight.setCompoundDrawablesWithIntrinsicBounds(gpios.get(2)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
- bingding.inpsetSignalSlice.tvParkingBrake.setCompoundDrawablesWithIntrinsicBounds(gpios.get(3)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
- bingding.inpsetSignalSlice.tvFootBrake.setCompoundDrawablesWithIntrinsicBounds(gpios.get(4)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
- bingding.inpsetSignalSlice.tvLowLamp.setCompoundDrawablesWithIntrinsicBounds(gpios.get(5)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
- bingding.inpsetSignalSlice.tvHighBeam.setCompoundDrawablesWithIntrinsicBounds(gpios.get(6)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
+ bingding.inpsetSignalSlice.tvSeatBelt.setCompoundDrawablesWithIntrinsicBounds(gpios.get(5)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
+ bingding.inpsetSignalSlice.tvTrunLeft.setCompoundDrawablesWithIntrinsicBounds(gpios.get(14)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
+ bingding.inpsetSignalSlice.tvTurnRight.setCompoundDrawablesWithIntrinsicBounds(gpios.get(15)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
+ bingding.inpsetSignalSlice.tvParkingBrake.setCompoundDrawablesWithIntrinsicBounds(gpios.get(2)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
+ bingding.inpsetSignalSlice.tvFootBrake.setCompoundDrawablesWithIntrinsicBounds(gpios.get(7)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
+ bingding.inpsetSignalSlice.tvLowLamp.setCompoundDrawablesWithIntrinsicBounds(gpios.get(13)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
+ bingding.inpsetSignalSlice.tvHighBeam.setCompoundDrawablesWithIntrinsicBounds(gpios.get(11)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
- bingding.inpsetSignalSlice.tvGateLock.setCompoundDrawablesWithIntrinsicBounds(gpios.get(7)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
+ bingding.inpsetSignalSlice.tvGateLock.setCompoundDrawablesWithIntrinsicBounds(gpios.get(9)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
bingding.inpsetSignalSlice.tvNullEngine.setCompoundDrawablesWithIntrinsicBounds(gpios.get(8)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
- bingding.inpsetSignalSlice.tvGearOne.setCompoundDrawablesWithIntrinsicBounds(gpios.get(9)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
- bingding.inpsetSignalSlice.tvGearTwo.setCompoundDrawablesWithIntrinsicBounds(gpios.get(10)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
- bingding.inpsetSignalSlice.tvGearThree.setCompoundDrawablesWithIntrinsicBounds(gpios.get(11)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
- bingding.inpsetSignalSlice.tvGearFour.setCompoundDrawablesWithIntrinsicBounds(gpios.get(12)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
+ bingding.inpsetSignalSlice.tvGearOne.setCompoundDrawablesWithIntrinsicBounds(gpios.get(3)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
+ bingding.inpsetSignalSlice.tvGearTwo.setCompoundDrawablesWithIntrinsicBounds(gpios.get(6)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
+ bingding.inpsetSignalSlice.tvGearThree.setCompoundDrawablesWithIntrinsicBounds(gpios.get(1)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
+ bingding.inpsetSignalSlice.tvGearFour.setCompoundDrawablesWithIntrinsicBounds(gpios.get(4)==VALIAD_NUM?leftGreen:leftGray,null,null,null);//鍓埞
bingding.inpsetSignalSlice.tvGearFive.setCompoundDrawablesWithIntrinsicBounds(gpios.get(13)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
- bingding.inpsetSignalSlice.tvWindingOne.setCompoundDrawablesWithIntrinsicBounds(gpios.get(14)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
- bingding.inpsetSignalSlice.tvWindingTwo.setCompoundDrawablesWithIntrinsicBounds(gpios.get(15)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
+ bingding.inpsetSignalSlice.tvWindingOne.setCompoundDrawablesWithIntrinsicBounds(gpios.get(12)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
+ bingding.inpsetSignalSlice.tvWindingTwo.setCompoundDrawablesWithIntrinsicBounds(gpios.get(10)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
}
});
}
diff --git a/app/src/main/res/layout/layout_signal_slice.xml b/app/src/main/res/layout/layout_signal_slice.xml
index 3034050..589a033 100644
--- a/app/src/main/res/layout/layout_signal_slice.xml
+++ b/app/src/main/res/layout/layout_signal_slice.xml
@@ -124,7 +124,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="妗ｄ綅鍥�"
+ android:text="鍓埞"
android:layout_marginLeft="30dp"
android:id="@+id/tv_gear_four"
android:drawableLeft="@drawable/gray_light"
--
Gitblit v1.8.0