From 4fd26996d1f7cc1660a8fb054b409dff7074004d Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 20 Apr 2021 16:19:18 +0800 Subject: [PATCH] =?UTF-8?q?[add]=20=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE=20?= =?UTF-8?q?=20=E6=8C=87=E5=BC=95=E7=AE=AD=E5=A4=B43D=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../map/impl/custom/CustomMapApiBuilder.java | 4 ++- .../common/drawer/V2XWarnDataDrawer.java | 1 - .../src/main/res/raw/arraw.n3d | Bin 8105 -> 8105 bytes .../com/mogo/module/v2x/V2XWaringManager.java | 24 +++++++++---- .../receiver/AdasDataBroadcastReceiver.java | 2 +- .../scene/test/V2XTestConsoleWindow.java | 12 ++++--- .../main/res/layout/window_test_console.xml | 6 ++-- .../raw/scenario_warning_event_data_left.json | 32 ++++++++++++++++++ ...enario_warning_event_data_pedestrians.json | 32 ++++++++++++++++++ 9 files changed, 97 insertions(+), 16 deletions(-) create mode 100644 modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json create mode 100644 modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java index 96a7bc6ef7..a38eff0242 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java @@ -1,6 +1,7 @@ package com.mogo.map.impl.custom; import android.content.Context; +import android.util.Log; import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.commons.debug.DebugConfig; @@ -92,8 +93,9 @@ class CustomMapApiBuilder implements IMogoMapApiBuilder { @Override public IMogoMapView getMapView( Context context ) { + Log.d(TAG,"setDebugMode==true"); NavAutoApi.INSTANCE.init( context, MapParams.Companion.init() - .setDebugMode( false ) + .setDebugMode( true ) .setCoordinateType( MapParams.COORDINATETYPE_GCJ02 ) .setPerspectiveMode( MapParams.MAP_PERSPECTIVE_2D ) .setZoom( 20 ) 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 1475cdd101..94a3af8e9e 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 @@ -136,7 +136,6 @@ public class V2XWarnDataDrawer extends BaseDrawer implements IMogoStatusChangedL .flat(true); IMogoMarker marker = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(mContext).addMarker(markerType, options); marker.setRotateAngle(rotate); - marker.setToTop(); } /* diff --git a/modules/mogo-module-common/src/main/res/raw/arraw.n3d b/modules/mogo-module-common/src/main/res/raw/arraw.n3d index ba973b34b6e21d139a034478b74ab0501d0a5d0a..95ce5e99c1391e45298d65cb6e001edbae68929c 100644 GIT binary patch delta 664 zcmZ2!ztVn!X1!(d|Njg?uuGhQVfCzka5hNns@eblAaM}TK8dLYmtL4TZZ9BagUkW3 zVd5||f#SSi36KRKMH4e+v|xrJYX)gR7KgAW+cU}~!_0&!M|UT>y)a|YjfD9Tq#juf zP<*lhqo@Z=4B0$nJJH3F)x*38QZxA>qswGoCZ5eYOp=U~4Vc&`XEG~H_GMP6FZO0& z&^^k)0HV377#Ku>+Fk+UYb}rNt{*qyh72;-UZm delta 710 zcmZ2!ztVn!X8l#O|NnQ1Gr$3e9h%Ar=7ZSB=Rl;;*&sFACm9%EdXdcmvE5$${|_@1 z#0IHHRs)g)ir0fBKpb2agEWI2fo>?wLCE6h79g7ma|FoIAU4QO1_mL7#W0D+3S(pQ39>mz>L;@>sZM^&sIpmyNtSW4 z8?!UmL83sDUI86n?9ITyRRy7SkD}5b@r%J9+a-g9PP0MS}{3=AeN5E>>908F3y%)k%_R3LT_L4zEKEDqy?=)ma^gUz58foPC^ mWN{cDMDOunU^oFxkD?5dC$org9k*s+coz=hZeGm7CJg|>-OA+v diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XWaringManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XWaringManager.java index 9a75640e6a..dac23ba544 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XWaringManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XWaringManager.java @@ -1,6 +1,7 @@ package com.mogo.module.v2x; import android.content.Context; +import android.content.Intent; import android.util.Log; import com.mogo.map.MogoLatLng; @@ -80,12 +81,22 @@ public class V2XWaringManager { /** * 测试数据 */ - private void testData() { + private void testData(String adasResult) { try { + int id = R.raw.scenario_warning_event_data; + switch (adasResult) { + case "left": + id = R.raw.scenario_warning_event_data_left; + break; + case "pedestrians": + id = R.raw.scenario_warning_event_data_pedestrians; + break; + default: + } InputStream inputStream = V2XUtils.getApp() .getResources() - .openRawResource(R.raw.scenario_warning_event_data); + .openRawResource(id); ByteArrayOutputStream baos = new ByteArrayOutputStream(); int len = -1; byte[] buffer = new byte[1024]; @@ -124,7 +135,7 @@ public class V2XWaringManager { .getMoGoSocketManager() .registerOnMessageListener( 401018, - v2XWarnMessageListener ); + v2XWarnMessageListener); } public V2XWarnMessageListener getV2XMessageListener() { @@ -135,11 +146,11 @@ public class V2XWaringManager { /** * 处理adas返回的数据 */ - public void handleAdasData() { + public void handleAdasData(Intent intent) { Log.d(V2XConst.LOG_NAME_WARN, "V2XWaringManager ---- handleAdasData "); - + String adasResult = (String) intent.getSerializableExtra(V2XConst.BROADCAST_ADAS_EXTRA_KEY); //测试数据 - testData(); + testData(adasResult); // adas 每隔一秒传递的他车或行人数据，避免重复。 // V2XServiceManager.getmIMogoADASController().addAdasRecognizedDataCallback(resultList -> { @@ -158,6 +169,7 @@ public class V2XWaringManager { /** * 添加2d的碰撞 marker + * * @param markerShowEntity * @return */ diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/AdasDataBroadcastReceiver.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/AdasDataBroadcastReceiver.java index 4e4cb4e894..93e1410bc8 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/AdasDataBroadcastReceiver.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/AdasDataBroadcastReceiver.java @@ -23,7 +23,7 @@ public class AdasDataBroadcastReceiver extends BroadcastReceiver { // Logger.d(V2XConst.LOG_NAME_WARN, "AdasDataBroadcastReceiver -->" + GsonUtil.jsonFromObject(adasResult)); String adasResult = (String) intent.getSerializableExtra(V2XConst.BROADCAST_ADAS_EXTRA_KEY); Log.d(V2XConst.LOG_NAME_WARN, "AdasDataBroadcastReceiver -----> "); - V2XWaringManager.getInstance().handleAdasData(); + V2XWaringManager.getInstance().handleAdasData(intent); } catch (Exception e) { e.printStackTrace(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java index fe1ff0f375..f485da232b 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java @@ -362,17 +362,21 @@ public class V2XTestConsoleWindow extends ConstraintLayout { }); /* - *障碍物绕行 + *车路云场景预警-左侧 * */ btnTriggerObstacleDetour.setOnClickListener(v -> { - + Intent intent = new Intent(V2XConst.BROADCAST_ADAS_SCENE_HANDLER_ACTION); + intent.putExtra(V2XConst.BROADCAST_ADAS_EXTRA_KEY, "left"); + getContext().sendBroadcast(intent); }); /* - *行人预警，行人路线预测 + *行人预警，行人路线预测 车路云预警-前方行人 * */ btnTriggerPedestrianWarning.setOnClickListener(v -> { - + Intent intent = new Intent(V2XConst.BROADCAST_ADAS_SCENE_HANDLER_ACTION); + intent.putExtra(V2XConst.BROADCAST_ADAS_EXTRA_KEY, "pedestrians"); + getContext().sendBroadcast(intent); }); /* diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml b/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml index ce3007152d..519659e5b6 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml @@ -426,7 +426,7 @@ android:layout_marginBottom="@dimen/dp_10" android:background="#00BCD4" android:padding="@dimen/dp_10" - android:text="障碍物绕行" + android:text="车路云场景预警-左侧" android:textColor="#FFFFFF" android:textSize="@dimen/dp_22" app:layout_constraintBottom_toBottomOf="parent" @@ -440,7 +440,7 @@ android:layout_marginBottom="@dimen/dp_10" android:background="#009688" android:padding="@dimen/dp_10" - android:text="行人预警，行人路线预测" + android:text="车路云场景预警-前方行人" android:textColor="#FFFFFF" android:textSize="@dimen/dp_22" app:layout_constraintBottom_toBottomOf="parent" @@ -482,7 +482,7 @@ android:layout_marginBottom="@dimen/dp_10" android:background="#8BC34A" android:padding="@dimen/dp_10" - android:text="车路云场景预警" + android:text="车路云场景预警-右侧" android:textColor="#FFFFFF" android:textSize="@dimen/dp_22" app:layout_constraintBottom_toBottomOf="parent" 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 new file mode 100644 index 0000000000..e8cce60732 --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json @@ -0,0 +1,32 @@ +{ + "type": 10013, + "lat": 39.977148, + "lon": 116.417478, + "distance": 2, + "collisionLat": 39.977094, + "collisionLon": 116.417634, + "stopLines": [ + { + "lat": 39.976858, + "lon": 116.417651 + }, + { + "lat": 39.976874, + "lon": 116.417757 + } + ], + "from": 1, + "angle": 0, + "direction": 3, + "speed": 11.108121, + "targetColor": "#FF4040", + "stopLineDistance": 60, + "warningContent": "小心行人", + "heading": 0, + "showTime": 8000, + "roadwidth": 4.0, + "carLocation": { + "lat": 39.97665425, + "lon": 116.41769983 + } +} \ No newline at end of file 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 new file mode 100644 index 0000000000..7d271d78b4 --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json @@ -0,0 +1,32 @@ +{ + "type": 10013, + "lat": 39.977148, + "lon": 116.417886, + "distance": 2, + "collisionLat": 39.977094, + "collisionLon": 116.417634, + "stopLines": [ + { + "lat": 39.976858, + "lon": 116.417651 + }, + { + "lat": 39.976874, + "lon": 116.417757 + } + ], + "from": 1, + "angle": 0, + "direction": 1, + "speed": 11.108121, + "targetColor": "#FF4040", + "stopLineDistance": 60, + "warningContent": "小心行人", + "heading": 0, + "showTime": 8000, + "roadwidth": 4.0, + "carLocation": { + "lat": 39.97665425, + "lon": 116.41769983 + } +} \ No newline at end of file