From b421d2dc3ff5b2b2719b6a18841794cf5e7d9386 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 28 Aug 2023 16:52:01 +0800 Subject: [PATCH] [3.4.0-map-sdk] wait --- .../module/manager/OCHAdasAbilityManager.java | 2 +- .../hmi/ui/widget/PerspectiveSwitchView.kt | 46 -- .../res/layout/view_perspective_switch.xml | 31 -- .../business/ai/AiCloudIdentifyDataManager.kt | 6 +- .../call/map/CallerVisualAngleManager.kt | 2 +- .../drawable-mdpi/module_switch_map_angle.png | Bin 862 -> 0 bytes .../module_switch_map_angle.png | Bin 862 -> 0 bytes .../drawable/module_switch_map_bg.xml | 15 - .../src/main/java/com/mogo/map/IMogoMap.java | 48 -- .../com/mogo/map/hdcache/IHdCacheListener.kt | 7 - .../map/identity/IMogoIdentifyManager.java | 7 - .../uicontroller/IMogoMapUIController.java | 5 + .../java/com/mogo/map/AMapViewWrapper.java | 89 ++-- .../main/java/com/mogo/map/AMapWrapper.java | 66 --- .../com/mogo/map/MogoMapUIController.java | 423 ------------------ .../main/java/com/mogo/map/MogoMapView.java | 2 + .../map/identify/MogoIdentifyManager.java | 13 - .../map/overlay/MoGoOverlayManagerImpl.kt | 5 +- .../map/uicontroller/AMapUIController.java | 366 --------------- 19 files changed, 48 insertions(+), 1085 deletions(-) delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/PerspectiveSwitchView.kt delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_perspective_switch.xml delete mode 100644 core/mogo-core-res/src/main/function-hmi-res/drawable-mdpi/module_switch_map_angle.png delete mode 100644 core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/module_switch_map_angle.png delete mode 100644 core/mogo-core-res/src/main/function-hmi-res/drawable/module_switch_map_bg.xml delete mode 100644 libraries/mogo-map-api/src/main/java/com/mogo/map/hdcache/IHdCacheListener.kt delete mode 100644 libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java delete mode 100644 libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHAdasAbilityManager.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHAdasAbilityManager.java index a82b3b7b70..d1026188ec 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHAdasAbilityManager.java +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHAdasAbilityManager.java @@ -31,7 +31,7 @@ public class OCHAdasAbilityManager implements IMoGoAutopilotActionsListener, IMo private static final String TAG = OCHAdasAbilityManager.class.getSimpleName(); private boolean isAutopilotAbility; - private String autopilotAbilityReason; + private String autopilotAbilityReason = ""; private String startFailedCode = ""; private String startFailedMessage = ""; diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/PerspectiveSwitchView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/PerspectiveSwitchView.kt deleted file mode 100644 index 09cd83ed9a..0000000000 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/PerspectiveSwitchView.kt +++ /dev/null @@ -1,46 +0,0 @@ -package com.mogo.eagle.core.function.hmi.ui.widget - -import android.content.Context -import android.util.AttributeSet -import android.view.LayoutInflater -import android.view.View -import android.widget.FrameLayout -import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager.getMapUIController -import com.mogo.eagle.core.function.hmi.R -import com.mogo.map.uicontroller.VisualAngleMode -import kotlinx.android.synthetic.main.view_perspective_switch.view.* - -/** - *@author xiaoyuzhou - *@date 2021/10/15 11:34 上午 - * 视角切换按钮 - */ -class PerspectiveSwitchView @JvmOverloads constructor( - context: Context, - attrs: AttributeSet? = null, - defStyleAttr: Int = 0 -) : FrameLayout(context, attrs, defStyleAttr), View.OnClickListener{ - - override fun onAttachedToWindow() { - super.onAttachedToWindow() - LayoutInflater.from(context).inflate(R.layout.view_perspective_switch, this, true) - setBackgroundResource(R.drawable.module_switch_map_bg) - setOnClickListener(this) - } - - override fun onClick(v: View?) { - getMapUIController()?.let { - if (it.currentMapVisualAngle.isLongSight) { - it.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null) - textSwitch.setText(R.string.module_map_model_normal) - } else if (it.currentMapVisualAngle.isMediumSight) { - it.changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null) - textSwitch.setText(R.string.module_map_model_faster) - } else { - it.changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null) - textSwitch.setText(R.string.module_map_model_faster) - } - } - } - -} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_perspective_switch.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_perspective_switch.xml deleted file mode 100644 index 216285d585..0000000000 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_perspective_switch.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt index 79881fcaf7..37c24da830 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt @@ -36,7 +36,6 @@ import com.mogo.eagle.core.function.utils.MapBizTrace import com.mogo.eagle.core.function.utils.MapBizTrace.Companion.getCurrentCNode import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.ToastUtils -import com.mogo.map.MogoMapUIController import com.mogo.map.uicontroller.VisualAngleMode import com.zhjt.service.chain.ChainLog import mogo.telematics.pad.MessagePad @@ -176,8 +175,7 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener, MapIdentifySubscriber.instance.clearAiCloudRoma() // 主动关闭roma，回到中景视角 if (manual) { - MogoMapUIController.getInstance() - .changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null) + CallerMapUIServiceManager.getMapUIController()?.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null) } } @@ -217,7 +215,7 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener, ) if (dataReceive) { // 请求地图开始漫游 - MogoMapUIController.getInstance().setRomaMode(FunctionBuildConfig.romaModeStyle) + CallerMapUIServiceManager.getMapUIController()?.setRomaMode(FunctionBuildConfig.romaModeStyle) } }, { errorMsg -> diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt index d57d2ad066..5304c8bc4c 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt @@ -14,7 +14,7 @@ object CallerVisualAngleManager { private val provider by lazy { ARouter.getInstance().build(MogoServicePaths.PATH_VISUAL_ANGLE) .navigation() as? IMoGoVisualAngleChangeProvider } -· + fun init() { provider?.let { Log.d("CallerVisualAngle", "--- init ---") diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-mdpi/module_switch_map_angle.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-mdpi/module_switch_map_angle.png deleted file mode 100644 index 3e1b96f3e3f0a01072632bcd1389a7811a195517..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 862 zcmeAS@N?(olHy`uVBq!ia0vp^20(1V!3HFE2UfoVQjEnx?oJHr&dIz4a$Hg)JkxxA z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvPYp{SB&b9z4eC@7&mVtrkgr|#R zNCxZMS=Je%jv{T}kFDO=@xwz^^Uanojr}EILRVJ2T*D$L8lAt?Hz0cBHW8Pk`3oEu zH!bMky4E!HW8+eV6&yu>|IL=|EKdLSF3rH2+xWx%)N^O%{5)s*yJ7F_RMF_|w`2R) zEzsY&t}rLGWO63&r1|GF1Y_5{TKuWTOwxJ%guCa$OWT@@w+a6W4*knBHMZe1^O@S- zZMtp1R?AK%TEG_&!f)!o`h$qjP>Iw~KFQx-j?o zZmY`Kk1hCWLc~`$Ztl-@5Z__&^?_B#z037^{#`roR|_%!Irvi0o_hN2(G9p1lLsQ>rH{+BObtY>_%o#7XUZhJhJ;%T=$NxOUHgr+R#{I}!eo|(eYtUS|euV`LnU+?M5ae(`N3j@y| z{)4-s&WK)M_F3L59>;i8s^LLDZ&Q3G!~HE6vh-$~E?xgR`g6<7r4ODKs)}B?u2Z%< zU)t+SY_`_H={FABwk}U)uXXtK#pucA)2ny#|D5TTeb@Te+Ioh6t2vj;-VZGSrEO1F KKbLh*2~7Znyl$od diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/module_switch_map_angle.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/module_switch_map_angle.png deleted file mode 100644 index 3e1b96f3e3f0a01072632bcd1389a7811a195517..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 862 zcmeAS@N?(olHy`uVBq!ia0vp^20(1V!3HFE2UfoVQjEnx?oJHr&dIz4a$Hg)JkxxA z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvPYp{SB&b9z4eC@7&mVtrkgr|#R zNCxZMS=Je%jv{T}kFDO=@xwz^^Uanojr}EILRVJ2T*D$L8lAt?Hz0cBHW8Pk`3oEu zH!bMky4E!HW8+eV6&yu>|IL=|EKdLSF3rH2+xWx%)N^O%{5)s*yJ7F_RMF_|w`2R) zEzsY&t}rLGWO63&r1|GF1Y_5{TKuWTOwxJ%guCa$OWT@@w+a6W4*knBHMZe1^O@S- zZMtp1R?AK%TEG_&!f)!o`h$qjP>Iw~KFQx-j?o zZmY`Kk1hCWLc~`$Ztl-@5Z__&^?_B#z037^{#`roR|_%!Irvi0o_hN2(G9p1lLsQ>rH{+BObtY>_%o#7XUZhJhJ;%T=$NxOUHgr+R#{I}!eo|(eYtUS|euV`LnU+?M5ae(`N3j@y| z{)4-s&WK)M_F3L59>;i8s^LLDZ&Q3G!~HE6vh-$~E?xgR`g6<7r4ODKs)}B?u2Z%< zU)t+SY_`_H={FABwk}U)uXXtK#pucA)2ny#|D5TTeb@Te+Ioh6t2vj;-VZGSrEO1F KKbLh*2~7Znyl$od diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_switch_map_bg.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_switch_map_bg.xml deleted file mode 100644 index 0c8fef57d6..0000000000 --- a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_switch_map_bg.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java index 0607097c0f..413a67e51b 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java @@ -66,52 +66,4 @@ public interface IMogoMap { */ void removeMarker(String uuidString); - /** - * 从地图上删除所有的overlay（marker，circle，polyline 等对象）。 - */ - void clear(); - - /** - * 从地图上删除所有的覆盖物（marker，circle，polyline 等对象），但myLocationOverlay（内置定位覆盖物）除外。 - * - * @param isKeepMyLocationOverlay - */ - void clear(boolean isKeepMyLocationOverlay); - - /** - * 设置屏幕上的某个像素点为地图中心点。 - * - * @param x - * @param y - */ - void setPointToCenter(int x, int y); - - /** - * 获取比例尺 - * - * @return 当前缩放级别下，地图上1像素点对应的长度，单位米 - */ - float getScalePerPixel(); - - /** - * 改变地图缩放级别 - * - * @param zoom - */ - void changeZoom(float zoom); - - /** - * 改变地图缩放级别的别一种方式 - * - * @param zoom 缩放等级 - */ - void changeZoom2(float zoom); - - /** - * 获取缩放比例 - * - * @return - */ - float getZoomLevel(); - } diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/hdcache/IHdCacheListener.kt b/libraries/mogo-map-api/src/main/java/com/mogo/map/hdcache/IHdCacheListener.kt deleted file mode 100644 index 9492c60ba7..0000000000 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/hdcache/IHdCacheListener.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.mogo.map.hdcache - -interface IHdCacheListener { - fun onMapHdCacheProgress(cityId: Int, progress: Double) - - fun onMapHdCacheResult(cityId: Int, state: Int)// 0失败，1成功 -} \ No newline at end of file diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/identity/IMogoIdentifyManager.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/identity/IMogoIdentifyManager.java index 3edb89854d..09b9378e5f 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/identity/IMogoIdentifyManager.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/identity/IMogoIdentifyManager.java @@ -34,11 +34,4 @@ public interface IMogoIdentifyManager { */ void updateBatchAiMarkerPosition(HashMap optionsArrayList); - /** - * 添加感知使用到的3d模型 - * - * @param type - * @param modelRes - */ - String addPreVehicleModel(int type, int modelRes); } diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java index 404888693f..d056c51638 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java @@ -316,4 +316,9 @@ public interface IMogoMapUIController { * @param v4 */ void animateTo(double lon, double lat, float v1, float v2, float v3, float v4, int duration, boolean isGps); + + /** + * 从地图上删除所有的overlay（marker，circle，polyline 等对象）。 + */ + void clear(); } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java index c8bef96674..caaf86fb04 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java @@ -41,7 +41,6 @@ import com.mogo.eagle.core.function.call.map.CallerMapRomaListener; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.ThreadUtils; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; -import com.mogo.map.hdcache.IHdCacheListener; import com.mogo.map.identify.MogoIdentifyManager; import com.mogo.map.listener.MogoMapListenerHandler; import com.mogo.map.location.GDLocationClient; @@ -112,10 +111,8 @@ public class AMapViewWrapper implements IMogoMapView, //代理地图实例和接 private volatile EnumMapUI mCurrentUI = EnumMapUI.MAP_STYLE_NIGHT_VR; private VisualAngleMode mVisualAngleMode = MODE_MEDIUM_SIGHT; - private IHdCacheListener hdCacheListener; - public AMapViewWrapper(MapAutoView mMapView) { - CallerLogger.INSTANCE.i(M_MAP + TAG, "autoop--AMapViewWrapper: init"); + CallerLogger.INSTANCE.i(M_MAP + TAG, "AMapViewWrapper: init"); this.mMapView = mMapView; initViews(); initListeners(); @@ -165,28 +162,6 @@ public class AMapViewWrapper implements IMogoMapView, //代理地图实例和接 CallerLogger.INSTANCE.d(M_MAP + TAG, "styleop - initListeners - setOnMapStyleListener - view " + mMapView); } - private void initMapView() { - if (mMapView == null) { - return; - } - MapAutoViewHelper options = mMapView.getMapAutoViewHelper(); - if (options != null) { - options.setScaleVRMode(true); - } - - //todo configStartUp配置 - ThreadUtils.getIoPool().submit(() -> { - if (options != null) { -// if (options.getMyLocationStyle() != null) { -// //是否显示光圈,耗时 -// options.getMyLocationStyle().setDisplayAnimEnable(true); -// } - //修改自车模型，未来需区分车的类型 - options.setMyLocationStyle(options.getMyLocationStyle().myLocationIcon(HdMapBuildConfig.currentCarVrIconRes, true)); - } - }); - } - private Context getContext() { return mMapView.getContext(); } @@ -264,10 +239,7 @@ public class AMapViewWrapper implements IMogoMapView, //代理地图实例和接 @Override public void onRoadIdInfo(@androidx.annotation.Nullable String roadId, @androidx.annotation.Nullable String s1) { if (roadId != null && !TextUtils.isEmpty(roadId)) { - // CallerLogger.INSTANCE.d(M_MAP + TAG, "onRoadIdInfo::" + roadId); CallerMapRoadListenerManager.INSTANCE.invokeListenersOnRoadIdGet(roadId); - } else { - //CallerLogger.INSTANCE.d(M_MAP + TAG, "onRoadIdInfo::null"); } } @@ -276,19 +248,20 @@ public class AMapViewWrapper implements IMogoMapView, //代理地图实例和接 } + //todo 多实例 对象替换 @Override public void onStopLineInfo(@androidx.annotation.Nullable StopLine stopLine) { MogoLocation carLoc = CallerChassisLocationWGS84ListenerManager.INSTANCE.getChassisLocationWGS84(); if (stopLine != null && stopLine.getRoad_id() != null && !stopLine.getRoad_id().isEmpty() && stopLine.getPoints() != null && stopLine.getPoints().size() > 0) { ArrayList points = stopLine.getPoints(); if (carLoc != null) { -// //CallerLogger.INSTANCE.d(M_MAP + TAG, "onStopLineInfo:stop_line" + stopLine + ", car_loc:{lon: " + carLoc.getLatitude() + ", lat: " + carLoc.getLongitude() + "}"); + CallerLogger.INSTANCE.d(M_MAP + TAG, "onStopLineInfo:stop_line" + stopLine); MapRoadInfo.StopLine stopInfo = convert(stopLine); LonLatPoint p1 = points.get(0); LonLatPoint p2 = points.get(points.size() - 1); double distanceOfCarToStopLine = MapDataApi.INSTANCE.getNearstFromPointToSegment(carLoc.getLongitude(), carLoc.getLatitude(), p1.getLongitude(), p1.getLatitude(), p2.getLongitude(), p2.getLatitude()) * 10_0000; stopInfo.setDistanceOfCarToStopLine(distanceOfCarToStopLine); - //CallerLogger.INSTANCE.d(M_MAP + TAG, "onStopLineInfo: --- distance: " + distanceOfCarToStopLine); + CallerLogger.INSTANCE.d(M_MAP + TAG, "onStopLineInfo: --- distance: " + distanceOfCarToStopLine); CallerMapRoadListenerManager.INSTANCE.invokeListenersOnStopLineGet(stopInfo); } } else { @@ -324,15 +297,19 @@ public class AMapViewWrapper implements IMogoMapView, //代理地图实例和接 @Override public MapControlResult changeZoom(float zoom) { - CallerLogger.INSTANCE.d(M_MAP + TAG, "changeZoom : " + zoom); - getMap().changeZoom(zoom); + MapAutoViewHelper mapAutoViewHelper = mMapView.getMapAutoViewHelper(); + if (mapAutoViewHelper != null) { + mapAutoViewHelper.setZoom((int) zoom); + } return MapControlResult.SUCCESS; } @Override public void changeZoom2(float zoom) { - CallerLogger.INSTANCE.d(M_MAP + TAG, "changeZoom2 : " + zoom); - getMap().changeZoom2(zoom); + MapAutoViewHelper mapAutoViewHelper = mMapView.getMapAutoViewHelper(); + if (mapAutoViewHelper != null) { + mapAutoViewHelper.setZoomVal(zoom); + } } @Override @@ -461,12 +438,18 @@ public class AMapViewWrapper implements IMogoMapView, //代理地图实例和接 @Override public float getScalePerPixel() { - return getMap().getScalePerPixel(); + if (checkAMapView()) { + return mMapView.getMapAutoViewHelper().getScalePerPixel(); + } + return 0.0f; } @Override public float getZoomLevel() { - return getMap().getZoomLevel(); + if (checkAMapView()) { + return mMapView.getMapAutoViewHelper().getZoom(); + } + return 0.0f; } @Override @@ -668,7 +651,7 @@ public class AMapViewWrapper implements IMogoMapView, //代理地图实例和接 ) @Override public void onMapInit() { - CallerLogger.INSTANCE.i(M_MAP + TAG, "autoop--onMapInit: "); + CallerLogger.INSTANCE.i(M_MAP + TAG, "onMapInit: "); MogoMapListenerHandler.Companion.getMogoMapListenerHandler().onMapLoaded(); } @@ -681,14 +664,13 @@ public class AMapViewWrapper implements IMogoMapView, //代理地图实例和接 ) @Override public void onMapLoaded() { - CallerLogger.INSTANCE.i(M_MAP + TAG, "autoop--onMapLoaded: "); + CallerLogger.INSTANCE.i(M_MAP + TAG, "onMapLoaded: "); if (checkAMapView()) { CameraPosition cameraPosition = mMapView.getMapAutoViewHelper().getCameraPosition(); MogoMapListenerHandler.Companion.getMogoMapListenerHandler().onMapChanged(ObjectUtils.fromAMap(cameraPosition.getTarget()), cameraPosition.getZoom(), cameraPosition.getTilt(), cameraPosition.getBearing()); - initMapView(); loadPreVehicleModel(); } } @@ -805,16 +787,8 @@ public class AMapViewWrapper implements IMogoMapView, //代理地图实例和接 @Override public void stepInVrMode(boolean isDayMode) { // try { -// int mapStyle; -// if (isDayMode) { -// mCurrentUI = EnumMapUI.MAP_STYLE_DAY_VR; -// mapStyle = MapAutoApi.MAP_STYLE_DAY_VR; -// } else { -// mCurrentUI = EnumMapUI.MAP_STYLE_NIGHT_VR; -// mapStyle = MapAutoApi.MAP_STYLE_NIGHT_VR; -// } // if (mMapView != null && mMapView.getMapAutoViewHelper() != null) { -// mMapView.getMapAutoViewHelper().setMapStyle(mapStyle); +// mMapView.getMapAutoViewHelper().setMapStyle(); // } // } catch (Exception e) { // e.printStackTrace(); @@ -872,13 +846,11 @@ public class AMapViewWrapper implements IMogoMapView, //代理地图实例和接 if (isDayMode()) { preVehicleStrWeiZhi = // 添加模型到地图中 - MogoIdentifyManager.getInstance() - .addPreVehicleModel(typeTrafficId.getType(), typeTrafficId.getTraffic3DIconId()); + getMap().addPreVehicleModel(typeTrafficId.getType(), typeTrafficId.getTraffic3DIconId()); } else { preVehicleStrWeiZhi = // 添加模型到地图中 - MogoIdentifyManager.getInstance() - .addPreVehicleModel(typeTrafficId.getType(), typeTrafficId.getTraffic3DNightIconId()); + getMap().addPreVehicleModel(typeTrafficId.getType(), typeTrafficId.getTraffic3DNightIconId()); } CallerLogger.INSTANCE.d(M_MAP + TAG, logMsg + preVehicleStrWeiZhi); @@ -962,18 +934,25 @@ public class AMapViewWrapper implements IMogoMapView, //代理地图实例和接 @Override public void animateTo(double lon, double lat, float rotateAngle, int duration, boolean isGps) { - if (mMapView.getMapAutoViewHelper() != null) { + if (checkAMapView()) { mMapView.getMapAutoViewHelper().animateTo(lon, lat, rotateAngle, duration, isGps); } } @Override public void animateTo(double lon, double lat, float v1, float v2, float v3, float v4, int duration, boolean isGps) { - if (mMapView.getMapAutoViewHelper() != null) { + if (checkAMapView()) { mMapView.getMapAutoViewHelper().animateTo(lon, lat, v1, v2, v3, v4, duration, isGps); } } + @Override + public void clear() { + if(checkAMapView()){ + mMapView.getMapAutoViewHelper().clearPanel(); + } + } + @Override public void onRoadLoaded(@androidx.annotation.Nullable String roadInfo) { diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java index 14f8ca12de..569bc13985 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java @@ -1,24 +1,19 @@ package com.mogo.map; import android.annotation.SuppressLint; -import android.graphics.Point; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.map.overlay.proxy.line.IMapPolylineOverlay; import com.mogo.map.overlay.proxy.point.IMapPointOverlay; import com.mogo.map.overlay.wrapper.point.AMapPointWrapper; -import com.mogo.map.uicontroller.AMapUIController; import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.map.utils.ObjectUtils; -import com.zhidaoauto.map.data.point.LonLatPoint; -import com.zhidaoauto.map.data.road.CenterLine; import com.zhidaoauto.map.sdk.open.marker.BatchMarkerOptions; import com.zhidaoauto.map.sdk.open.marker.Marker; import com.zhidaoauto.map.sdk.open.marker.MarkerOptions; import com.zhidaoauto.map.sdk.open.marker.MarkerSimpleData; import com.zhidaoauto.map.sdk.open.poyline.Polyline; import com.zhidaoauto.map.sdk.open.poyline.PolylineOptions; -import com.zhidaoauto.map.sdk.open.tools.MapTools; import com.zhidaoauto.map.sdk.open.view.MapAutoView; import com.zhidaoauto.map.sdk.open.view.MapAutoViewHelper; @@ -48,9 +43,6 @@ public class AMapWrapper implements IMogoMap { this.mAMap = map; this.mMapView = mapView; mMapUIController = controller; - // 设置实现自定义 info window -// MapAutoApi.INSTANCE.setInfoWindowAdapter(new AMapInfoWindowAdapter()); - AMapUIController.getInstance().initClient(mMapUIController); } @Override @@ -193,64 +185,6 @@ public class AMapWrapper implements IMogoMap { } } - @Override - public void clear() { - if (checkAMap()) { - mAMap.clearPanel(); - } - } - - @Override - public void clear(boolean isKeepMyLocationOverlay) { - if (checkAMap()) { - mAMap.clearPanel(); - } - } - - @Override - public void setPointToCenter(int x, int y) { - if (checkAMap()) { - LonLatPoint lonLatPoint = MapTools.INSTANCE.fromScreenLocation(new Point(x, y), mMapView.getMapController()); - mAMap.setCenter(lonLatPoint); - } - } - - @Override - public float getScalePerPixel() { - if (checkAMap()) { - return mAMap.getScalePerPixel(); - } - return 0; - } - - @Override - public void changeZoom(float zoom) { - CallerLogger.INSTANCE.d(TAG, "changeZoom %s", zoom); - if (checkAMap()) { - mAMap.setZoom((int) zoom); - } - } - - @Override - public void changeZoom2(float zoom) { - CallerLogger.INSTANCE.d(TAG, "changeZoom %s", zoom); - if (checkAMap()) { - mAMap.setZoomVal(zoom); - } - } - - @Override - public float getZoomLevel() { - if (checkAMap()) { - try { - return mAMap.getZoom(); - } catch (Exception ignored) { - - } - } - return 0; - } - private boolean checkAMap() { mAMap = mMapView.getMapAutoViewHelper(); if (mAMap == null) { diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java deleted file mode 100644 index 6a9f8790d7..0000000000 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java +++ /dev/null @@ -1,423 +0,0 @@ -package com.mogo.map; - -import android.graphics.Point; -import android.graphics.Rect; -import android.view.View; - -import com.mogo.eagle.core.data.map.MogoLatLng; -import com.mogo.eagle.core.data.map.MogoLocation; -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.map.uicontroller.AMapUIController; -import com.mogo.map.uicontroller.CarCursorOption; -import com.mogo.map.uicontroller.IMogoMapUIController; -import com.mogo.map.uicontroller.MapCameraPosition; -import com.mogo.map.uicontroller.MapControlResult; -import com.mogo.map.uicontroller.VisualAngleMode; - -import java.util.List; - - -/** - * @author congtaowang - * @since 2019-12-26 - *

