From baa14b002822aca7567f13f5ec500ba016c99023 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Thu, 1 Apr 2021 09:57:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=9C=B0=E5=9B=BEsdk?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=88=B01.0.0-vr-8.5.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 libraries/map-custom/build.gradle             |  2 +-
 .../com/mogo/module/v2x/V2XMarkerService.java |  1 +
 .../v2x/listener/V2XLocationListener.java     | 27 ++++++++++++++++++-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle
index 72ee39e956..8a8e49cbfe 100644
--- a/libraries/map-custom/build.gradle
+++ b/libraries/map-custom/build.gradle
@@ -67,7 +67,7 @@ dependencies {
         implementation project(':foudations:mogo-commons')
     }
 
-    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.4.8'
+    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.1'
 //    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4'
 }
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XMarkerService.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XMarkerService.java
index 7f039f114d..bbfb35fb79 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XMarkerService.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XMarkerService.java
@@ -92,6 +92,7 @@ public class V2XMarkerService implements V2XRefreshCallback<MarkerResponse> {
         // 设置地图定位监听
         V2XServiceManager.getMogoRegisterCenter()
                 .registerMogoLocationListener(MODULE_NAME, V2XLocationListener.getInstance());
+        V2XServiceManager.getMogoRegisterCenter().registerCarLocationChangedListener( MODULE_NAME, V2XLocationListener.getInstance());
 
         Logger.d(MODULE_NAME, "V2X道路事件：开启V2X地图气泡自动绘制。");
         if (refreshHandler == null) {
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java
index f8055356e8..9181b64e38 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java
@@ -1,11 +1,13 @@
 package com.mogo.module.v2x.listener;
 
 import android.content.Context;
+import android.location.Location;
 
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.map.MogoLatLng;
 import com.mogo.map.location.IMogoLocationListener;
 import com.mogo.map.location.MogoLocation;
+import com.mogo.map.navi.IMogoCarLocationChangedListener2;
 import com.mogo.map.overlay.IMogoPolyline;
 import com.mogo.map.search.geo.IMogoGeoSearchListener;
 import com.mogo.map.search.geo.MogoGeocodeResult;
@@ -48,7 +50,7 @@ import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
  * desc   : V2X中用到的位置监听。处理刷新频率，以及位置改变是否触发道路事件警报
  * version: 1.0
  */
-public class V2XLocationListener implements IMogoLocationListener, CarStatusListener {
+public class V2XLocationListener implements IMogoLocationListener, CarStatusListener, IMogoCarLocationChangedListener2 {
     private String TAG = "V2XLocationListener";
 
     private MogoLocation mLastCarLocation;
@@ -71,8 +73,31 @@ public class V2XLocationListener implements IMogoLocationListener, CarStatusList
         return mV2XLocationListener;
     }
 
+    @Override
+    public void onCarLocationChanged( MogoLatLng latLng ) {
+        // do not impl
+    }
+
+    @Override
+    public void onCarLocationChanged2( Location location ) {
+        MogoLocation loc = new MogoLocation();
+        loc.setTime( loc.getTime());
+        loc.setAccuracy( location.getAccuracy() );
+        loc.setSpeed( location.getSpeed());
+        loc.setLongitude( location.getLongitude() );
+        loc.setLatitude( location.getLatitude() );
+        loc.setAltitude( location.getAltitude() );
+        loc.setBearing( location.getBearing() );
+        loc.setProvider( location.getProvider() );
+//        onLocationChangedImpl( loc );
+    }
+
     @Override
     public void onLocationChanged(MogoLocation location) {
+        onLocationChangedImpl(location);
+    }
+
+    private void onLocationChangedImpl(MogoLocation location){
         try {
             //Logger.d(V2XConst.MODULE_NAME, "V2X预警--onLocationChanged: " + GsonUtil.jsonFromObject(location));
             // 刷新角度