[map-sdk] 同步地图SDK 3.4.0.1

libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt

@@ -36,28 +36,27 @@ import com.mogo.map.uicontroller.*
 import com.mogo.map.uicontroller.VisualAngleMode.MODE_MEDIUM_SIGHT
 import com.mogo.map.utils.MapTraceUtil
 import com.mogo.map.utils.MogoMapUtils
+import com.mogo.map.utils.MogoMapUtils.getLatLngBounds
 import com.mogo.map.utils.ObjectUtils
 import com.zhidaoauto.map.data.point.LonLatPoint
 import com.zhidaoauto.map.data.road.RoadCross
 import com.zhidaoauto.map.data.road.StopLine
-import com.zhidaoauto.map.sdk.open.HDTypes
 import com.zhidaoauto.map.sdk.open.MapAutoApi
 import com.zhidaoauto.map.sdk.open.MapAutoApi.registerLogListener
 import com.zhidaoauto.map.sdk.open.MapAutoApi.unregisterLogListener
 import com.zhidaoauto.map.sdk.open.abs.*
 import com.zhidaoauto.map.sdk.open.abs.log.ILog
-import com.zhidaoauto.map.sdk.open.business.PointCloudHelper.setIsDrawPointCloud
-import com.zhidaoauto.map.sdk.open.business.PointCloudHelper.setPointCloudColor
-import com.zhidaoauto.map.sdk.open.business.PointCloudHelper.setPointCloudSize
-import com.zhidaoauto.map.sdk.open.business.PointCloudHelper.updatePointCloudDataByPb
-import com.zhidaoauto.map.sdk.open.camera.CameraUpdateFactory.newLatLngBounds
-import com.zhidaoauto.map.sdk.open.location.MyLocationStyle
-import com.zhidaoauto.map.sdk.open.marker.BitmapDescriptorFactory.convertViewToBitmap
-import com.zhidaoauto.map.sdk.open.marker.Marker
-import com.zhidaoauto.map.sdk.open.marker.OnMarkClickListener
-import com.zhidaoauto.map.sdk.open.tools.MapTools.fromScreenLocation
-import com.zhidaoauto.map.sdk.open.tools.MapTools.getVisibleRegion
-import com.zhidaoauto.map.sdk.open.tools.MapTools.toScreenLocation
+import com.zhidaoauto.map.sdk.open.common.tools.MapTools.fromScreenLocation
+import com.zhidaoauto.map.sdk.open.common.tools.MapTools.getVisibleRegion
+import com.zhidaoauto.map.sdk.open.common.tools.MapTools.toScreenLocation
+import com.zhidaoauto.map.sdk.open.helpers.PointCloudHelper
+import com.zhidaoauto.map.sdk.open.helpers.PointCloudHelper.updatePointCloudDataByPb
+import com.zhidaoauto.map.sdk.open.logics.camera.CameraUpdateFactory.newLatLngBounds
+import com.zhidaoauto.map.sdk.open.logics.location.MyLocationStyle
+import com.zhidaoauto.map.sdk.open.renders.marker.BitmapDescriptorFactory.convertViewToBitmap
+import com.zhidaoauto.map.sdk.open.renders.marker.Marker
+import com.zhidaoauto.map.sdk.open.renders.marker.OnMarkClickListener
+import com.zhidaoauto.map.sdk.open.view.HDTypes
 import com.zhidaoauto.map.sdk.open.view.MapAutoView
 import com.zhjt.service.chain.ChainLog
 import java.util.concurrent.atomic.AtomicInteger
@@ -227,7 +226,7 @@ class AMapViewWrapper(mMapView: MapAutoView) : IMogoMapView, IMogoMapUIControlle
                 hdVisibleArray.add(HDTypes.CABLE.type)
                 hdVisibleArray.add(HDTypes.SIGNAL_LINE.type)
             }
-            mMapView.getMapAutoViewHelper()!!.setHDTypeVisible(hdVisibleArray.toIntArray())
+            mMapView.getMapAutoViewHelper()?.setHDTypeVisible(hdVisibleArray.toIntArray())
             loadPreVehicleModel()
         }
     }
