From 3768294543e6f5c28d05813ba78b063c45f9419d Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 28 Oct 2020 16:37:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[add]=20=E9=9A=9C=E7=A2=8D=E7=89=A9?= =?UTF-8?q?=E7=BB=95=E8=A1=8C=E6=A8=A1=E6=8B=9F=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../raw/scenario_push_vr_barrier_data.json | 820 ++++++++++++++++++ .../scenario_push_vr_xingren_yujing_data.json | 2 +- 2 files changed, 821 insertions(+), 1 deletion(-) create mode 100644 modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_barrier_data.json diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_barrier_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_barrier_data.json new file mode 100644 index 0000000000..aa9663cfd1 --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_barrier_data.json @@ -0,0 +1,820 @@ +{ + "sceneId": "200006", + "alarmContent": "及时发现前方障碍物并告知车主，降低事故发生概率", + "expireTime": 30000, + "sceneCategory": 0, + "sceneDescription": "利用用户分享数据以及单车识别能力将障碍物告知其他通过车主，从而降低事故发生概率", + "sceneName": "障碍物绕行", + "sceneLevel": 0, + "sceneChannel": "", + "sceneSn": "", + "tts": "", + "zoom": false, + "zoomScale": 15, + "lat": 40.968678, + "lon": 116.405467, + "userHead": "", + "msgImgUrl": "", + "polyline": [ + [ + 116.737779, + 40.196461 + ], + [ + 116.737689, + 40.196462 + ], + [ + 116.737545, + 40.196464 + ], + [ + 116.737396, + 40.196465 + ], + [ + 116.737215, + 40.196466 + ], + [ + 116.737064, + 40.196467 + ], + [ + 116.736875, + 40.196468 + ], + [ + 116.736744, + 40.196468 + ], + [ + 116.736602, + 40.196469 + ], + [ + 116.736458, + 40.19647 + ], + [ + 116.736304, + 40.196471 + ], + [ + 116.736175, + 40.196472 + ], + [ + 116.736044, + 40.196472 + ], + [ + 116.735883, + 40.196473 + ], + [ + 116.735228, + 40.196477 + ], + [ + 116.735117, + 40.196478 + ], + [ + 116.734994, + 40.196478 + ], + [ + 116.734878, + 40.196479 + ], + [ + 116.734748, + 40.19648 + ], + [ + 116.734636, + 40.196481 + ], + [ + 116.734557, + 40.196481 + ], + [ + 116.734472, + 40.196481 + ], + [ + 116.734392, + 40.196482 + ], + [ + 116.734293, + 40.196482 + ], + [ + 116.734226, + 40.196482 + ], + [ + 116.734138, + 40.196483 + ], + [ + 116.733983, + 40.196484 + ], + [ + 116.733862, + 40.196485 + ], + [ + 116.733725, + 40.196486 + ], + [ + 116.7336, + 40.196486 + ], + [ + 116.733432, + 40.196485 + ], + [ + 116.733331, + 40.196484 + ], + [ + 116.733259, + 40.196482 + ], + [ + 116.733173, + 40.19648 + ], + [ + 116.733106, + 40.196477 + ], + [ + 116.733002, + 40.196471 + ], + [ + 116.732923, + 40.196467 + ], + [ + 116.73282, + 40.196459 + ], + [ + 116.732724, + 40.19645 + ], + [ + 116.73263, + 40.196441 + ], + [ + 116.732529, + 40.19643 + ], + [ + 116.732431, + 40.196419 + ], + [ + 116.732376, + 40.196413 + ], + [ + 116.732295, + 40.196403 + ], + [ + 116.732215, + 40.196391 + ], + [ + 116.732154, + 40.196382 + ], + [ + 116.732076, + 40.196371 + ], + [ + 116.731991, + 40.196356 + ], + [ + 116.731927, + 40.196345 + ], + [ + 116.731847, + 40.19633 + ], + [ + 116.73177, + 40.196316 + ], + [ + 116.731728, + 40.196307 + ], + [ + 116.731664, + 40.196294 + ], + [ + 116.731571, + 40.196274 + ], + [ + 116.731509, + 40.19626 + ], + [ + 116.731435, + 40.196244 + ], + [ + 116.731357, + 40.196224 + ], + [ + 116.7313, + 40.196211 + ], + [ + 116.731226, + 40.196191 + ], + [ + 116.731148, + 40.196171 + ], + [ + 116.731076, + 40.19615 + ], + [ + 116.731016, + 40.196133 + ], + [ + 116.730949, + 40.196113 + ], + [ + 116.730892, + 40.196096 + ], + [ + 116.730827, + 40.196075 + ], + [ + 116.730761, + 40.196053 + ], + [ + 116.730675, + 40.196025 + ], + [ + 116.730616, + 40.196005 + ], + [ + 116.730549, + 40.195981 + ], + [ + 116.730353, + 40.195908 + ], + [ + 116.730214, + 40.195852 + ], + [ + 116.730081, + 40.195798 + ], + [ + 116.729945, + 40.195742 + ], + [ + 116.729836, + 40.195699 + ], + [ + 116.729727, + 40.195659 + ], + [ + 116.729611, + 40.195616 + ], + [ + 116.729486, + 40.195572 + ], + [ + 116.72935, + 40.195529 + ], + [ + 116.729181, + 40.195479 + ], + [ + 116.729013, + 40.195434 + ], + [ + 116.728924, + 40.195412 + ], + [ + 116.72877, + 40.195374 + ], + [ + 116.728622, + 40.195341 + ], + [ + 116.728469, + 40.195308 + ], + [ + 116.728325, + 40.195281 + ], + [ + 116.728174, + 40.195254 + ], + [ + 116.728018, + 40.195229 + ], + [ + 116.727794, + 40.1952 + ], + [ + 116.727599, + 40.195179 + ], + [ + 116.727432, + 40.195165 + ], + [ + 116.727299, + 40.195156 + ], + [ + 116.727073, + 40.195145 + ], + [ + 116.72695, + 40.195142 + ], + [ + 116.726733, + 40.195139 + ], + [ + 116.726488, + 40.19514 + ], + [ + 116.726312, + 40.195141 + ], + [ + 116.726115, + 40.195143 + ], + [ + 116.725869, + 40.195148 + ], + [ + 116.725651, + 40.195155 + ], + [ + 116.72537, + 40.195161 + ], + [ + 116.725188, + 40.195163 + ], + [ + 116.725092, + 40.195162 + ], + [ + 116.725091, + 40.195123 + ], + [ + 116.725335, + 40.195123 + ], + [ + 116.725499, + 40.195123 + ], + [ + 116.72602, + 40.195109 + ], + [ + 116.726235, + 40.195106 + ], + [ + 116.726424, + 40.195105 + ], + [ + 116.726658, + 40.195104 + ], + [ + 116.726733, + 40.195105 + ], + [ + 116.72688, + 40.195106 + ], + [ + 116.72704, + 40.195109 + ], + [ + 116.727217, + 40.195115 + ], + [ + 116.727388, + 40.195124 + ], + [ + 116.727562, + 40.195136 + ], + [ + 116.727735, + 40.195155 + ], + [ + 116.727887, + 40.195174 + ], + [ + 116.727979, + 40.195186 + ], + [ + 116.728056, + 40.195198 + ], + [ + 116.728165, + 40.195216 + ], + [ + 116.728237, + 40.195228 + ], + [ + 116.728345, + 40.195247 + ], + [ + 116.728411, + 40.19526 + ], + [ + 116.728533, + 40.195283 + ], + [ + 116.728589, + 40.195295 + ], + [ + 116.728694, + 40.195318 + ], + [ + 116.728761, + 40.195334 + ], + [ + 116.728868, + 40.19536 + ], + [ + 116.728918, + 40.195372 + ], + [ + 116.729088, + 40.195416 + ], + [ + 116.729262, + 40.195462 + ], + [ + 116.729424, + 40.195512 + ], + [ + 116.729547, + 40.195553 + ], + [ + 116.729584, + 40.195566 + ], + [ + 116.729692, + 40.195606 + ], + [ + 116.729739, + 40.195624 + ], + [ + 116.729844, + 40.195661 + ], + [ + 116.730011, + 40.195726 + ], + [ + 116.73014, + 40.195778 + ], + [ + 116.730309, + 40.195849 + ], + [ + 116.730467, + 40.195911 + ], + [ + 116.730608, + 40.195962 + ], + [ + 116.730673, + 40.195984 + ], + [ + 116.730766, + 40.196015 + ], + [ + 116.730831, + 40.196036 + ], + [ + 116.730935, + 40.196069 + ], + [ + 116.730993, + 40.196087 + ], + [ + 116.731086, + 40.196113 + ], + [ + 116.731164, + 40.196135 + ], + [ + 116.731285, + 40.196165 + ], + [ + 116.731315, + 40.196173 + ], + [ + 116.731434, + 40.196202 + ], + [ + 116.731486, + 40.196214 + ], + [ + 116.731586, + 40.196238 + ], + [ + 116.731652, + 40.196253 + ], + [ + 116.731749, + 40.196273 + ], + [ + 116.731818, + 40.196287 + ], + [ + 116.731924, + 40.196305 + ], + [ + 116.731991, + 40.196317 + ], + [ + 116.732108, + 40.196336 + ], + [ + 116.732269, + 40.196361 + ], + [ + 116.732333, + 40.19637 + ], + [ + 116.732464, + 40.196385 + ], + [ + 116.732507, + 40.19639 + ], + [ + 116.732628, + 40.196404 + ], + [ + 116.732678, + 40.196409 + ], + [ + 116.732784, + 40.196418 + ], + [ + 116.732851, + 40.196424 + ], + [ + 116.732985, + 40.196433 + ], + [ + 116.73314, + 40.196439 + ], + [ + 116.733198, + 40.196441 + ], + [ + 116.733379, + 40.196445 + ], + [ + 116.733548, + 40.196445 + ], + [ + 116.733722, + 40.196445 + ], + [ + 116.733903, + 40.196445 + ], + [ + 116.734081, + 40.196447 + ], + [ + 116.734251, + 40.196446 + ], + [ + 116.734439, + 40.196445 + ], + [ + 116.734624, + 40.196444 + ], + [ + 116.734805, + 40.196442 + ], + [ + 116.734982, + 40.196442 + ], + [ + 116.735164, + 40.196441 + ], + [ + 116.735329, + 40.19644 + ], + [ + 116.735519, + 40.196438 + ], + [ + 116.735682, + 40.196437 + ], + [ + 116.735855, + 40.196437 + ], + [ + 116.736034, + 40.196436 + ], + [ + 116.73621, + 40.196435 + ], + [ + 116.736385, + 40.196433 + ], + [ + 116.736566, + 40.196433 + ], + [ + 116.736742, + 40.196431 + ], + [ + 116.736926, + 40.196431 + ], + [ + 116.737046, + 40.19643 + ], + [ + 116.737173, + 40.19643 + ], + [ + 116.737298, + 40.196429 + ], + [ + 116.737449, + 40.196427 + ], + [ + 116.737582, + 40.196427 + ], + [ + 116.737662, + 40.196425 + ], + [ + 116.737748, + 40.196425 + ], + [ + 116.73778, + 40.196424 + ] + ] +} \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_xingren_yujing_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_xingren_yujing_data.json index 5e06b0a449..6fd53b8765 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_xingren_yujing_data.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_xingren_yujing_data.json @@ -1,5 +1,5 @@ { - "sceneId": "200006", + "sceneId": "200007", "alarmContent": "展现行人预测、提前预警能力", "expireTime": 30000, "sceneCategory": 0, From 14cad81125bd62089ef2aed7078b67b0d0c0a848 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 28 Oct 2020 16:58:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=9A=9C=E7=A2=8D=E7=89=A9TTS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/raw/scenario_push_vr_barrier_data.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_barrier_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_barrier_data.json index aa9663cfd1..a724bde64f 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_barrier_data.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_barrier_data.json @@ -8,7 +8,7 @@ "sceneLevel": 0, "sceneChannel": "", "sceneSn": "", - "tts": "", + "tts": "前方发现障碍物注意避让", "zoom": false, "zoomScale": 15, "lat": 40.968678, From 170a6163d9ff9df7e269aa10fd12b4332ccc1b9f Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 28 Oct 2020 17:10:35 +0800 Subject: [PATCH 3/3] no message --- .../mogo/module/v2x/listener/V2XMessageListener_401003.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java index 17eca2d238..fcceadaf2e 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java @@ -101,10 +101,6 @@ public class V2XMessageListener_401003 implements IMogoOnMessageListener