diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 4ff10f68a5..83405b8de1 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -91,7 +91,6 @@ 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 563d7c50b9..4895e0c581 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 @@ -784,7 +784,7 @@ public class AMapViewWrapper implements IMogoMapView, mSpeedView = new TextView( mMapView.getContext() ); mSpeedView.setTextColor( Color.WHITE ); mSpeedView.setTypeface( Typeface.defaultFromStyle( Typeface.BOLD ) ); - mSpeedView.setShadowLayer( 10f, 5F, 5F, Color.BLACK ); +// mSpeedView.setShadowLayer( 10f, 5F, 5F, Color.BLACK ); mSpeedView.setLayoutParams( new ViewGroup.LayoutParams( ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT ) ); } mSpeedView.setText( String.valueOf( ( ( int ) ( speed * 3.6 ) ) ) ); diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java index 4adf0eb46c..ff67582d01 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java @@ -119,7 +119,7 @@ class BaseDrawer { mSpeedView = new TextView( context ); mSpeedView.setTextColor( Color.WHITE ); mSpeedView.setTypeface( Typeface.defaultFromStyle( Typeface.BOLD ) ); - mSpeedView.setShadowLayer( 10f, 5F, 5F, Color.BLACK ); +// mSpeedView.setShadowLayer( 10f, 5F, 5F, Color.BLACK ); mSpeedView.setLayoutParams( new ViewGroup.LayoutParams( ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT ) ); } mSpeedView.setText( String.valueOf( ( ( int ) ( speed * 3.6 ) ) ) ); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/spi/SPIRealTimeUpload.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/spi/SPIRealTimeUpload.java index c4c3a31a2e..669ed3c79b 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/spi/SPIRealTimeUpload.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/spi/SPIRealTimeUpload.java @@ -1,6 +1,7 @@ package com.mogo.module.service.spi; import com.elegant.spi.annotations.Service; +import com.mogo.module.service.MarkerServiceHandler; import com.mogo.module.service.uploadintime.SnapshotLocationController; import com.mogo.realtime.api.IRealTimeProvider; import com.mogo.realtime.entity.ADASRecognizedResult; @@ -13,9 +14,7 @@ public class SPIRealTimeUpload implements IRealTimeProvider { @Override public List getLastADASRecognizedResult() { - //todo 待200ms 数据联调结束后 代码合并 更换类 ---> ADASRecognizedResult -// return MarkerServiceHandler.getADASController().getLastADASRecognizedResult(); - return null; + return MarkerServiceHandler.getADASController().getLastADASRecognizedResult(); } @Override diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/uploadintime/SnapshotLocationController.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/uploadintime/SnapshotLocationController.java index 6963a99047..e7670fd577 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/uploadintime/SnapshotLocationController.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/uploadintime/SnapshotLocationController.java @@ -44,6 +44,8 @@ class SnapshotLocationController { return sInstance; } + private CloudLocationInfo mLastLocationInfo = null; + private List< CloudLocationInfo > mLocationList = new ArrayList<>(); /** @@ -55,6 +57,7 @@ class SnapshotLocationController { if ( cli == null ) { return; } + mLastLocationInfo = cli; mLocationList.add( cli ); } @@ -94,6 +97,7 @@ class SnapshotLocationController { cloudLocationInfo.setSatelliteTime( satelliteTime ); cloudLocationInfo.setSystemTime( System.currentTimeMillis() ); cloudLocationInfo.convertCoor2GCJ02(); + mLastLocationInfo = cloudLocationInfo; mMachineCacheList.add( cloudLocationInfo ); } @@ -118,6 +122,12 @@ class SnapshotLocationController { mLocationList.clear(); } } + if ( list == null ) { + if ( mLastLocationInfo != null ) { + list = new ArrayList(); + list.add( mLastLocationInfo ); + } + } return list; } }