[dev_arch_opt_3.0]

[Change]
[
1、修改了高精地图的设置外部坐标的方法
2、修改了基础、出租车、Bus小地图中的位置回调，使用IMoGoChassisLocationGCJ02Listener。
3、TODO 有些需要高德地图的地方需要改为使用IMoGoChassisLocationGCJ02Listener，WGS84的坐标使用IMoGoChassisLocationWGS84Listener
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>

OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java

@@ -1,5 +1,7 @@
 package com.mogo.och.bus.passenger.ui;
 
+import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS_P;
+
 import android.content.Context;
 import android.os.Bundle;
 import android.util.AttributeSet;
@@ -25,9 +27,8 @@ import com.amap.api.maps.model.Marker;
 import com.amap.api.maps.model.MarkerOptions;
 import com.amap.api.maps.model.Polyline;
 import com.amap.api.maps.model.PolylineOptions;
-import com.mogo.eagle.core.data.map.MogoLocation;
-import com.mogo.eagle.core.function.api.map.listener.IMoGoMapLocationListener;
-import com.mogo.eagle.core.function.call.map.CallerMapLocationListenerManager;
+import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener;
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ20ListenerManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.och.bus.passenger.R;
 import com.mogo.och.bus.passenger.callback.IBusPassengerMapViewCallback;
@@ -36,14 +37,16 @@ import com.mogo.och.bus.passenger.utils.BusPassengerMapAssetStyleUtil;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS_P;
+import mogo.telematics.pad.MessagePad;
 
 /**
  * 乘客屏小地图
  */
 public class BusPassengerMapDirectionView
         extends RelativeLayout
-        implements IMoGoMapLocationListener, IBusPassengerMapDirectionView, AMap.OnCameraChangeListener {
+        implements IMoGoChassisLocationGCJ02Listener,
+        IBusPassengerMapDirectionView,
+        AMap.OnCameraChangeListener {
 
     //小地图名称
     public static final String TAG = "TPMapDirectionView";
@@ -101,14 +104,14 @@ public class BusPassengerMapDirectionView
         initAMapView();
 
         // 注册定位监听
-        CallerMapLocationListenerManager.INSTANCE.addListener(TAG, this, false);
+        CallerChassisLocationGCJ20ListenerManager.INSTANCE.addListener(TAG, this);
     }
 
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
         // 注册定位监听
-        CallerMapLocationListenerManager.INSTANCE.removeListener(TAG, false);
+        CallerChassisLocationGCJ20ListenerManager.INSTANCE.removeListener(TAG);
     }
 
     private void initAMapView() {
@@ -171,19 +174,18 @@ public class BusPassengerMapDirectionView
         return true;
     }
 
-
     @Override
-    public void onLocationChanged(@org.jetbrains.annotations.Nullable MogoLocation location, int from, boolean isGps) {
-        if (location == null) {
+    public void onChassisLocationGCJ02(@Nullable MessagePad.GnssInfo gnssInfo) {
+        if (gnssInfo == null) {
             return;
         }
 //        CallerLogger.INSTANCE.d(M_BUS_P + TAG, "onCarLocationChanged2 :" + location.getLatitude() + ":" + location.getLongitude());
-        LatLng currentLatLng = new LatLng(location.getLatitude(), location.getLongitude());
+        LatLng currentLatLng = new LatLng(gnssInfo.getLatitude(), gnssInfo.getLongitude());
 
         //更新车辆位置
         if (mCarMarker != null) {
 //            CallerLogger.INSTANCE.d(M_BUS_P + TAG, "location.getBearing() = " + location.getBearing());
-            mCarMarker.setRotateAngle(360 - location.getBearing());
+            mCarMarker.setRotateAngle((float) (360 - gnssInfo.getHeading()));
             mCarMarker.setPosition(currentLatLng);
             mCarMarker.setToTop();
         }
@@ -208,7 +210,6 @@ public class BusPassengerMapDirectionView
     }
 
 
-
     @Override
     public void drawablePolyline() {
         if (mPolyline != null) {

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java

@@ -29,9 +29,8 @@ import com.amap.api.maps.model.MarkerOptions;
 import com.amap.api.maps.model.Polyline;
 import com.amap.api.maps.model.PolylineOptions;
 import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.eagle.core.data.map.MogoLocation;
-import com.mogo.eagle.core.function.api.map.listener.IMoGoMapLocationListener;
-import com.mogo.eagle.core.function.call.map.CallerMapLocationListenerManager;
+import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener;
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ20ListenerManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.och.taxi.passenger.R;
 import com.mogo.och.taxi.passenger.callback.ITaxiPassengerMapViewCallback;
@@ -40,12 +39,14 @@ import com.mogo.och.taxi.passenger.utils.TaxiPassengerMapAssetStyleUtil;
 import java.util.ArrayList;
 import java.util.List;
 
+import mogo.telematics.pad.MessagePad;
+
 /**
  * 乘客屏小地图
  */
 public class TaxiPassengerMapDirectionView
         extends RelativeLayout
-        implements IMoGoMapLocationListener, ITaxiPassengerMapDirectionView, AMap.OnCameraChangeListener {
+        implements IMoGoChassisLocationGCJ02Listener, ITaxiPassengerMapDirectionView, AMap.OnCameraChangeListener {
 
     //小地图名称
     public static final String TAG = "TPMapDirectionView";
@@ -104,14 +105,14 @@ public class TaxiPassengerMapDirectionView
         initAMapView();
 
         // 注册定位监听
-        CallerMapLocationListenerManager.INSTANCE.addListener(TAG, this, false);
+        CallerChassisLocationGCJ20ListenerManager.INSTANCE.addListener(TAG, this);
     }
 
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
         // 注册定位监听
-        CallerMapLocationListenerManager.INSTANCE.removeListener(TAG, false);
+        CallerChassisLocationGCJ20ListenerManager.INSTANCE.removeListener(TAG);
     }
 
     private void initAMapView() {
@@ -178,13 +179,12 @@ public class TaxiPassengerMapDirectionView
         return true;
     }
 
-
     @Override
-    public void onLocationChanged(@org.jetbrains.annotations.Nullable MogoLocation location, int from, boolean isGps) {
-        if (location == null){
+    public void onChassisLocationGCJ02(@Nullable MessagePad.GnssInfo gnssInfo) {
+        if (gnssInfo == null){
             return;
         }
-        LatLng currentLatLng = new LatLng(location.getLatitude(), location.getLongitude());
+        LatLng currentLatLng = new LatLng(gnssInfo.getLatitude(), gnssInfo.getLongitude());
 
         if (mCoordinatesLatLng.size() > 1) {
             //圈定地图显示范围
@@ -200,13 +200,13 @@ public class TaxiPassengerMapDirectionView
         } else {
             //设置希望展示的地图缩放级别
             CameraPosition cameraPosition = new CameraPosition.Builder()
-                    .target(mCarMarker.getPosition()).tilt(0).bearing(location.getBearing()).zoom(zoomLevel).build();
+                    .target(mCarMarker.getPosition()).tilt(0).bearing((float) gnssInfo.getHeading()).zoom(zoomLevel).build();
             mAMap.moveCamera(CameraUpdateFactory.newCameraPosition(cameraPosition));
         }
         //更新车辆位置
         if (mCarMarker != null) {
 //            CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "location.getBearing() = " + location.getBearing());
-            mCarMarker.setRotateAngle(360 - location.getBearing());
+            mCarMarker.setRotateAngle((float) (360 - gnssInfo.getHeading()));
             mCarMarker.setPosition(currentLatLng);
 //            CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "onCarLocationChanged2--loacation :" + location.getLatitude()+", "+location.getLongitude());
             mCarMarker.setToTop();

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiMapDirectionView.java

@@ -29,9 +29,8 @@ import com.amap.api.maps.model.MarkerOptions;
 import com.amap.api.maps.model.Polyline;
 import com.amap.api.maps.model.PolylineOptions;
 import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.eagle.core.data.map.MogoLocation;
-import com.mogo.eagle.core.function.api.map.listener.IMoGoMapLocationListener;
-import com.mogo.eagle.core.function.call.map.CallerMapLocationListenerManager;
+import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener;
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ20ListenerManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.och.taxi.R;
 import com.mogo.och.taxi.utils.TaxiMapAssetStyleUtil;
@@ -39,12 +38,14 @@ import com.mogo.och.taxi.utils.TaxiMapAssetStyleUtil;
 import java.util.ArrayList;
 import java.util.List;
 
+import mogo.telematics.pad.MessagePad;
+
 /**
  * taxi司机端前往目的地小地图导航
  */
 public class TaxiMapDirectionView
         extends RelativeLayout
-        implements IMoGoMapLocationListener, ITaxiMapDirectionView, AMap.OnCameraChangeListener {
+        implements IMoGoChassisLocationGCJ02Listener, ITaxiMapDirectionView, AMap.OnCameraChangeListener {
 
     //小地图名称
     public static final String TAG = "TPMapDirectionView";
@@ -98,14 +99,14 @@ public class TaxiMapDirectionView
         initAMapView();
 
         // 注册定位监听
-        CallerMapLocationListenerManager.INSTANCE.addListener(TAG, this, false);
+        CallerChassisLocationGCJ20ListenerManager.INSTANCE.addListener(TAG, this);
     }
 
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
         // 注册定位监听
-        CallerMapLocationListenerManager.INSTANCE.removeListener(TAG, false);
+        CallerChassisLocationGCJ20ListenerManager.INSTANCE.removeListener(TAG);
     }
 
     private void initAMapView() {
@@ -174,13 +175,12 @@ public class TaxiMapDirectionView
         return true;
     }
 
-
     @Override
-    public void onLocationChanged(@org.jetbrains.annotations.Nullable MogoLocation location, int from, boolean isGps) {
-        if (location == null){
+    public void onChassisLocationGCJ02(@Nullable MessagePad.GnssInfo gnssInfo) {
+        if (gnssInfo == null){
             return;
         }
-        LatLng currentLatLng = new LatLng(location.getLatitude(), location.getLongitude());
+        LatLng currentLatLng = new LatLng(gnssInfo.getLatitude(), gnssInfo.getLongitude());
 
         if (mCoordinatesLatLng.size() > 1) {
             //圈定地图显示范围
@@ -196,13 +196,13 @@ public class TaxiMapDirectionView
         } else {
             //设置希望展示的地图缩放级别
             CameraPosition cameraPosition = new CameraPosition.Builder()
-                    .target(mCarMarker.getPosition()).tilt(0).bearing(location.getBearing()).zoom(zoomLevel).build();
+                    .target(mCarMarker.getPosition()).tilt(0).bearing((float) gnssInfo.getHeading()).zoom(zoomLevel).build();
             mAMap.moveCamera(CameraUpdateFactory.newCameraPosition(cameraPosition));
         }
         //更新车辆位置
         if (mCarMarker != null) {
 //            CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "location.getBearing() = " + location.getBearing());
-            mCarMarker.setRotateAngle(360 - location.getBearing());
+            mCarMarker.setRotateAngle((float) (360 - gnssInfo.getHeading()));
             mCarMarker.setPosition(currentLatLng);
 //            CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "onCarLocationChanged2--loacation :" + location.getLatitude()+", "+location.getLongitude());
             mCarMarker.setToTop();