From 5f70d7be87be9b138fd5640a51470bc6abc6b51b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Fri, 7 May 2021 17:07:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=86=E9=AB=98=E5=BE=B7=E7=B3=BB=E7=BB=8F=E7=BA=AC=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/runConfigurations.xml                   |   1 +
 .../entity/net/V2XOptimalRouteDataRes.java    |  14 +-
 .../listener/V2XMessageListener_402000.java   |   4 +-
 .../route/V2XOptimalRouteVREventMarker.java   |   3 +-
 .../module/v2x/utils/TestOnLineCarUtils.java  |  32 ---
 .../scenario_push_vr_event_data_yongdu.json   | 185 ------------------
 ...ario_push_vr_event_data_yongdu_gongsi.json |  45 -----
 ...io_push_vr_event_data_yongdu_gongsi_1.json |  40 ----
 .../res/raw/test_data_v2x_zuiyouluxian.json   |  30 ++-
 .../service/impl/adas/MogoADASController.java |   2 -
 10 files changed, 39 insertions(+), 317 deletions(-)
 delete mode 100644 modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu.json
 delete mode 100644 modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi.json
 delete mode 100644 modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi_1.json

diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index 7f68460d8b..e497da9998 100644
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XOptimalRouteDataRes.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XOptimalRouteDataRes.java
index 19cfa209e4..0a8518e9be 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XOptimalRouteDataRes.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XOptimalRouteDataRes.java
@@ -31,9 +31,13 @@ public class V2XOptimalRouteDataRes implements Serializable {
      */
     private int most_lane_num;
     /**
-     * 线性经纬度轨迹列表
+     * Wgs84坐标系，线性经纬度轨迹列表
      **/
     private List<MogoLatLng> locus_list;
+    /**
+     * 高德坐标系Gcj，线性经纬度轨迹列表
+     **/
+    private List<MogoLatLng> gd_locus_list;
 
     public String getSn() {
         return sn;
@@ -90,4 +94,12 @@ public class V2XOptimalRouteDataRes implements Serializable {
     public void setLocus_list(List<MogoLatLng> locus_list) {
         this.locus_list = locus_list;
     }
+
+    public List<MogoLatLng> getGd_locus_list() {
+        return gd_locus_list;
+    }
+
+    public void setGd_locus_list(List<MogoLatLng> gd_locus_list) {
+        this.gd_locus_list = gd_locus_list;
+    }
 }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_402000.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_402000.java
index ec42f84063..5c5cff563f 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_402000.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_402000.java
@@ -31,8 +31,8 @@ public class V2XMessageListener_402000 implements IMogoOnMessageListener<V2XOpti
     public void onMsgReceived(V2XOptimalRouteDataRes message) {
         // 将接收到的数据转换成最优车道推荐的场景数据
         if (message != null
-                && message.getLocus_list() != null
-                && !message.getLocus_list().isEmpty()) {
+                && message.getGd_locus_list() != null
+                && !message.getGd_locus_list().isEmpty()) {
             Logger.i(MODULE_NAME, "V2XMessageListener_402000：" + GsonUtil.jsonFromObject(message));
 
             V2XMessageEntity<V2XOptimalRouteDataRes> v2xMessageEntity = new V2XMessageEntity<>();
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventMarker.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventMarker.java
index a5d78f20ca..9243e4df32 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventMarker.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventMarker.java
@@ -1,6 +1,5 @@
 package com.mogo.module.v2x.scenario.scene.route;
 
-import com.mogo.module.common.entity.V2XPushMessageEntity;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.entity.net.V2XOptimalRouteDataRes;
@@ -29,7 +28,7 @@ public class V2XOptimalRouteVREventMarker implements IV2XMarker<V2XOptimalRouteD
                     .getMoGoV2XMarkerManager().clearALLPOI();
             // 绘制引导线
             V2XOptimalRouteObserver.getInstance()
-                    .setPolylinePoint(entity.getLocus_list());
+                    .setPolylinePoint(entity.getGd_locus_list());
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java
index 473c13257a..0bdb711bdc 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java
@@ -421,38 +421,6 @@ public class TestOnLineCarUtils {
         return null;
     }
 
-    /**
-     * 模拟H5推送场景---推送VR场景信息
-     */
-    public static V2XMessageEntity<V2XPushMessageEntity> getV2XScenarioPushVR() {
-        try {
-            InputStream inputStream = V2XUtils.getApp()
-                    .getResources()
-                    .openRawResource(R.raw.scenario_push_vr_event_data_yongdu_gongsi_1);
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            int len = -1;
-            byte[] buffer = new byte[1024];
-            while ((len = inputStream.read(buffer)) != -1) {
-                baos.write(buffer, 0, len);
-            }
-            inputStream.close();
-
-            // 加载数据源
-            V2XPushMessageEntity v2xRoadEventEntity = GsonUtil.objectFromJson(baos.toString(), V2XPushMessageEntity.class);
-
-            V2XMessageEntity<V2XPushMessageEntity> v2xMessageEntity = new V2XMessageEntity<>();
-            // 控制类型
-            v2xMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_VR_SHOW);
-            // 设置数据
-            v2xMessageEntity.setContent(v2xRoadEventEntity);
-            // 控制展示状态
-            v2xMessageEntity.setShowState(true);
-            return v2xMessageEntity;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
 
     /**
      * 模拟最优路线推送
diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu.json
deleted file mode 100644
index d8bc8d2541..0000000000
--- a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu.json
+++ /dev/null
@@ -1,185 +0,0 @@
-{
-  "sceneId": "200008",
-  "alarmContent": "拥堵路线推荐",
-  "expireTime": 20000,
-  "sceneCategory": 0,
-  "sceneDescription": "拥堵路线推荐",
-  "sceneName": "拥堵路线推荐",
-  "sceneLevel": 0,
-  "videoUrl": "",
-  "videoChannel": "",
-  "videoSn": "",
-  "tts": "发现前方拥堵，最优路线快6分钟",
-  "zoom": false,
-  "zoomScale": 15,
-  "userHead": "",
-  "msgImgUrl": "",
-  "lat":39.969088,
-  "lon":116.41808,
-  "recommendPolyline": [
-    [
-      116.731239,
-      40.196264
-    ],
-    [
-      116.731082,
-      40.19622
-    ],
-    [
-      116.730919,
-      40.196173
-    ],
-    [
-      116.730762,
-      40.196125
-    ],
-    [
-      116.730596,
-      40.196069
-    ],
-    [
-      116.730437,
-      40.196013
-    ],
-    [
-      116.730296,
-      40.195959
-    ],
-    [
-      116.730122,
-      40.19589
-    ],
-    [
-      116.729956,
-      40.195823
-    ],
-    [
-      116.729841,
-      40.195777
-    ],
-    [
-      116.729797,
-      40.195759
-    ],
-    [
-      116.729696,
-      40.195721
-    ],
-    [
-      116.729624,
-      40.195695
-    ],
-    [
-      116.729498,
-      40.195649
-    ],
-    [
-      116.729464,
-      40.195637
-    ],
-    [
-      116.729366,
-      40.195604
-    ],
-    [
-      116.729294,
-      40.195583
-    ],
-    [
-      116.729122,
-      40.195533
-    ],
-    [
-      116.728954,
-      40.195489
-    ],
-    [
-      116.728781,
-      40.195448
-    ],
-    [
-      116.728616,
-      40.195412
-    ],
-    [
-      116.728442,
-      40.195376
-    ],
-    [
-      116.728269,
-      40.195341
-    ],
-    [
-      116.728087,
-      40.195311
-    ],
-    [
-      116.727909,
-      40.195283
-    ],
-    [
-      116.727746,
-      40.195263
-    ],
-    [
-      116.727561,
-      40.195242
-    ],
-    [
-      116.727386,
-      40.195226
-    ],
-    [
-      116.727213,
-      40.195217
-    ],
-    [
-      116.727036,
-      40.19521
-    ],
-    [
-      116.726865,
-      40.195206
-    ],
-    [
-      116.72669,
-      40.195206
-    ],
-    [
-      116.726512,
-      40.195207
-    ],
-    [
-      116.726333,
-      40.195209
-    ],
-    [
-      116.726144,
-      40.195211
-    ],
-    [
-      116.725959,
-      40.195214
-    ],
-    [
-      116.725771,
-      40.195217
-    ],
-    [
-      116.725588,
-      40.195221
-    ],
-    [
-      116.725411,
-      40.195225
-    ],
-    [
-      116.725201,
-      40.195228
-    ],
-    [
-      116.72509,
-      40.195228
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi.json
deleted file mode 100644
index 2983745a97..0000000000
--- a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "sceneId": "200008",
-  "alarmContent": "拥堵路线推荐",
-  "expireTime": 10000,
-  "sceneCategory": 0,
-  "sceneDescription": "拥堵路线推荐",
-  "sceneName": "拥堵路线推荐",
-  "sceneLevel": 0,
-  "videoUrl": "",
-  "videoChannel": "",
-  "videoSn": "",
-  "tts": "发现前方拥堵，最优路线快6分钟",
-  "zoom": false,
-  "zoomScale": 15,
-  "userHead": "",
-  "msgImgUrl": "",
-  "lat":39.969088,
-  "lon":116.41808,
-  "recommendPolyline": [
-    [
-      116.417437,39.983323
-    ],
-    [
-      116.41924,39.983364
-    ],
-    [
-      116.421396,39.983397
-    ],
-    [
-      116.422984,39.983421
-    ],
-    [
-      116.423016,39.983405
-    ],
-    [
-      116.424272,39.983397
-    ],
-    [
-      116.425948,39.983465
-    ],
-    [
-      116.42628,39.983399
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi_1.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi_1.json
deleted file mode 100644
index 7fbcfe4620..0000000000
--- a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi_1.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "locus_list": [
-    {
-      "lon": 116.417388,
-      "lat": 39.983351
-    },
-    {
-      "lon": 116.417388,
-      "lat": 39.983351
-    },
-    {
-      "lon": 116.417351,
-      "lat": 39.9841
-    },
-    {
-      "lon": 116.417286,
-      "lat": 39.985423
-    },
-    {
-      "lon": 116.417233,
-      "lat": 39.98673
-    },
-    {
-      "lon": 116.417179,
-      "lat": 39.988156
-    },
-    {
-      "lon": 116.417158,
-      "lat": 39.988493
-    },
-    {
-      "lon": 116.417142,
-      "lat": 39.989245
-    },
-    {
-      "lon": 116.417174,
-      "lat": 39.990199
-    }
-  ]
-}
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/raw/test_data_v2x_zuiyouluxian.json b/modules/mogo-module-v2x/src/main/res/raw/test_data_v2x_zuiyouluxian.json
index 7f939ee42c..881ae6787a 100644
--- a/modules/mogo-module-v2x/src/main/res/raw/test_data_v2x_zuiyouluxian.json
+++ b/modules/mogo-module-v2x/src/main/res/raw/test_data_v2x_zuiyouluxian.json
@@ -1,30 +1,44 @@
 {
   "current_lane_id": "1903",
   "current_lane_num": -2,
+  "most_lane_num": -3,
+  "most_speed": 8.0,
+  "road_id": "400139",
+  "sn": "F803EB2046PZD00149",
   "locus_list": [
     {
       "lat": 39.974323417486,
-      "lng": 0.0,
       "lon": 116.411520335961
     },
     {
       "lat": 39.974407914698,
-      "lng": 0.0,
       "lon": 116.411515520661
     },
     {
       "lat": 39.974658553869,
-      "lng": 0.0,
       "lon": 116.411505432781
     },
     {
       "lat": 39.974881303401,
-      "lng": 0.0,
       "lon": 116.411499467848
     }
   ],
-  "most_lane_num": -3,
-  "most_speed": 8.0,
-  "road_id": "400139",
-  "sn": "F803EB2046PZD00149"
+  "gd_locus_list": [
+    {
+      "lat": 39.975728,
+      "lon": 116.41777
+    },
+    {
+      "lat": 39.975813,
+      "lon": 116.417765
+    },
+    {
+      "lat": 39.976064,
+      "lon": 116.417755
+    },
+    {
+      "lat": 39.976286,
+      "lon": 116.417749
+    }
+  ]
 }
\ No newline at end of file
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
index 09897de20b..dadc92af50 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
@@ -58,9 +58,7 @@ import com.zhidao.support.adas.high.msg.MyMessageFactory;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;