yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/qa' into qa

Browse Source
This commit is contained in:
tongchenfei
2020-07-02 10:21:47 +08:00
parent 34e5632182 dde7367801
commit 09f64dbab3
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
View File

@@ -158,7 +158,7 @@ public class AMapNaviViewWrapper implements IMogoMapView,
// 通过路线是否自动置灰，仅支持驾车导航
options.setAfterRouteAutoGray( true );
options.setZoom( ( ( int ) mDefaultZoomLevel ) );
options.setPointToCenter( 0.5D, 0.5D );
options.setPointToCenter( 0.7D, 0.5D );
// 2D模式
options.setTilt( 0 );
mMapView.setViewOptions( options );

4
main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
View File

@@ -29,9 +29,7 @@ public class MainLauncherActivity extends MainActivity {
@Override
protected void addModule() {
super.addModule();
if ( CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X ) {
MogoModulePaths.addModule( new MogoModule( BackToLauncherConst.MODULE_PATH, BackToLauncherConst.MODULE_NAME ) );
}
MogoModulePaths.addModule( new MogoModule( BackToLauncherConst.MODULE_PATH, BackToLauncherConst.MODULE_NAME ) );
}
@Override

17
modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
View File

@@ -465,7 +465,7 @@ public class MogoServices implements IMogoMapListener,
}
break;
case MotionEvent.ACTION_UP:
restartAutoRefreshAtTime( ServiceConst.DEFAULT_AUTO_REFRESH_WHEN_INTERRUPT );
restartAutoRefreshAtTime( ServiceConst.DEFAULT_AUTO_REFRESH_WHEN_INTERRUPT, false );
mThreadHandler.removeMessages( ServiceConst.MSG_LOCK_CAR );
mThreadHandler.sendEmptyMessageDelayed( ServiceConst.MSG_LOCK_CAR, ServiceConst.DEFAULT_AUTO_REFRESH_WHEN_INTERRUPT );
break;
@@ -473,12 +473,19 @@ public class MogoServices implements IMogoMapListener,
}
private void stopAutoRefreshStrategy() {
stopAutoRefreshStrategy(true);
}
private void stopAutoRefreshStrategy(boolean stopOnlineCarRefresh) {
if ( DebugConfig.isDebug() ) {
Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
}
Logger.d( TAG, "stop auto refresh strategy" );
mHandler.removeMessages( ServiceConst.MSG_TYPE_REFRESH_DECREASE );
MapMarkerManager.getInstance().stopAutoRefresh();
if ( stopOnlineCarRefresh ) {
Logger.d( TAG, "stop online car auto refresh" );
MapMarkerManager.getInstance().stopAutoRefresh();
}
}
@Override
@@ -740,11 +747,15 @@ public class MogoServices implements IMogoMapListener,
}
public void restartAutoRefreshAtTime( long time ) {
restartAutoRefreshAtTime( time, true );
}
private void restartAutoRefreshAtTime( long time, boolean stopOnlineCarRefresh ) {
if ( time < 0 ) {
Logger.w( TAG, "ignore refresh request case time < 0" );
return;
}
stopAutoRefreshStrategy();
stopAutoRefreshStrategy(stopOnlineCarRefresh);
mRefreshRemainingTime = time;
long delay = ServiceConst.DECREASE_INTERVAL;
if ( mRefreshRemainingTime < ServiceConst.DECREASE_INTERVAL ) {

1
modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
View File

@@ -829,7 +829,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
}
}
if ( points.size() >= 1 ) {
points.add( new MogoLatLng( markerLocation.getLat(), markerLocation.getLon() ) );
iMogoMarker.startSmooth( points, SMOOTH_DURATION );
} else {
Logger.d( TAG, "静止小车，但是有相同的连续坐标" );