From 2dcc5eeda40be50780a35977313dcf3d6d578389 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期二, 08 九月 2020 15:44:29 +0800
Subject: [PATCH] 更新车模型类，加入海拔等字段
---
app/src/main/java/safeluck/drive/evaluation/util/Utils.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/util/Utils.java b/app/src/main/java/safeluck/drive/evaluation/util/Utils.java
index 76649f3..3380df0 100644
--- a/app/src/main/java/safeluck/drive/evaluation/util/Utils.java
+++ b/app/src/main/java/safeluck/drive/evaluation/util/Utils.java
@@ -695,14 +695,14 @@
return carModelList;
}
- public static List<Point> getCarPoint(double pitch,double yaw,Point point){
+ public static List<Point> getCarPoint(double pitch,double yaw,Point point,GisCarModel gisCarModel){
pitch = 0;
// yaw = 45;
Point main_ant = point;
List<Point> carNew = new ArrayList<>();
- StringBuffer buffer=FileUtil.readAssetTxtFile(app.getAppContext(),"giscar.json");
- Log.i(TAG,"giscar="+buffer.toString());
- GisCarModel gisCarModel= new Gson().fromJson(buffer.toString(),GisCarModel.class);
+// StringBuffer buffer=FileUtil.readAssetTxtFile(app.getAppContext(),"giscar.json");
+// Log.i(TAG,"giscar="+buffer.toString());
+// GisCarModel gisCarModel= new Gson().fromJson(buffer.toString(),GisCarModel.class);
List<Point> pointList = new ArrayList<Point>() ;
for (int i = 0; i < gisCarModel.getPoint().size(); i++) {
double x= gisCarModel.getPoint().get(i);
@@ -715,11 +715,13 @@
}
double mainAnt_x = gisCarModel.getMain_ant().get(0);
double mainAnt_y = gisCarModel.getMain_ant().get(1);
+ long pretime = System.currentTimeMillis();
List<CarModel> carModels = getCarModelData(new Point(mainAnt_x, mainAnt_y),gisCarModel.getAxial(),pointList);
+
if (carModels != null && carModels.size()>0){
for (int i = 0; i < carModels.size(); ++i) {
- Log.i(TAG,String.format("浣嶇疆[%d],distance=%f,angle=%f",i,carModels.get(i).getDistance(),carModels.get(i).getAngle()));
+// Log.i(TAG,String.format("浣嶇疆[%d],distance=%f,angle=%f",i,carModels.get(i).getDistance(),carModels.get(i).getAngle()));
double qrx = carModels.get(i).getDistance() * Math.sin(carModels.get(i).getAngle() * Math.PI / 180);
double qry = carModels.get(i).getDistance() * Math.cos(carModels.get(i).getAngle() * Math.PI / 180) * Math.cos(pitch * Math.PI / 180);
@@ -742,6 +744,7 @@
}
}
+ Log.i(TAG,String.format("getCarModelData 鑰楁椂=%d姣",System.currentTimeMillis()-pretime));
return carNew;
--
Gitblit v1.8.0