From c041728479c44c295bdb3e690f67657c94fbd1b3 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Mon, 13 Jun 2022 18:58:50 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=8CChange=E3=80=8D=20=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=201=E3=80=81setIsDrawPoint?= =?UTF-8?q?Cloud--=E6=89=93=E5=BC=80=E7=82=B9=E4=BA=91=E7=BB=98=E5=88=B6?= =?UTF-8?q?=E3=80=81=202=E3=80=81setPointCloudSize--=E8=AE=BE=E5=88=B6?= =?UTF-8?q?=E7=82=B9=E4=BA=91=E5=A4=A7=E5=B0=8F=E3=80=81=203=E3=80=81setPo?= =?UTF-8?q?intCloudColor--=E8=AE=BE=E7=BD=AE=E7=82=B9=E4=BA=91=E9=A2=9C?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- .../hmi/ui/setting/DebugSettingView.kt | 3 +- .../eagle/core/function/map/MapFragment.java | 18 ++++++++++++ .../api/map/hd/IMoGoMapFragmentProvider.kt | 24 +++++++++++++++ .../function/call/map/CallerHDMapManager.kt | 29 +++++++++++++++++++ gradle.properties | 2 +- 5 files changed, 73 insertions(+), 3 deletions(-) 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 a9a44777d0..38ea3d75ff 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 @@ -69,7 +69,6 @@ import mogo.telematics.pad.MessagePad import mogo_msg.MogoReportMsg import java.text.SimpleDateFormat import java.util.* -import kotlin.collections.ArrayList import kotlin.math.abs /** @@ -612,7 +611,7 @@ class DebugSettingView @JvmOverloads constructor( tbDrawPointCloudData.isChecked = FunctionBuildConfig.isDrawPointCloudData //是否渲染点云数据 tbDrawPointCloudData.setOnCheckedChangeListener { _, isChecked -> - FunctionBuildConfig.isDrawPointCloudData = isChecked + CallerHDMapManager.setIsDrawPointCloud(isChecked) } // 模拟自动驾驶中 diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java index a4dce21da3..b93cf3e793 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java @@ -21,6 +21,7 @@ import com.mogo.map.IMogoMap; import com.mogo.map.IMogoUiSettings; import com.mogo.map.MogoMapView; import com.mogo.map.uicontroller.IMogoMapUIController; +import com.zhidaoauto.map.sdk.open.business.PointCloudHelper; /** * @author donghongyu @@ -275,4 +276,21 @@ public class MapFragment extends MvpFragment } } + @Override + public void setPointCloudSize(float pointCloudSize) { + //设置点云大小 + PointCloudHelper.INSTANCE.setPointCloudSize(pointCloudSize); + } + + @Override + public void setPointCloudColor(@NonNull String color) { + // 设置点云颜色 + PointCloudHelper.INSTANCE.setPointCloudColor(color); + } + + @Override + public void setIsDrawPointCloud(boolean isDrawPointCloud) { + // 是否绘制点云 + PointCloudHelper.INSTANCE.setIsDrawPointCloud(isDrawPointCloud); + } } 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 index 02290028c1..a3292d1393 100644 --- 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 @@ -42,4 +42,28 @@ interface IMoGoMapFragmentProvider : IMoGoFunctionServerProvider { * @param isDayMode true-白天模式，false-夜间模式 */ fun stepInVrMode(isDayMode: Boolean) + + /** + * 打开点云绘制 + * + * @param isDrawPointCloud 是否绘制点云 + */ + fun setIsDrawPointCloud(isDrawPointCloud: Boolean) + + /** + * 设制点云大小 + * + * @param pointCloudSize 点云的点大小 + */ + fun setPointCloudSize(pointCloudSize: Float) + + + /** + * 设置点云颜色 + * + * @param color // color:"#RRGGBB* + */ + fun setPointCloudColor(color: String) + + } \ 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 index f407c14c38..6627707e3c 100644 --- 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 @@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.call.map import androidx.annotation.RawRes import com.alibaba.android.arouter.launcher.ARouter +import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.constants.MoGoFragmentPaths import com.mogo.eagle.core.data.map.CenterLine import com.mogo.eagle.core.function.api.map.hd.IMoGoMapFragmentProvider @@ -58,4 +59,32 @@ object CallerHDMapManager : CallerBase() { fun stepInVrMode(isDayMode: Boolean) { return mapProviderApi.stepInVrMode(isDayMode) } + + /** + * + * 打开点云绘制 + * + * @param isDrawPointCloud 是否绘制点云 + */ + fun setIsDrawPointCloud(isDrawPointCloud: Boolean) { + FunctionBuildConfig.isDrawPointCloudData = isDrawPointCloud + return mapProviderApi.setIsDrawPointCloud(isDrawPointCloud) + } + + /** + * 设制点云大小 + * @param pointCloudSize 点云的点大小 + */ + fun setPointCloudSize(pointCloudSize: Float) { + return mapProviderApi.setPointCloudSize(pointCloudSize) + } + + /** + * 设置点云颜色 + * + * @param color // color:"#RRGGBB* + */ + fun setPointCloudColor(color: String) { + return mapProviderApi.setPointCloudColor(color) + } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 6e9a3f03c0..cac775cf72 100644 --- a/gradle.properties +++ b/gradle.properties @@ -82,7 +82,7 @@ MOGO_LOCATION_VERSION=1.3.59 MOGO_TELEMATIC_VERSION=1.3.59 ######## MogoAiCloudSDK Version ######## # 自研地图 -MAP_SDK_VERSION=2.2.0.7 +MAP_SDK_VERSION=2.2.0.9 MAP_SDK_OPERATION_VERSION=1.0.13 # websocket WEBSOCKET_VERSION=1.1.7