- * 地图控制 - */ -public class MogoMapUIController implements IMogoMapUIController { - - private static final String TAG = "MogoMapUIController"; - - private IMogoMapUIController mDelegate; - - private static volatile MogoMapUIController sInstance; - - private MogoMapUIController() { - initDelegate(); - } - - private void initDelegate() { - if (mDelegate == null) { - mDelegate = AMapUIController.getInstance(); - } - } - - public static MogoMapUIController getInstance() { - if (sInstance == null) { - synchronized (MogoMapUIController.class) { - if (sInstance == null) { - sInstance = new MogoMapUIController(); - } - } - } - return sInstance; - } - - public static synchronized void release() { - sInstance = null; - } - - @Override - public MapControlResult changeZoom(float zoom) { - initDelegate(); - if (mDelegate != null) { - return mDelegate.changeZoom(zoom); - } - return MapControlResult.ERROR; - } - - @Override - public void changeZoom2(float zoom) { - initDelegate(); - if (mDelegate != null) { - mDelegate.changeZoom2(zoom); - } - } - - @Override - public void changeMapVisualAngle(VisualAngleMode angelMode, MogoLatLng mogoLatLng) { - initDelegate(); - if (mDelegate != null) { - CallerLogger.INSTANCE.d(TAG, "set VisualAngle: " + angelMode.name()); - mDelegate.changeMapVisualAngle(angelMode, mogoLatLng); - } - } - - @Override - public void setRoamTrajectory(String trajectory) { - initDelegate(); - if (mDelegate != null) { - mDelegate.setRoamTrajectory(trajectory); - } - } - - @Override - public void setRomaMode(int mode) { - initDelegate(); - if (mDelegate != null) { - CallerLogger.INSTANCE.d(TAG, "set setRomaMode: " + mode); - mDelegate.setRomaMode(mode); - } - } - - @Override - public VisualAngleMode getCurrentMapVisualAngle() { - initDelegate(); - if (mDelegate != null) { - return mDelegate.getCurrentMapVisualAngle(); - } - return null; - } - - @Override - public void moveToCenter(MogoLatLng latLng, boolean animate) { - initDelegate(); - if (mDelegate != null) { - mDelegate.moveToCenter(latLng, animate); - } - } - - @Override - public boolean isDayMode() { - initDelegate(); - if (mDelegate != null) { - return mDelegate.isDayMode(); - } - return false; - } - - @Override - public void showMyLocation(boolean visible) { - initDelegate(); - if (mDelegate != null) { - mDelegate.showMyLocation(visible); - } - } - - - @Override - public void showMyLocation(View view) { - initDelegate(); - if (mDelegate != null) { - mDelegate.showMyLocation(view); - } - } - - - @Override - public float getScalePerPixel() { - initDelegate(); - if (mDelegate != null) { - return mDelegate.getScalePerPixel(); - } - return 0; - } - - @Override - public float getZoomLevel() { - initDelegate(); - if (mDelegate != null) { - return mDelegate.getZoomLevel(); - } - return 0; - } - - @Override - public MogoLatLng getCameraNorthEastPosition() { - initDelegate(); - if (mDelegate != null) { - return mDelegate.getCameraNorthEastPosition(); - } - return null; - } - - @Override - public MogoLatLng getCameraSouthWestPosition() { - initDelegate(); - if (mDelegate != null) { - return mDelegate.getCameraSouthWestPosition(); - } - return null; - } - - @Override - public MogoLatLng getWindowCenterLocation() { - initDelegate(); - if (mDelegate != null) { - return mDelegate.getWindowCenterLocation(); - } - return null; - } - - @Override - public void setPointToCenter(double mapCenterX, double mapCenterY) { - initDelegate(); - if (mDelegate != null) { - mDelegate.setPointToCenter(mapCenterX, mapCenterY); - } - } - - @Override - public Point getLocationPointInScreen(MogoLatLng latLng) { - initDelegate(); - if (mDelegate != null) { - return mDelegate.getLocationPointInScreen(latLng); - } - return null; - } - - @Override - public MogoLatLng getLocationMogoLatLngInScreen(Point point) { - initDelegate(); - if (mDelegate != null) { - return mDelegate.getLocationMogoLatLngInScreen(point); - } - return null; - } - - @Override - public void setRenderFps(int fps) { - initDelegate(); - if (mDelegate != null) { - mDelegate.setRenderFps(fps); - } - } - - @Override - public void showBounds(String tag, MogoLatLng carPosition, List lonLats, Rect bound, boolean lockCarPosition) { - initDelegate(); - if (mDelegate != null) { - mDelegate.showBounds(tag, carPosition, lonLats, bound, lockCarPosition); - } - } - - @Override - public void forceRender() { - initDelegate(); - if (mDelegate != null) { - mDelegate.forceRender(); - } - } - - @Override - public float calculateLineDistance(MogoLatLng p1, MogoLatLng p2) throws Exception { - initDelegate(); - if (mDelegate != null) { - return mDelegate.calculateLineDistance(p1, p2); - } - return 0; - } - - @Override - public boolean isCarLocked() { - initDelegate(); - if (mDelegate != null) { - return mDelegate.isCarLocked(); - } - return false; - } - - @Override - public void setCarCursorOption(CarCursorOption option) { - initDelegate(); - if (mDelegate != null) { - mDelegate.setCarCursorOption(option); - } - } - - @Override - public void setCarLightsType(int type, int time) { - initDelegate(); - if (mDelegate != null) { - mDelegate.setCarLightsType(type, time); - } - } - - @Override - public MapCameraPosition getMapCameraPosition() { - initDelegate(); - if (mDelegate != null) { - return mDelegate.getMapCameraPosition(); - } - return null; - } - - @Override - public void changeBearing(float bearing) { - initDelegate(); - if (mDelegate != null) { - mDelegate.changeBearing(bearing); - } - } - - @Override - public void changeCurrentIcon(int iconId) { - initDelegate(); - if (mDelegate != null) { - mDelegate.changeCurrentIcon(iconId); - } - } - - @Override - public void rtkEnable(boolean enable) { - initDelegate(); - if (mDelegate != null) { - mDelegate.rtkEnable(enable); - } - } - - @Override - public void destroy() { - mDelegate = null; - } - - @Override - public void stepInVrMode(boolean isDayMode) { - initDelegate(); - if (mDelegate != null) { - mDelegate.stepInVrMode(isDayMode); - } - } - - @Override - public String getMarkerInfoResName(String speedVal) { - initDelegate(); - if (mDelegate != null) { - return mDelegate.getMarkerInfoResName(speedVal); - } - return null; - } - - @Override - public void setMarkerInfoResName(String speedVal, String val) { - initDelegate(); - if (mDelegate != null) { - mDelegate.setMarkerInfoResName(speedVal, val); - } - } - - @Override - public void setMapDAngle(float angle) { - initDelegate(); - if (mDelegate != null) { - mDelegate.setMapDAngle(angle); - } - } - - @Override - public void setLockMode(boolean isLock) { - initDelegate(); - if (mDelegate != null) { - mDelegate.setLockMode(isLock); - } - } - - @Override - public void setScrollGesturesEnable(boolean isEnable) { - initDelegate(); - if (mDelegate != null) { - mDelegate.setScrollGesturesEnable(isEnable); - } - } - - @Override - public void setAllGesturesEnabled(boolean isEnable) { - initDelegate(); - if (mDelegate != null) { - mDelegate.setAllGesturesEnabled(isEnable); - } - } - - @Override - public void setExtraGPSData(MogoLocation gnssInfo) { - initDelegate(); - if (mDelegate != null) { - mDelegate.setExtraGPSData(gnssInfo); - } - } - - @Override - public void setIsDrawPointCloud(Boolean isDrawPointCloud) { - initDelegate(); - if (mDelegate != null) { - mDelegate.setIsDrawPointCloud(isDrawPointCloud); - } - } - - @Override - public void setPointCloudSize(Float pointCloudSize) { - initDelegate(); - if (mDelegate != null) { - mDelegate.setPointCloudSize(pointCloudSize); - } - } - - @Override - public void setPointCloudColor(String color) { - initDelegate(); - if (mDelegate != null) { - mDelegate.setPointCloudColor(color); - } - } - - @Override - public String getCityCode() { - if (mDelegate != null) { - return mDelegate.getCityCode(); - } - return null; - } - - @Override - public void animateTo(double lon, double lat, float rotateAngle, int duration, boolean isGps) { - if (mDelegate != null) { - mDelegate.animateTo(lon, lat, rotateAngle, duration, isGps); - } - } - - @Override - public void animateTo(double lon, double lat, float v1, float v2, float v3, float v4, int duration, boolean isGps) { - if (mDelegate != null) { - mDelegate.animateTo(lon, lat, v1, v2, v3, v4, duration, isGps); - } - } -} diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapView.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapView.java index d058fcd0db..109dbb507e 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapView.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapView.java @@ -9,6 +9,7 @@ import android.widget.FrameLayout; import androidx.annotation.Nullable; +import com.mogo.eagle.core.data.config.HdMapBuildConfig; import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.map.uicontroller.IMogoMapUIController; @@ -55,6 +56,7 @@ public class MogoMapView extends MogoBaseMapView implements ILifeCycle { if (mapAutoView.getMapStyleParams() != null) { mapAutoView.getMapStyleParams() .setIsWeatherEnable(false) + .setLocationIcon3DRes(HdMapBuildConfig.currentCarVrIconRes) .setPerspectiveMode(MapParams.MAP_PERSPECTIVE_UP_CAR) .setHDVisibileArray(new int[]{HDTypes.DIVIDER.getType(), //onSurfaceCreate设置 HDTypes.ROAD_AREA.getType(), diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/identify/MogoIdentifyManager.java b/libraries/mogo-map/src/main/java/com/mogo/map/identify/MogoIdentifyManager.java index 16b09546ee..ed095f55a9 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/identify/MogoIdentifyManager.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/identify/MogoIdentifyManager.java @@ -1,7 +1,5 @@ package com.mogo.map.identify; -import android.content.Context; - import com.mogo.map.MogoMap; import com.mogo.map.identity.IMogoIdentifyManager; import java.util.HashMap; @@ -16,8 +14,6 @@ import mogo.yycp.api.proto.SocketDownData; */ public class MogoIdentifyManager implements IMogoIdentifyManager { - private static final String TAG = "MogoIdentifyManager"; - private static volatile MogoIdentifyManager sInstance; private MogoIdentifyManager() {} @@ -63,13 +59,4 @@ public class MogoIdentifyManager implements IMogoIdentifyManager { } } - @Override - public String addPreVehicleModel(int type, int modelRes) { - try { - return MogoMap.Companion.getMapInstance().getMogoMap(MogoMap.DEFAULT).addPreVehicleModel(type, modelRes); - } catch (Exception e) { - e.printStackTrace(); - } - return null; - } } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/overlay/MoGoOverlayManagerImpl.kt b/libraries/mogo-map/src/main/java/com/mogo/map/overlay/MoGoOverlayManagerImpl.kt index 009d8216fa..bbe582bba4 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/overlay/MoGoOverlayManagerImpl.kt +++ b/libraries/mogo-map/src/main/java/com/mogo/map/overlay/MoGoOverlayManagerImpl.kt @@ -51,6 +51,7 @@ internal class MoGoOverlayManagerImpl: IMoGoOverlayManager { it.setToTop() if (options.moveToCenter) { moveToCenter( + mapTag, options.id, options.longitude, options.latitude, @@ -258,9 +259,9 @@ internal class MoGoOverlayManagerImpl: IMoGoOverlayManager { } } - private fun moveToCenter(id: String, eventLon: Double, eventLat: Double, carLon: Double, carLat: Double) { + private fun moveToCenter(mapTag:String, id: String, eventLon: Double, eventLat: Double, carLon: Double, carLat: Double) { try { - CallerMapUIServiceManager.getMapUIController()?.showBounds( + mapInstance.getMogoMap(mapTag).uiController.showBounds( id, MogoLatLng(carLat, carLon), listOf(MogoLatLng(eventLat, eventLon)), diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java b/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java deleted file mode 100644 index 10e0870377..0000000000 --- a/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java +++ /dev/null @@ -1,366 +0,0 @@ -package com.mogo.map.uicontroller; - -import android.graphics.Point; -import android.graphics.Rect; -import android.view.View; - -import com.mogo.eagle.core.data.map.MogoLatLng; -import com.mogo.eagle.core.data.map.MogoLocation; - -import java.util.List; - - -/** - * @author congtaowang - * @since 2019-12-26 - *

- * 描述 - */ -public class AMapUIController implements IMogoMapUIController { - - private static volatile AMapUIController sInstance; - - private IMogoMapUIController mClient; - - private AMapUIController() { - } - - public static AMapUIController getInstance() { - if (sInstance == null) { - synchronized (AMapUIController.class) { - if (sInstance == null) { - sInstance = new AMapUIController(); - } - } - } - return sInstance; - } - - public void initClient(IMogoMapUIController client) { - this.mClient = client; - } - - public synchronized void release() { - sInstance = null; - } - - @Override - public MapControlResult changeZoom(float zoom) { - if (mClient != null) { - return mClient.changeZoom(zoom); - } - return MapControlResult.ERROR; - } - - @Override - public void changeZoom2(float zoom) { - if (mClient != null) { - mClient.changeZoom2(zoom); - } - } - - @Override - public void changeMapVisualAngle(VisualAngleMode angelMode, MogoLatLng mogoLatLng) { - if (mClient != null) { - mClient.changeMapVisualAngle(angelMode, mogoLatLng); - } - } - - @Override - public void setRoamTrajectory(String trajectory) { - if (mClient != null) { - mClient.setRoamTrajectory(trajectory); - } - } - - @Override - public void setRomaMode(int mode) { - if (mClient != null) { - mClient.setRomaMode(mode); - } - } - - @Override - public VisualAngleMode getCurrentMapVisualAngle() { - if (mClient != null) { - return mClient.getCurrentMapVisualAngle(); - } - return null; - } - - @Override - public void moveToCenter(MogoLatLng latLng, boolean animate) { - if (mClient != null) { - mClient.moveToCenter(latLng, animate); - } - } - - @Override - public boolean isDayMode() { - if (mClient != null) { - return mClient.isDayMode(); - } - return false; - } - - @Override - public void showMyLocation(boolean visible) { - if (mClient != null) { - mClient.showMyLocation(visible); - } - } - - @Override - public void showMyLocation(View view) { - if (mClient != null) { - mClient.showMyLocation(view); - } - } - - - @Override - public float getScalePerPixel() { - if (mClient != null) { - return mClient.getScalePerPixel(); - } - return 0; - } - - @Override - public float getZoomLevel() { - if (mClient != null) { - return mClient.getZoomLevel(); - } - return 0; - } - - @Override - public MogoLatLng getCameraNorthEastPosition() { - if (mClient != null) { - return mClient.getCameraNorthEastPosition(); - } - return null; - } - - @Override - public MogoLatLng getCameraSouthWestPosition() { - if (mClient != null) { - return mClient.getCameraSouthWestPosition(); - } - return null; - } - - @Override - public MogoLatLng getWindowCenterLocation() { - if (mClient != null) { - return mClient.getWindowCenterLocation(); - } - return null; - } - - @Override - public void setPointToCenter(double mapCenterX, double mapCenterY) { - if (mClient != null) { - mClient.setPointToCenter(mapCenterX, mapCenterY); - } - } - - @Override - public Point getLocationPointInScreen(MogoLatLng latLng) { - if (mClient != null) { - return mClient.getLocationPointInScreen(latLng); - } - return null; - } - - @Override - public MogoLatLng getLocationMogoLatLngInScreen(Point point) { - if (mClient != null) { - return mClient.getLocationMogoLatLngInScreen(point); - } - return null; - } - - - @Override - public void setRenderFps(int fps) { - if (mClient != null) { - mClient.setRenderFps(fps); - } - } - - @Override - public void showBounds(String tag, MogoLatLng carPosition, List lonLats, Rect bound, boolean lockCarPosition) { - if (mClient != null) { - mClient.showBounds(tag, carPosition, lonLats, bound, lockCarPosition); - } - } - - @Override - public void forceRender() { - if (mClient != null) { - mClient.forceRender(); - } - } - - @Override - public float calculateLineDistance(MogoLatLng p1, MogoLatLng p2) throws Exception { - if (mClient != null) { - return mClient.calculateLineDistance(p1, p2); - } - return 0; - } - - - @Override - public boolean isCarLocked() { - if (mClient != null) { - return mClient.isCarLocked(); - } - return false; - } - - @Override - public void setCarCursorOption(CarCursorOption option) { - if (mClient != null) { - mClient.setCarCursorOption(option); - } - } - - @Override - public void setCarLightsType(int type, int time) { - if (mClient != null) { - mClient.setCarLightsType(type, time); - } - } - - @Override - public MapCameraPosition getMapCameraPosition() { - if (mClient != null) { - return mClient.getMapCameraPosition(); - } - return null; - } - - @Override - public void changeBearing(float bearing) { - if (mClient != null) { - mClient.changeBearing(bearing); - } - } - - @Override - public void changeCurrentIcon(int iconId) { - if (mClient != null) { - mClient.changeCurrentIcon(iconId); - } - } - - @Override - public void rtkEnable(boolean enable) { - if (mClient != null) { - mClient.rtkEnable(enable); - } - } - - @Override - public void stepInVrMode(boolean isDayMode) { - if (mClient != null) { - mClient.stepInVrMode(isDayMode); - } - } - - - @Override - public String getMarkerInfoResName(String speedVal) { - if (mClient != null) { - return mClient.getMarkerInfoResName(speedVal); - } - return null; - } - - @Override - public void setMarkerInfoResName(String speedVal, String val) { - if (mClient != null) { - mClient.setMarkerInfoResName(speedVal, val); - } - } - - @Override - public void setMapDAngle(float angle) { - if (mClient != null) { - mClient.setMapDAngle(angle); - } - } - - @Override - public void setLockMode(boolean isLock) { - if (mClient != null) { - mClient.setLockMode(isLock); - } - } - - @Override - public void setScrollGesturesEnable(boolean isEnable) { - if (mClient != null) { - mClient.setScrollGesturesEnable(isEnable); - } - } - - @Override - public void setAllGesturesEnabled(boolean isEnable) { - if (mClient != null) { - mClient.setAllGesturesEnabled(isEnable); - } - } - - @Override - public void setExtraGPSData(MogoLocation gnssInfo) { - if (mClient != null) { - mClient.setExtraGPSData(gnssInfo); - } - } - - @Override - public void setIsDrawPointCloud(Boolean isDrawPointCloud) { - if (mClient != null) { - mClient.setIsDrawPointCloud(isDrawPointCloud); - } - } - - @Override - public void setPointCloudSize(Float pointCloudSize) { - if (mClient != null) { - mClient.setPointCloudSize(pointCloudSize); - } - } - - @Override - public void setPointCloudColor(String color) { - if (mClient != null) { - mClient.setPointCloudColor(color); - } - } - - @Override - public String getCityCode() { - if (mClient != null) { - return mClient.getCityCode(); - } - return null; - } - - @Override - public void animateTo(double lon, double lat, float rotateAngle, int duration, boolean isGps) { - if (mClient != null) { - mClient.animateTo(lon, lat, rotateAngle, duration, isGps); - } - } - - @Override - public void animateTo(double lon, double lat, float v1, float v2, float v3, float v4, int duration, boolean isGps) { - if (mClient != null) { - mClient.animateTo(lon, lat, v1, v2, v3, v4, duration, isGps); - } - } -}