From 466d57f581dab2b82d18ca926cac6e037a91f3dd Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期二, 24 三月 2020 09:56:05 +0800
Subject: [PATCH] 提交信号
---
app/src/main/java/safeluck/drive/evaluation/DB/signalConfigdb/SingalConfig.java | 8 ++++
app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusOutWorker.kt | 4 +-
app/src/main/java/safeluck/drive/evaluation/bean/RoadExamMap.java | 22 +++++-----
app/src/main/assets/roadmap.json | 22 +++++++++-
app/src/main/assets/signal_config_file.json | 34 ++++++++++++----
5 files changed, 65 insertions(+), 25 deletions(-)
diff --git a/app/src/main/assets/roadmap.json b/app/src/main/assets/roadmap.json
index c88777b..f2efb4e 100644
--- a/app/src/main/assets/roadmap.json
+++ b/app/src/main/assets/roadmap.json
@@ -1,6 +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,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],
+ 10.003,3,9.003,3,10.003,4,9.003,4,11.003,4,10.003,4,11.003,3,10.003,3,11.003,1,10.003,1,11.003,0,10.003,0,11.003,-1,10.003,-1,11.003,-2,10.003,-2,10.5003,-3,10.5003,-3,11.003,-3,10.003,-3],
"maps": [{
"id": 1000,
"item": 100,
@@ -21,7 +21,9 @@
[1003, 45, 44],
[1004, 57, 56],
[1005, 51, 50],
- [1006, 66, 67]
+ [1006, 66, 67],
+ [1007, 73,74],
+ [1008, 77,78]
],
"red_area": [
[40, 41, 42, 43]
@@ -55,7 +57,6 @@
"item": 105,
"tts": "鍓嶆柟宸﹁浆寮�",
"stop_line": [53, 52],
- "end_line": [54, 55],
"area": [50,51,54,55],
"stop_flag": 0
}, {
@@ -65,5 +66,20 @@
"stop_line": [68, 69],
"area": [67,69,70,72],
"stop_flag": 0
+ }, {
+ "id": 1007,
+ "item": 102,
+ "tts": "鍔犲噺妗ｄ綅",
+ "stop_line": [75, 76],
+ "area": [73,74,76,75],
+ "stop_flag": 0
+ }, {
+ "id": 1008,
+ "item": 101,
+ "tts": "鐩寸嚎琛岄┒",
+ "road_edge_line": [[81, 82]],
+ "stop_line": [79, 80],
+ "area": [77,78,84,83],
+ "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 c88de8c..2d2e76c 100644
--- a/app/src/main/assets/signal_config_file.json
+++ b/app/src/main/assets/signal_config_file.json
@@ -3,34 +3,39 @@
{
"signalName": "闆剧伅",
"index":1,
+ "func_id":21,
"id":0,
- "highLevel":2,
+ "highLevel":1,
"mainBoard":2
},
{
"signalName": "涓夋。",
"index":2,
+ "func_id":11,
"id":1,
- "highLevel":2,
+ "highLevel":1,
"mainBoard":2
},
{
"signalName": "鎵嬪埞",
"index":3,
"id":2,
- "highLevel":2,
+ "func_id":3,
+ "highLevel":1,
"mainBoard":2
},
{
"signalName": "涓�妗�",
"index":4,
+ "func_id":9,
"id":3,
- "highLevel":2,
+ "highLevel":1,
"mainBoard":2
},
{
"signalName": "鍓埞",
"index":5,
+ "func_id":16,
"id":4,
"highLevel":2,
"mainBoard":2
@@ -39,6 +44,7 @@
"signalName": "瀹夊叏甯�",
"index":6,
"id":5,
+ "func_id":0,
"highLevel":2,
"mainBoard":2
},
@@ -46,6 +52,7 @@
"signalName": "浜屾。",
"index":7,
"id":6,
+ "func_id":10,
"highLevel":2,
"mainBoard":2
},
@@ -53,12 +60,14 @@
"signalName": "鑴氬埞",
"index":8,
"id":7,
+ "func_id":4,
"highLevel":2,
"mainBoard":2
},
{
"signalName": "绌烘尅",
"index":9,
+ "func_id":8,
"id":8,
"highLevel":2,
"mainBoard":2
@@ -66,6 +75,7 @@
{
"signalName": "闂ㄩ攣",
"index":10,
+ "func_id":7,
"id":9,
"highLevel":2,
"mainBoard":2
@@ -73,6 +83,7 @@
{
"signalName": "START浣�",
"index":11,
+ "func_id":15,
"id":10,
"highLevel":2,
"mainBoard":2
@@ -80,36 +91,41 @@
{
"signalName": "杩滃厜",
"index":12,
+ "func_id":6,
"id":11,
- "highLevel":2,
+ "highLevel":1,
"mainBoard":2
},
{
"signalName": "缁曡溅涓�",
"index":13,
"id":12,
- "highLevel":2,
+ "func_id":17,
+ "highLevel":1,
"mainBoard":2
},
{
"signalName": "杩戝厜",
"index":14,
+ "func_id":5,
"id":13,
- "highLevel":2,
+ "highLevel":1,
"mainBoard":2
},
{
"signalName": "宸﹁浆",
"index":15,
+ "func_id":1,
"id":14,
- "highLevel":2,
+ "highLevel":1,
"mainBoard":2
},
{
"signalName": "鍙宠浆",
"index":16,
"id":15,
- "highLevel":0,
+ "func_id":2,
+ "highLevel":1,
"mainBoard":2
}
]
\ No newline at end of file
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusOutWorker.kt b/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusOutWorker.kt
index 5e95c1b..ecc25a2 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusOutWorker.kt
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusOutWorker.kt
@@ -96,8 +96,8 @@
}
for (i in singalConfigs.indices) {
val signalConfigRemote = SignalConfigRemote()
- signalConfigRemote.func_id = i
- signalConfigRemote.gpio_num = singalConfigs.get(i).getIndex()
+ signalConfigRemote.func_id = singalConfigs.get(i).func_id
+ signalConfigRemote.gpio_num = singalConfigs.get(i).getIndex()-1
signalConfigRemote.level = singalConfigs.get(i).getHighLevel()
signalConfiglist.add(signalConfigRemote)
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/signalConfigdb/SingalConfig.java b/app/src/main/java/safeluck/drive/evaluation/DB/signalConfigdb/SingalConfig.java
index 07143b5..7be257c 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/signalConfigdb/SingalConfig.java
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/signalConfigdb/SingalConfig.java
@@ -20,7 +20,15 @@
private int index;
private int highLevel;//1-楂樼數骞虫湁鏁�
private int mainBoard;//1-涓绘澘鏈夋晥
+ private int func_id;//1gongneng
+ public int getFunc_id() {
+ return func_id;
+ }
+
+ public void setFunc_id(int func_id) {
+ this.func_id = func_id;
+ }
public String getSignalName() {
return signalName;
diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/RoadExamMap.java b/app/src/main/java/safeluck/drive/evaluation/bean/RoadExamMap.java
index 88fefc3..9778401 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/RoadExamMap.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/RoadExamMap.java
@@ -26,17 +26,17 @@
public static class MapsBean {
/**
- * id : 1005
+ * id : 1000
* item : 100
- * red_line : [[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]]
- * green_line : [[9,10],[32,33,34,35,36,37]]
- * all_trigger_line : [[1002,38,39],[1003,44,45],[1004,56,57],[1005,50,51]]
+ * red_line : [[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],[62,63]]
+ * green_line : [[9,10],[32,33,34,35,36,37],[64,65]]
+ * all_trigger_line : [[1002,39,38],[1003,45,44],[1004,57,56],[1005,51,50],[1006,66,67],[1007,73,74],[1008,77,78]]
* red_area : [[40,41,42,43]]
* tts : 鍓嶆柟鍙宠浆
- * stop_line : [46,47]
+ * stop_line : [47,46]
* area : [44,45,48,49]
* stop_flag : 0
- * end_line : [54,55]
+ * road_edge_line : [[81,82]]
*/
private int id;
@@ -49,7 +49,7 @@
private List<List<Integer>> red_area;
private List<Integer> stop_line;
private List<Integer> area;
- private List<Integer> end_line;
+ private List<List<Integer>> road_edge_line;
public int getId() {
return id;
@@ -131,12 +131,12 @@
this.area = area;
}
- public List<Integer> getEnd_line() {
- return end_line;
+ public List<List<Integer>> getRoad_edge_line() {
+ return road_edge_line;
}
- public void setEnd_line(List<Integer> end_line) {
- this.end_line = end_line;
+ public void setRoad_edge_line(List<List<Integer>> road_edge_line) {
+ this.road_edge_line = road_edge_line;
}
}
}
--
Gitblit v1.8.0