@@ -518,7 +517,7 @@ class AMapViewWrapper(mMapView: MapAutoView) : IMogoMapView, IMogoMapUIControlle
             "showBounds : " + carPosition.toString() + " , " + bound.toShortString() + " , " + lockCarPosition
         )
         try {
-            val latLngBounds = MogoMapUtils.getLatLngBounds(carPosition, lonLats, lockCarPosition)
+            val latLngBounds = getLatLngBounds(carPosition, lonLats, lockCarPosition)
             mMapView.getMapAutoViewHelper()!!.setCenter(ObjectUtils.fromMogo(carPosition))
             mMapView.getMapAutoViewHelper()!!.moveCamera(
                 newLatLngBounds(
@@ -837,7 +836,7 @@ class AMapViewWrapper(mMapView: MapAutoView) : IMogoMapView, IMogoMapUIControlle
     // 是否绘制点云
     override fun setIsDrawPointCloud(isDrawPointCloud: Boolean) {
         try {
-            setIsDrawPointCloud(isDrawPointCloud, mMapView.getMapController())
+            PointCloudHelper.setIsDrawPointCloud(isDrawPointCloud, mMapView.getMapController())
         } catch (e: Exception) {
             e.printStackTrace()
         }
@@ -845,12 +844,12 @@ class AMapViewWrapper(mMapView: MapAutoView) : IMogoMapView, IMogoMapUIControlle
 
     //设置点云大小
     override fun setPointCloudSize(pointCloudSize: Float) {
-        setPointCloudSize(pointCloudSize, mMapView.getMapController())
+        PointCloudHelper.setPointCloudSize(pointCloudSize, mMapView.getMapController())
     }
 
     // 设置点云颜色
     override fun setPointCloudColor(color: String) {
-        setPointCloudColor(color, mMapView.getMapController())
+        PointCloudHelper.setPointCloudColor(color, mMapView.getMapController())
     }
 
     //更新点云

libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.kt

@@ -11,8 +11,8 @@ import com.mogo.map.overlay.wrapper.line.AMapPolylineWrapper
 import com.mogo.map.overlay.wrapper.point.AMapPointWrapper
 import com.mogo.map.uicontroller.IMogoMapUIController
 import com.mogo.map.utils.ObjectUtils
-import com.zhidaoauto.map.sdk.open.marker.BatchMarkerOptions
-import com.zhidaoauto.map.sdk.open.marker.MarkerSimpleData
+import com.zhidaoauto.map.sdk.open.renders.marker.BatchMarkerOptions
+import com.zhidaoauto.map.sdk.open.renders.marker.MarkerSimpleData
 import com.zhidaoauto.map.sdk.open.view.MapAutoView
 import com.zhidaoauto.map.sdk.open.view.MapAutoViewHelper
 import mogo.telematics.pad.MessagePad.TrackedObject

libraries/mogo-map/src/main/java/com/mogo/map/overlay/wrapper/line/AMapPolylineWrapper.kt

@@ -3,11 +3,11 @@ package com.mogo.map.overlay.wrapper.line
 import com.mogo.map.overlay.line.Polyline.Options
 import com.mogo.map.overlay.proxy.line.*
 import com.mogo.map.utils.ObjectUtils
-import com.zhidaoauto.map.sdk.open.poyline.*
 import com.zhidaoauto.map.sdk.open.view.MapAutoView
 import java.util.concurrent.atomic.*
+import com.zhidaoauto.map.sdk.open.renders.poyline.Polyline
 
-class AMapPolylineWrapper(private val id: String, private val delegate: Polyline,private val mMapAutoView: MapAutoView): IMapPolylineOverlay {
+class AMapPolylineWrapper(private val id: String, private val delegate: Polyline, private val mMapAutoView: MapAutoView): IMapPolylineOverlay {
 
     private val isDestroyed by lazy { AtomicBoolean(false) }
 

libraries/mogo-map/src/main/java/com/mogo/map/overlay/wrapper/point/AMapPointWrapper.kt

@@ -5,9 +5,9 @@ import com.mogo.map.overlay.point.Point.Options
 import com.mogo.map.overlay.proxy.point.*
 import com.mogo.map.utils.ObjectUtils
 import com.zhidaoauto.map.data.point.LonLatPoint
-import com.zhidaoauto.map.sdk.open.marker.*
 import com.zhidaoauto.map.sdk.open.view.MapAutoView
 import java.util.concurrent.atomic.AtomicBoolean
+import com.zhidaoauto.map.sdk.open.renders.marker.Marker
 
 class AMapPointWrapper(private val id: String, private val delegate: Marker, private val mMapAutoView: MapAutoView): IMapPointOverlay {
 

libraries/mogo-map/src/main/java/com/mogo/map/utils/MogoMapUtils.java

@@ -3,7 +3,7 @@ package com.mogo.map.utils;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.exception.MogoMapException;
 import com.zhidaoauto.map.data.point.LonLatPoint;
-import com.zhidaoauto.map.sdk.open.camera.LatLngBounds;
+import com.zhidaoauto.map.sdk.open.logics.camera.LatLngBounds;
 
 import java.util.List;
 

libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java

@@ -5,20 +5,20 @@ import android.graphics.Color;
 import android.text.TextUtils;
 import android.view.View;
 
+import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
 import com.mogo.map.overlay.line.Polyline;
 import com.mogo.map.overlay.point.Point;
 import com.mogo.map.uicontroller.MapCameraPosition;
 import com.zhidaoauto.map.data.point.LonLatPoint;
-import com.zhidaoauto.map.sdk.open.camera.CameraPosition;
-import com.zhidaoauto.map.sdk.open.marker.BitmapDescriptor;
-import com.zhidaoauto.map.sdk.open.marker.BitmapDescriptorFactory;
-import com.zhidaoauto.map.sdk.open.marker.MarkerOptions;
-import com.zhidaoauto.map.sdk.open.marker.MarkerSimpleData;
-import com.zhidaoauto.map.sdk.open.poyline.PolylineOptions;
+import com.zhidaoauto.map.sdk.open.logics.camera.CameraPosition;
+import com.zhidaoauto.map.sdk.open.renders.marker.BitmapDescriptor;
+import com.zhidaoauto.map.sdk.open.renders.marker.BitmapDescriptorFactory;
+import com.zhidaoauto.map.sdk.open.renders.marker.MarkerOptions;
+import com.zhidaoauto.map.sdk.open.renders.marker.MarkerSimpleData;
+import com.zhidaoauto.map.sdk.open.renders.poyline.PolylineOptions;
 import com.zhidaoauto.map.sdk.open.view.MapAutoView;
-import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -187,7 +187,7 @@ public class ObjectUtils {
         return new MogoLatLng(point.getLatitude(), point.getLongitude());
     }
 
-    public static PolylineOptions fromMogo(Polyline.Options options,MapAutoView mapAutoView) {
+    public static PolylineOptions fromMogo(Polyline.Options options, MapAutoView mapAutoView) {
         if (options == null) {
             return null;
         }