diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/AimlessModeListenerAdapter.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/AimlessModeListenerAdapter.java index cdb8583fd3..675db2d3dd 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/AimlessModeListenerAdapter.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/AimlessModeListenerAdapter.java @@ -8,6 +8,8 @@ import com.mogo.map.impl.amap.utils.ObjectUtils; import com.mogo.map.navi.MogoCongestionInfo; import com.mogo.map.navi.MogoNaviListenerHandler; import com.mogo.map.navi.MogoTraffic; +import com.mogo.utils.logger.Logger; +import com.mogo.utils.network.utils.GsonUtil; /** * @author congtaowang @@ -16,6 +18,7 @@ import com.mogo.map.navi.MogoTraffic; * 巡航监听 */ public class AimlessModeListenerAdapter implements AimlessModeListener { + public String TAG="AimlessModeListenerAdapter"; @Override public void onUpdateTrafficFacility( AMapNaviTrafficFacilityInfo[] aMapNaviTrafficFacilityInfos ) { @@ -40,6 +43,8 @@ public class AimlessModeListenerAdapter implements AimlessModeListener { @Override public void updateAimlessModeCongestionInfo( AimLessModeCongestionInfo aimLessModeCongestionInfo ) { + Logger.d( TAG, "updateAimlessModeCongestionInfo " + GsonUtil.jsonFromObject(aimLessModeCongestionInfo)); + MogoCongestionInfo congestionInfo = ObjectUtils.fromAMap( aimLessModeCongestionInfo ); if ( congestionInfo != null ) { MogoNaviListenerHandler.getInstance().onUpdateCongestion( congestionInfo ); diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java index 4e7382f89f..5016380246 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java @@ -93,7 +93,8 @@ public class NaviClient implements IMogoNavi { } mAMapNavi = AMapNavi.getInstance( mContext ); mAMapNavi.setEmulatorNaviSpeed( 120 ); - mAMapNavi.setUseInnerVoice( DebugConfig.isUseCustomNavi(), false ); + mAMapNavi.setUseInnerVoice( true, true ); + mAMapNavi.stopSpeak(); mAMapNaviListener = new NaviListenerAdapter( mContext, this ); mAimlessModeListener = new AimlessModeListenerAdapter() { }; @@ -275,7 +276,7 @@ public class NaviClient implements IMogoNavi { @Override public boolean setBroadcastMode( int mode ) { - if ( checkAMapNavi() ) { + if ( !checkAMapNavi() ) { return false; } return mAMapNavi.setBroadcastMode( mode ); @@ -335,7 +336,7 @@ public class NaviClient implements IMogoNavi { @Override public void startAimlessMode() { - if ( checkAMapNavi() ) { + if ( !checkAMapNavi() ) { return; } if ( mAimlessModeStatus && !isNaviing() ) { @@ -350,7 +351,7 @@ public class NaviClient implements IMogoNavi { @Override public void stopAimlessMode() { - if ( checkAMapNavi() ) { + if ( !checkAMapNavi() ) { return; } mAMapNavi.stopAimlessMode(); @@ -427,7 +428,7 @@ public class NaviClient implements IMogoNavi { @Override public void setExtraGPSData( double lon, double lat, float speed, float accuracy, float bearing, long timestamp ) { - if ( checkAMapNavi() ) { + if ( !checkAMapNavi() ) { return; } if ( !mAMapNavi.getIsUseExtraGPSData() ) {