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 ++++--
app/src/main/java/safeluck/drive/evaluation/httpmodule/HttpCarRespBean.java | 58 ++++++++++++++++++++++++----
app/src/main/res/values/colors.xml | 38 +++++++++++++++++++
3 files changed, 95 insertions(+), 14 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/httpmodule/HttpCarRespBean.java b/app/src/main/java/safeluck/drive/evaluation/httpmodule/HttpCarRespBean.java
index d2ab3f1..90c2ac0 100644
--- a/app/src/main/java/safeluck/drive/evaluation/httpmodule/HttpCarRespBean.java
+++ b/app/src/main/java/safeluck/drive/evaluation/httpmodule/HttpCarRespBean.java
@@ -3,11 +3,11 @@
import java.util.List;
public class HttpCarRespBean {
-
/**
* result : true
- * data : {"server":"gps.safeluck.com","port":"3301","map_json":{"axial":[0,12],"left_front_tire":[8,9],"main_ant":[-9151.5063,13030.5118],"right_front_tire":[20,21],"right_rear_tire":[22,23],"name":"绉戜簩鍦鸿�冭溅妯″瀷","left_rear_tire":[10,11],"type":"car","body":[0,1,2,3,4,5,6,7,12,13,14,15,16,17,18,19],"point":[-9149.6063,13033.0768,-9149.9978,13033.3124,-9150.3258,13033.3485,-9150.8341,13032.8985,-9151.7318,13031.6639,-9152.3573,13030.83,-9152.5214,13030.5639,-9152.602,13030.3105,-9150.8053,13032.8843,-9150.6537,13032.7602,-9152.3352,13030.8124,-9152.221,13030.7008,-9152.092,13029.7892,-9151.4638,13029.4333,-9151.2111,13029.568,-9150.9808,13029.8341,-9150.3546,13030.6796,-9149.458,13031.8642,-9149.1611,13032.4276,-9149.2827,13032.7653,-9149.4842,13031.8708,-9149.6176,13031.9937,-9151.0011,13029.8717,-9151.1367,13029.9878]},"pzh":"璞獷8000娴�"}
+ * data : {"server":"gps.safeluck.com","port":"3301","gps_monitor_url":"https%3A%2F%2Ftrainsim.aaej.cn%2F%23%2Fvisitor%2Fmonitor%3Fdevice_id%3D0314200100000004%26area_type%3Dcar","map_json":{"left_front_tire":[9,10],"main_ant":[428984.9367,3291974.6021],"type":"car","body":[0,1,2,3,4,5,6,7,8,13,14,15,16,17,18,19,20,21],"ground_height":229.8357,"version":"0.1","point":[428984.1653,3291977.6796,428983.7684,3291977.5547,428983.498,3291977.0243,428983.5552,3291976.6508,428983.8355,3291975.483,428984.0438,3291974.7034,428984.1558,3291974.1226,428984.5245,3291973.295,428984.8693,3291973.2598,428983.5944,3291976.6639,428983.769,3291976.6702,428984.203,3291974.1338,428984.342,3291974.1803,428985.23,3291973.3175,428985.6473,3291973.4636,428985.8995,3291973.6719,428985.8234,3291974.5267,428985.6107,3291975.3336,428985.4377,3291976.0995,428985.1876,3291977.0475,428984.9813,3291977.5092,428984.5666,3291977.7383,428985.1356,3291977.0333,428984.9657,3291976.9994,428985.785,3291974.5007,428985.6423,3291974.4559],"axial":[0,13],"ant_pitch":0.081,"ant_height":231.2434,"right_front_tire":[22,23],"right_rear_tire":[24,25],"name":"娑櫟浜ら�氶┚鏍�","left_rear_tire":[11,12]},"version":"0.1","pzh":"璞獷8000娴�"}
*/
+
private boolean result;
private DataBean data;
@@ -39,7 +39,16 @@
private String server;
private String port;
private String version;
- private String map_url;
+
+ public String getGps_monitor_url() {
+ return gps_monitor_url;
+ }
+
+ public void setGps_monitor_url(String gps_monitor_url) {
+ this.gps_monitor_url = gps_monitor_url;
+ }
+
+ private String gps_monitor_url;
private MapJsonBean map_json;
private String pzh;
@@ -55,13 +64,7 @@
this.version = version;
}
- public String getMap_url() {
- return map_url;
- }
- public void setMap_url(String map_url) {
- this.map_url = map_url;
- }
public void setServer(String server) {
this.server = server;
@@ -116,6 +119,11 @@
private List<Integer> body;
private List<Double> point;
+ private double ground_height;
+ private String version;
+ private double ant_pitch;
+ private double ant_height;
+
public String getName() {
return name;
}
@@ -136,6 +144,38 @@
return axial;
}
+
+ public double getGround_height() {
+ return ground_height;
+ }
+
+ public void setGround_height(double ground_height) {
+ this.ground_height = ground_height;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public double getAnt_pitch() {
+ return ant_pitch;
+ }
+
+ public void setAnt_pitch(double ant_pitch) {
+ this.ant_pitch = ant_pitch;
+ }
+
+ public double getAnt_height() {
+ return ant_height;
+ }
+
+ public void setAnt_height(double ant_height) {
+ this.ant_height = ant_height;
+ }
public void setAxial(List<Integer> axial) {
this.axial = axial;
}
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;
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 08dd8d1..18e8a79 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -14,4 +14,42 @@
<color name="pink">#FF3399</color>
<color name="examing">#99C3D1</color>
<color name="red">#DC143C</color>
+ <color name="color_505050">#505050</color>
+ <color name="color_ff4444">#FF4444</color>
+ <color name="color_ff0000">#FF0000</color>
+ <color name="color_939393">#939393</color>
+ <color name="color_e1e6e8">#E1E6E8</color>
+ <color name="color_ffffff">#FFFFFF</color>
+ <color name="color_262626">#262626</color>
+ <color name="color_00adef">#00ADEF</color>
+ <color name="color_f76260">#F76260</color>
+ <color name="color_000000">#000000</color>
+ <color name="color_797979">#797979</color>
+ <color name="color_e5e5e5">#E5E5E5</color>
+ <color name="color_f8f9f9">#F8F9F9</color>
+ <color name="color_c8c7cc">#C8C7CC</color>
+ <color name="color_19d7d9">#19D7D9</color>
+
+ <color name="color_eff0f0">#EFF0F0</color>
+ <color name="color_f6f8f8">#F6F8F8</color>
+ <color name="color_edf0f1">#EDF0F1</color>
+ <color name="color_afafaf">#AFAFAF</color>
+ <color name="color_f99503">#F99503</color>
+ <color name="color_f0eff5">#f0eff5</color>
+ <color name="color_a2a2a2">#a2a2a2</color>
+ <color name="color_0ab0ef">#0ab0ef</color>
+ <color name="color_fefefe">#fefefe</color>
+ <color name="color_b5ecf8">#b5ecf8</color>
+ <color name="color_56e194">#56E194</color>
+ <color name="color_ff9500">#FF9500</color>
+ <color name="color_04b5ea">#04B5EA</color>
+ <color name="color_ffe8ecef">#ffe8ecef</color>
+ <color name="color_30f8f9f9">#30F8F9F9</color>
+ <color name="color_ffdfdf">#FFDFDF</color>
+ <color name="color_656565">#656565</color>
+ <color name="color_fcfcfc">#fcfcfc</color>
+ <color name="color_EE2E1B">#EE2E1B</color>
+ <color name="color_222527">#222527</color>
+ <color name="color_4CC6F4">#4CC6F4</color>
+ <color name="color_333333">#333333</color>
</resources>
--
Gitblit v1.8.0