From 7a541c62e881322b5f8edfb26f2ae81d8092376b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 23 Apr 2021 20:22:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/raw/scenario_warning_event_data.json | 16 ++++++++-------- .../raw/scenario_warning_event_data_left.json | 16 ++++++++-------- .../scenario_warning_event_data_pedestrians.json | 16 ++++++++-------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json index 5ad88b34a1..bdaf21afd3 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json @@ -1,18 +1,18 @@ { "type": 10013, - "lat": 26.88299257, - "lon": 112.5642132, + "lat": 26.88008302, + "lon": 112.57147295, "distance": 2, - "collisionLat": 26.88299257, - "collisionLon": 112.5642132, + "collisionLat": 26.88008302, + "collisionLon": 112.57147295, "stopLines": [ { - "lat": 26.88299297, - "lon": 112.5642142 + "lat": 26.88008302, + "lon": 112.57147295 }, { - "lat": 26.88299287, - "lon": 112.5642132 + "lat": 26.88008302, + "lon": 112.57147295 } ], "from": 1, diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json index 29ddc9d6d1..633b87ed95 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json @@ -1,18 +1,18 @@ { "type": 10013, - "lat": 26.88299257, - "lon": 112.5642132, + "lat": 26.88008302, + "lon": 112.57147295, "distance": 2, - "collisionLat": 26.88299257, - "collisionLon": 112.5642132, + "collisionLat": 26.88008302, + "collisionLon": 112.57147295, "stopLines": [ { - "lat": 26.88299297, - "lon": 112.5642142 + "lat": 26.88008302, + "lon": 112.57147295 }, { - "lat": 26.88299287, - "lon": 112.5642132 + "lat": 26.88008302, + "lon": 112.57147295 } ], "from": 1, diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json index 0dcb2f00a7..10578a75f1 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json @@ -1,18 +1,18 @@ { "type": 10013, - "lat": 26.88299257, - "lon": 112.5642132, + "lat": 26.88008302, + "lon": 112.57147295, "distance": 2, - "collisionLat": 26.88299257, - "collisionLon": 112.5642132, + "collisionLat": 26.88008302, + "collisionLon": 112.57147295, "stopLines": [ { - "lat": 26.88299297, - "lon": 112.5642142 + "lat": 26.88008302, + "lon": 112.57147295 }, { - "lat": 26.88299287, - "lon": 112.5642132 + "lat": 26.88008302, + "lon": 112.57147295 } ], "from": 1, From 24e81b73c8013377559ca1b1ed4be92a4406a1c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 23 Apr 2021 21:11:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/raw/scenario_warning_event_data.json | 6 +++--- .../src/main/res/raw/scenario_warning_event_data_left.json | 6 +++--- .../res/raw/scenario_warning_event_data_pedestrians.json | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json index bdaf21afd3..bc2c961e68 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json @@ -1,13 +1,13 @@ { "type": 10013, - "lat": 26.88008302, + "lat": 26.88008312, "lon": 112.57147295, "distance": 2, - "collisionLat": 26.88008302, + "collisionLat": 26.88008312, "collisionLon": 112.57147295, "stopLines": [ { - "lat": 26.88008302, + "lat": 26.88008312, "lon": 112.57147295 }, { diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json index 633b87ed95..9d01a58e2e 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json @@ -1,13 +1,13 @@ { "type": 10013, - "lat": 26.88008302, + "lat": 26.88008312, "lon": 112.57147295, "distance": 2, - "collisionLat": 26.88008302, + "collisionLat": 26.88008312, "collisionLon": 112.57147295, "stopLines": [ { - "lat": 26.88008302, + "lat": 26.88008312, "lon": 112.57147295 }, { diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json index 10578a75f1..3b79c922c0 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json @@ -1,13 +1,13 @@ { "type": 10013, - "lat": 26.88008302, + "lat": 26.88008312, "lon": 112.57147295, "distance": 2, - "collisionLat": 26.88008302, + "collisionLat": 26.88008312, "collisionLon": 112.57147295, "stopLines": [ { - "lat": 26.88008302, + "lat": 26.88008312, "lon": 112.57147295 }, { From 3a252c0a754bfae166976fd8ca50973b55fad7ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE?= <> Date: Sun, 25 Apr 2021 13:18:57 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/drawer/V2XWarnDataDrawer.java | 23 ++++++++++++++++--- .../scene/warning/V2XWarningWindow.java | 2 +- .../res/raw/scenario_warning_event_data.json | 4 ++-- .../raw/scenario_warning_event_data_left.json | 4 ++-- ...enario_warning_event_data_pedestrians.json | 2 +- 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java index 1cca2829bc..9067c85ad2 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java @@ -94,7 +94,7 @@ public class V2XWarnDataDrawer extends BaseDrawer implements IMogoStatusChangedL MogoLatLng stopLineNew = Trigonometric.getNewLocation(data.getStopLines().get(1), 5, 180); MogoLatLng newLocation = Trigonometric.getNewLocation(mogoLatLng, 5, 180); - IMogoMarker marker = drawMarker(markerShowEntity); + IMogoMarker marker = drawMarker(markerShowEntity, modeResType(data.getType())); Log.d("liyz", "renderWarnData marker != null direction = " + data.getDirection()); //识别物 marker.addDynamicAnchorPosition(new MogoLatLng( @@ -112,14 +112,31 @@ public class V2XWarnDataDrawer extends BaseDrawer implements IMogoStatusChangedL } + //根据识别物类型 (行人0/自行车1/摩托车2/小汽车3/公交车4)获取3D模型(对应查看getModelRes) + private int modeResType(int dataType) { + switch (dataType) { + case 0: + return 1; + case 1: + return 2; + case 2: + return 4; + case 3: + return 3; + case 4: + return 6; + } + return 1; + } - public IMogoMarker drawMarker(MarkerShowEntity markerShowEntity) { + + public IMogoMarker drawMarker(MarkerShowEntity markerShowEntity, int modeResType) { MogoMarkerOptions options = new MogoMarkerOptions() .object(markerShowEntity) .latitude(markerShowEntity.getMarkerLocation().getLat()) .longitude(markerShowEntity.getMarkerLocation().getLon()); IMarkerView iMarkerView = MapMarkerAdapter.getMarkerView(mContext, markerShowEntity, options); - options.icon3DRes(getModelRes(1)); //TODO + options.icon3DRes(getModelRes(modeResType)); //TODO options.anchorColor("#FB3C3CFF"); //红色#FF3036 蓝色：#256BFF IMogoMarker marker = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(mContext).addMarker(markerShowEntity.getMarkerType(), options); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningWindow.java index c03fae1521..47e28593b2 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningWindow.java @@ -59,6 +59,7 @@ public class V2XWarningWindow extends V2XBasWindow implements IV2XWindow { private void initView(Context context) { LayoutInflater.from(context).inflate(R.layout.v2x_road_front_warning_vr, this); typeImage = findViewById(R.id.warning_type_image); + warningTextView = findViewById(R.id.warning_content_text); distance = findViewById(R.id.warning_distance); } @@ -81,7 +82,6 @@ public class V2XWarningWindow extends V2XBasWindow implements IV2XWindow { } distance.setText(String.valueOf(mV2XWarningEntity.getDistance()) + "米"); warningTextView.setText(mV2XWarningEntity.getWarningContent()); - mV2XWarningEntity.setTts(0); AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice(mV2XWarningEntity.getTts()); } //3秒后移除提示弹框 diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json index bc2c961e68..b0c0b5a1c3 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json @@ -1,5 +1,5 @@ { - "type": 10013, + "type": 2, "lat": 26.88008312, "lon": 112.57147295, "distance": 2, @@ -21,7 +21,7 @@ "speed": 11.108121, "targetColor": "#FF4040", "stopLineDistance": 60, - "warningContent": "小心行人", + "warningContent": "注意摩托车", "heading": 0, "showTime": 8000, "roadwidth": 4.0 diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json index 9d01a58e2e..7c5d730ae0 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json @@ -1,5 +1,5 @@ { - "type": 10013, + "type": 1, "lat": 26.88008312, "lon": 112.57147295, "distance": 2, @@ -21,7 +21,7 @@ "speed": 11.108121, "targetColor": "#FF4040", "stopLineDistance": 60, - "warningContent": "小心行人", + "warningContent": "注意自行车", "heading": 0, "showTime": 8000, "roadwidth": 4.0 diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json index 3b79c922c0..a591cb18ce 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json @@ -1,5 +1,5 @@ { - "type": 10013, + "type": 0, "lat": 26.88008312, "lon": 112.57147295, "distance": 2, From d5bdd2c0f893b8f5a2d686deba59ea49a24c6c18 Mon Sep 17 00:00:00 2001 From: wujifei Date: Mon, 26 Apr 2021 14:49:45 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix#=E3=80=90#594=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E5=BF=85=E7=8E=B0=E3=80=91=E7=99=BD=E5=A4=A9=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E5=8F=91=E5=B8=83=E6=95=85=E9=9A=9C=E6=B1=82?= =?UTF-8?q?=E5=8A=A9=EF=BC=8C=E8=BF=9B=E5=85=A5=E9=B9=B0=E7=9C=BC=E7=9C=8B?= =?UTF-8?q?=E4=B8=8D=E6=B8=85=E5=AD=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/window_carforhelp_detail.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_carforhelp_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/window_carforhelp_detail.xml index 270f3d8d66..5207ad83c3 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/window_carforhelp_detail.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/window_carforhelp_detail.xml @@ -33,7 +33,7 @@ android:paddingLeft="@dimen/dp_40" android:paddingRight="@dimen/dp_40" android:text="正在为您发起求助" - android:textColor="@color/v2x_white" + android:textColor="@color/v2x_white_color" android:textSize="@dimen/dp_32" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/iv_event"