From 507242abe645ce3017118dfbcadaa7d0cfada053 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期四, 12 三月 2020 16:11:15 +0800
Subject: [PATCH] "联网考试“去掉由程序主动结束考试；可以一直考试；修改地图，可以一次性加载场考所有地图，然后车移动到某个项目地图，单独显示项目地图；修改map.json;信号配置，只在ExamStatusOutWorker里面收到ndk_start的时候进行发送；
---
app/src/main/assets/map.json | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/src/main/assets/map.json b/app/src/main/assets/map.json
index 705fd4d..8d37d90 100644
--- a/app/src/main/assets/map.json
+++ b/app/src/main/assets/map.json
@@ -2,7 +2,7 @@
"id": 863,
"item": 1,
"point": [{
- "x-y": [-5.3706, 30.3648, -4.9011, 29.4905, -4.1911, 29.8586, -3.7009, 28.7631, -2.5941, 29.2631, -3.0647, 30.3601, -2.3782, 30.7019, -2.9159, 31.6925]
+ "x-y": [-9.3806, 37.3791, -8.9130, 36.4974, -8.1991, 36.8640, -7.6962, 35.7786, -6.6023, 36.2578, -7.0759, 37.3599, -6.4065, 37.7090, -6.8984, 38.6962]
}
]
},
@@ -10,7 +10,7 @@
"id": 864,
"item": 3,
"point": [{
- "x-y": [-5.3806, 30.3791, -4.9130, 29.4974, -4.1991, 29.8640, -3.6962, 28.7786, -2.6023, 29.2578, -3.0759, 30.3599, -2.4065, 30.7090, -2.8984, 31.6962]
+ "x-y": [-5.3806, 37.3791, -4.9130, 36.4974, -4.1991, 36.8640, -3.6962, 35.7786, -2.6023, 36.2578, -3.0759, 37.3599, -2.4065, 37.7090, -2.8984, 38.6962]
}
]
},
@@ -18,7 +18,7 @@
"id": 865,
"item": 2,
"point": [{
- "x-y": [-2.4065,30.709,-3.0759,30.3599,-2.6023,29.2578,-2.9669,29.0981,-3.4503,30.1946,-3.8247,30.0293,-3.3316,28.9383,-3.6962,28.7786,-4.1991,29.864]
+ "x-y": [-1.9065, 30.7090, -2.5759, 30.3599, -2.1023, 29.2578, -2.4669, 29.0981, -2.9503, 30.1946, -3.3247, 30.0293, -2.8316, 28.9383, -3.1962, 28.7786, -3.6991, 29.8640]
}
]
},
@@ -26,7 +26,7 @@
"id": 866,
"item": 5,
"point": [{
- "x-y": [-2.8984, 31.6962, -2.4065, 30.7090, -3.0759, 30.3599, -2.6023, 29.2578, -3.6962, 28.7786,-4.6667 ,30.7457]
+ "x-y": [1.1016, 31.6962, 1.5935, 30.7090, 0.9241, 30.3599, 1.3977, 29.2578, 0.3038, 28.7786, -0.6667, 30.7457]
}
]
},
--
Gitblit v1.8.0