diff --git a/.idea/misc.xml b/.idea/misc.xml
index b81ffe8627..eb7c7592a4 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -16,12 +16,14 @@
-
+
+
+
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
index 189946c138..025c5b5ca2 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -24,6 +24,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarStatusListenerManager
import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
+import com.mogo.eagle.core.function.call.map.CallerHDMapManager
import com.mogo.eagle.core.function.call.map.CallerMapLocationListenerManager
import com.mogo.eagle.core.function.call.obu.CallerOBUManager
import com.mogo.eagle.core.function.call.obu.CallerObuListenerManager
@@ -207,6 +208,19 @@ class DebugSettingView @JvmOverloads constructor(
}
}
+ // 切换地图中心点视角
+ tbChangeCarCenter100.setOnClickListener {
+ CallerHDMapManager.changeMaoViewAngle(1)
+ }
+ tbChangeCarQuarter100.setOnClickListener {
+ CallerHDMapManager.changeMaoViewAngle(2)
+ }
+ tbChangeCarTwoFifths100.setOnClickListener {
+ CallerHDMapManager.changeMaoViewAngle(3)
+ }
+ tbChangeCarTwoFifths80.setOnClickListener {
+ CallerHDMapManager.changeMaoViewAngle(4)
+ }
}
/**
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
index 13c50f49f9..8877aab52d 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
@@ -81,6 +81,42 @@
android:textOn="显示「车辆检测」"
android:textSize="@dimen/dp_34" />
+
+
+
+
+
+
+
+
diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/hd/IMoGoMapFragmentProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/hd/IMoGoMapFragmentProvider.kt
new file mode 100644
index 0000000000..1751247f41
--- /dev/null
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/hd/IMoGoMapFragmentProvider.kt
@@ -0,0 +1,19 @@
+package com.mogo.eagle.core.function.api.map.hd
+
+import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider
+
+/**
+ * @author donghongyu
+ * @date 12/10/20 1:36 PM
+ * 地图层控制
+ */
+interface IMoGoMapFragmentProvider : IMoGoFunctionServerProvider {
+ /**
+ * 修改地图中心点
+ * MapAutoApi.CAR_CENTER_100 1/4
+ * MapAutoApi.CAR_CENTER_100 2/5
+ * MapAutoApi.CAR_CENTER_100 80米
+ * MapAutoApi.CAR_CENTER_100 2/5
+ */
+ fun changeMaoViewAngle(type: Int)
+}
\ No newline at end of file
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerHDMapManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerHDMapManager.kt
new file mode 100644
index 0000000000..83ec34ee3b
--- /dev/null
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerHDMapManager.kt
@@ -0,0 +1,28 @@
+package com.mogo.eagle.core.function.call.map
+
+import com.alibaba.android.arouter.launcher.ARouter
+import com.mogo.eagle.core.data.constants.MoGoFragmentPaths
+import com.mogo.eagle.core.function.api.map.hd.IMoGoMapFragmentProvider
+import com.mogo.eagle.core.function.call.base.CallerBase
+
+/**
+ * @author xiaoyuzhou
+ * @date 2021/9/17 6:15 下午
+ * 高精度地图控制
+ */
+object CallerHDMapManager : CallerBase() {
+ private val mapProviderApi: IMoGoMapFragmentProvider
+ get() = ARouter.getInstance().build(MoGoFragmentPaths.PATH_FRAGMENT_MAP)
+ .navigation() as IMoGoMapFragmentProvider;
+
+ /**
+ * 修改地图中心点
+ * MapAutoApi.CAR_CENTER_100 1/4
+ * MapAutoApi.CAR_CENTER_100 2/5
+ * MapAutoApi.CAR_CENTER_100 80米
+ * MapAutoApi.CAR_CENTER_100 2/5
+ */
+ fun changeMaoViewAngle(type: Int) {
+ mapProviderApi.changeMaoViewAngle(type)
+ }
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index d310898082..b138bea837 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -79,7 +79,7 @@ MOGO_TRAFFICLIVE_VERSION=1.1.54-live
MOGO_LOCATION_VERSION=1.1.54-live
######## MogoAiCloudSDK Version ########
# 自研地图
-MAP_SDK_VERSION=V2.0.0.6
+MAP_SDK_VERSION=V2.0.0.6-test
# websocket
WEBSOCKET_VERSION=1.1.7
## 产品库必备配置，产品库自动对versionCode和versionName版本进行升级
diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
index 7d3b31d5a2..0e7aec0f8f 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
@@ -720,6 +720,13 @@ public class AMapViewWrapper implements IMogoMapView,
}
}
+ @Override
+ public void changeMapViewAngle(int type) {
+ if (checkAMapView()) {
+ mMapView.getMapAutoViewHelper().testMapViewAngle(type);
+ }
+ }
+
@Override
public long getTileId(double lon, double lat) {
return getMap().getUIController().getTileId(lon, lat);
diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java
index 737960d7ee..ab0c6cdd42 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java
@@ -294,6 +294,13 @@ public class AMapUIController implements IMogoMapUIController {
}
}
+ @Override
+ public void changeMapViewAngle(int type) {
+ if (mClient != null) {
+ mClient.changeMapViewAngle(type);
+ }
+ }
+
@Override
public long getTileId(double lon, double lat) {
return MapAutoApi.INSTANCE.getTileID(lon, lat, 13); // 13为默认获取瓦片层级级别
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 62ea0259ca..bd1a293647 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
@@ -236,6 +236,15 @@ public interface IMogoMapUIController {
*/
void changeBearing(float bearing);
+ /**
+ * 修改地图中心
+ * MapAutoApi.CAR_CENTER_100 1/4
+ * MapAutoApi.CAR_CENTER_100 2/5
+ * MapAutoApi.CAR_CENTER_100 80米
+ * MapAutoApi.CAR_CENTER_100 2/5
+ */
+ void changeMapViewAngle(int type);
+
/**
* 获取瓦片id
*
@@ -248,12 +257,13 @@ public interface IMogoMapUIController {
/**
* 获取限速
+ *
* @param lon
* @param lat
* @param angle
* @return
*/
- int getSpeedLimmit(double lon,double lat,float angle);
+ int getSpeedLimmit(double lon, double lat, float angle);
/**
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
index 03e656f657..169ebf6378 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java
@@ -337,6 +337,14 @@ public class MogoMapUIController implements IMogoMapUIController {
}
}
+ @Override
+ public void changeMapViewAngle(int type) {
+ initDelegate();
+ if (mDelegate != null) {
+ mDelegate.changeMapViewAngle(type);
+ }
+ }
+
@Override
public long getTileId(double lon, double lat) {
return mDelegate.getTileId(lon, lat);
diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java
index ca96677317..610ccd3d37 100644
--- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java
+++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java
@@ -9,6 +9,7 @@ import androidx.annotation.Nullable;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.commons.mvp.MvpFragment;
import com.mogo.eagle.core.data.constants.MoGoFragmentPaths;
+import com.mogo.eagle.core.function.api.map.hd.IMoGoMapFragmentProvider;
import com.mogo.map.IMogoMap;
import com.mogo.map.IMogoUiSettings;
import com.mogo.map.MogoMapView;
@@ -26,7 +27,8 @@ import com.mogo.utils.logger.Logger;
* 地图图层，地图操作都在这个图层完成
*/
@Route(path = MoGoFragmentPaths.PATH_FRAGMENT_MAP)
-public class MapFragment extends MvpFragment< MapView, MapPresenter > implements MapView, IMogoMapFrameController {
+public class MapFragment extends MvpFragment< MapView, MapPresenter >
+ implements MapView, IMogoMapFrameController, IMoGoMapFragmentProvider {
private static final String TAG = "MapFragment";
@@ -203,4 +205,15 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter > implements
destroy();
super.onDestroyView();
}
+
+ @NonNull
+ @Override
+ public String getFunctionName() {
+ return TAG;
+ }
+
+ @Override
+ public void changeMaoViewAngle(int type) {
+ mMogoMapView.getMap().getUIController().changeMapViewAngle(type);
+ }
}