From 640d3f6bde589d720a1bfc9241a9c3b43ef864bf Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期三, 08 四月 2020 11:45:48 +0800
Subject: [PATCH] 提交科二地图
---
app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
index 05df01b..eb95882 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
@@ -694,10 +694,7 @@
}
}
- for (int i = 0, j = 0; i < map[k].length && j < map_other.length; i++, j++) {
- path.moveTo((float) (base_x + (map[k][i][0] - min_x) * scale_x), (float) (base_y + (map[k][i][1] - min_y) * scale_y));
- path.lineTo((float) (base_x + (map_other[j][0] - min_x) * scale_x), (float) (base_y + (map_other[j][1] - min_y) * scale_y));
- }
+
}
}
@@ -1248,7 +1245,7 @@
// 4 - 鏇茬嚎琛岄┒
// 5 - 鐩磋杞集
StringBuffer buffer=null;
- List<ExamMap> examMaps;
+ ExamMap examMaps;
String newmap = null;
String mapPath = ExamPlatformData.getInstance().getMapPath();
if (!TextUtils.isEmpty(mapPath)){
@@ -1263,7 +1260,7 @@
buffer = FileUtil.readAssetTxtFile(_mActivity,Constant.MAP);
}
- Type type = new TypeToken<List<ExamMap>>(){}.getType();
+ Type type = new TypeToken<ExamMap>(){}.getType();
if (buffer != null){
examMaps= gson.fromJson(buffer.toString().trim(), type);
}else{
@@ -1271,11 +1268,11 @@
}
map_id = -1;
if (map_id == -1){
- allMap =new double[examMaps.size()][][];
- for (int i = 0; i < examMaps.size(); i++) {
- ExamMap examMap = examMaps.get(i);
+ allMap =new double[examMaps.getItems().size()][][];
+ for (int i = 0; i < examMaps.getItems().size(); i++) {
+ ExamMap.ItemsBean examMap = examMaps.getItems().get(i);
- List<ExamMap.PointBean> pointBeanList = examMap.getPoint();
+ List<ExamMap.ItemsBean.PointBean> pointBeanList = examMap.getPoint();
for(int j=0; j<pointBeanList.size();j++){
List<Double> xys = pointBeanList.get(j).getXy();
@@ -1322,10 +1319,10 @@
DrawMapAll(yaw, mainAnt,allMap, mapOther, car,body,tire);
}else{
- for (int i = 0; i < examMaps.size(); i++) {
- ExamMap examMap = examMaps.get(i);
+ for (int i = 0; i < examMaps.getItems().size(); i++) {
+ ExamMap.ItemsBean examMap = examMaps.getItems().get(i);
if (map_id == examMap.getId()){
- List<ExamMap.PointBean> pointBeanList = examMap.getPoint();
+ List<ExamMap.ItemsBean.PointBean> pointBeanList = examMap.getPoint();
for(int j=0; j<pointBeanList.size();j++){
List<Double> xys = pointBeanList.get(j).getXy();
--
Gitblit v1.8.0