From f0a7bd391c3828e84522b2be8041c325de181632 Mon Sep 17 00:00:00 2001 From: lianglihui Date: Mon, 8 Nov 2021 14:24:34 +0800 Subject: [PATCH] =?UTF-8?q?eagle=5F1030=20=E8=BF=88=E9=80=9F=E8=A1=A8?= =?UTF-8?q?=E9=99=90=E9=80=9F=E4=BF=A1=E6=81=AF=E4=BB=8E=E9=AB=98=E7=B2=BE?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eagle/core/function/hmi/ui/widget/SpeedPanelView.kt | 8 ++++++-- gradle.properties | 2 +- .../java/com/mogo/map/impl/custom/AMapViewWrapper.java | 5 +++++ .../map/impl/custom/uicontroller/AMapUIController.java | 5 +++++ .../com/mogo/map/uicontroller/IMogoMapUIController.java | 9 +++++++++ .../src/main/java/com/mogo/map/MogoMapUIController.java | 5 +++++ 6 files changed, 31 insertions(+), 3 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt index e3d944c691..599478b070 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt @@ -24,6 +24,7 @@ import com.mogo.service.IMogoServiceApis import com.mogo.service.statusmanager.IMogoStatusChangedListener import com.mogo.service.statusmanager.StatusDescriptor import com.mogo.utils.UiThreadHandler +import com.mogo.utils.logger.Logger import java.util.* /** @@ -49,6 +50,7 @@ class SpeedPanelView @JvmOverloads constructor( var mLatLng: Location? = null + var mSpeedLimmit = 60; init { initEvent(context) @@ -114,11 +116,13 @@ class SpeedPanelView @JvmOverloads constructor( private val timerTask = object : TimerTask() { override fun run() { if (mLatLng != null) { + mSpeedLimmit = mMogoServiceApis.mapServiceApi.mapUIController.getSpeedLimmit(mLatLng!!.longitude, mLatLng!!.latitude, mLatLng!!.bearing) + Logger.e("lianglihui","mSpeedLimmit="+mSpeedLimmit) UiThreadHandler.post { val speed = (mLatLng!!.speed * 3.6f).toInt() - mSpeedChartView.setArcColor(Color.parseColor(if (speed > 60) "#DB3137" else "#3E77F6")) + mSpeedChartView.setArcColor(Color.parseColor(if (speed > mSpeedLimmit) "#DB3137" else "#3E77F6")) mSpeedChartView.setValues(speed) - setBackgroundResource(if (speed > 60) R.drawable.yi_biao_pan_bg_speeding else R.drawable.yi_biao_pan_bg_nor) + setBackgroundResource(if (speed > mSpeedLimmit) R.drawable.yi_biao_pan_bg_speeding else R.drawable.yi_biao_pan_bg_nor) } } } diff --git a/gradle.properties b/gradle.properties index 472a0cdd2d..d310898082 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.1 +MAP_SDK_VERSION=V2.0.0.6 # 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 0c437d2bc9..09dc44b3cd 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 @@ -726,6 +726,11 @@ public class AMapViewWrapper implements IMogoMapView, return getMap().getUIController().getTileId(lon, lat); } + @Override + public int getSpeedLimmit(double lon, double lat, float angle) { + return MapDataApi.INSTANCE.getLimitSpeed(lon,lat,angle); + } + private boolean isShowWarn; @Override 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 745990d9e6..737960d7ee 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 @@ -299,6 +299,11 @@ public class AMapUIController implements IMogoMapUIController { return MapAutoApi.INSTANCE.getTileID(lon, lat, 13); // 13为默认获取瓦片层级级别 } + @Override + public int getSpeedLimmit(double lon, double lat, float angle) { + return mClient.getSpeedLimmit(lon,lat,angle); + } + @Override public void emphasizeMyLocation() { 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 0cfcf107b2..56ace19b9a 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 @@ -246,6 +246,15 @@ public interface IMogoMapUIController { long getTileId(double lon, double lat); + /** + * 获取限速 + * @param lon + * @param lat + * @param angle + * @return + */ + int getSpeedLimmit(double lon,double lat,float angle); + default void testGpsData() { 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 7e20185931..03e656f657 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 @@ -342,6 +342,11 @@ public class MogoMapUIController implements IMogoMapUIController { return mDelegate.getTileId(lon, lat); } + @Override + public int getSpeedLimmit(double lon, double lat, float angle) { + return mDelegate.getSpeedLimmit(lon,lat,angle); + } + @Override public void rtkEnable(boolean enable) { initDelegate();