From dc64c54f9284b32bc5e022c38f34a6d366daea6c Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期二, 11 二月 2020 18:46:39 +0800
Subject: [PATCH] 提交item2 坡起地图；和item5 直角转弯地图
---
app/src/main/assets/map.json | 18 +++++++++++++++++-
app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java | 10 +++++++---
2 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/app/src/main/assets/map.json b/app/src/main/assets/map.json
index faec768..77cdb4c 100644
--- a/app/src/main/assets/map.json
+++ b/app/src/main/assets/map.json
@@ -8,10 +8,26 @@
},
{
"id": 3000,
- "item": 2,
+ "item": 3,
"point": [{
"x-y": [-11.9669, 28.013, -11.5114, 27.137, -10.8069, 27.5039, -10.2969, 26.4212, -9.2102, 26.8894, -9.6513, 28.0027, -8.9758, 28.3797, -9.5057, 29.3232]
}
]
+ },
+ {
+ "id": 3000,
+ "item": 2,
+ "point": [{
+ "x-y": [-2.4065, 30.7090, -3.0759, 30.3599, -2.6023, 29.2578,-3.3316,28.9383,-3.8247,30.0293,-3.4503,30.1946,-2.9669,29.0981,-3.6962, 28.7786, -4.1991, 29.8640]
+ }
+ ]
+ },
+ {
+ "id": 3000,
+ "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]
+ }
+ ]
}
]
\ No newline at end of file
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 4739eda..44a1800 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
@@ -106,7 +106,9 @@
private String osd2 = null;
private String osd3 = null;
private int map_id;
- double map[][] = {{1, 1}, {10, 1}, {10, 10}, {1, 10}};
+// double map[][] = {{1, 1}, {10, 1}, {10, 10}, {1, 10}};
+ double map[][] = {{-2.4065, 30.7090}, {-3.0759, 30.3599}, { -2.6023, 29.2578}, {-3.3316,28.9383},{-3.8247,30.0293},
+ {-3.4503,30.1946}, {-2.9669,29.0981}, { -3.6962, 28.7786}, {-4.1991, 29.8640}};
// double map[][] ;
double car[][] = {{8.278, 1.467}, {7.2780000000000009, 1.467}, {7.2780000000000009, -1.533}, {8.278, -1.533}
, {9.278, -1.5330000000000004}, {9.277999999999999, 1.467000000000001}};
@@ -126,7 +128,7 @@
consumer.execute(new CalRunnable());
return view;
}
-
+private int avaliableHeight,avalibleWidth;
private void initView(View view) {
toolbar = view.findViewById(R.id.toolbar);
toolbar.setTitle("绠�鍗曞湴鍥�");
@@ -137,7 +139,9 @@
_mActivity.onBackPressed();
}
});
-
+ avaliableHeight= getResources().getDisplayMetrics().heightPixels;
+avalibleWidth = getResources().getDisplayMetrics().widthPixels;
+ Log.i(TAG, "initView: aliwidht="+avalibleWidth+" height="+avaliableHeight);
mSurfaceView = view.findViewById(R.id.surfaceview);
holder = mSurfaceView.getHolder();
--
Gitblit v1.8.0