Merge branch 'qa_byd'

This commit is contained in:
wangcongtao
2020-08-14 10:07:11 +08:00
6 changed files with 72 additions and 24 deletions

View File

@@ -522,6 +522,9 @@ public class AMapNaviViewWrapper implements IMogoMapView,
}
if ( checkAMapView() ) {
MyLocationStyle style = mMapView.getMap().getMyLocationStyle();
if ( style == null ) {
style = new MyLocationStyle();
}
style.showMyLocation( visible );
if ( visible ) {
// 强制刷新一遍车标
@@ -541,6 +544,9 @@ public class AMapNaviViewWrapper implements IMogoMapView,
}
if ( checkAMapView() ) {
MyLocationStyle style = mMapView.getMap().getMyLocationStyle();
if ( style == null ) {
style = new MyLocationStyle();
}
style.showMyLocation( true );
style.myLocationIcon( BitmapDescriptorFactory.fromView( view ) );
mMapView.getMap().setMyLocationStyle( style );

View File

@@ -6,6 +6,7 @@ import android.content.pm.PackageManager;
import android.graphics.Rect;
import android.location.Location;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.map.impl.amap.navi.NaviClient;
import com.mogo.map.impl.automap.navi.AutoNaviClient;
import com.mogo.map.navi.IMogoCarLocationChangedListener2;
@@ -30,7 +31,9 @@ public class MogoNavi implements IMogoNavi {
private static volatile MogoNavi sInstance;
private MogoNavi( Context context ) {
if ( AppUtils.isAppInstalled( context, "com.autonavi.amapauto" ) ) {
if ( DebugConfig.isUseCustomNavi() ) {
mDelegate = NaviClient.getInstance( context );
} else if ( AppUtils.isAppInstalled( context, "com.autonavi.amapauto" ) ) {
mDelegate = AutoNaviClient.getInstance( context );
} else {
mDelegate = NaviClient.getInstance( context );