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

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

Browse Source
This commit is contained in:
tongchenfei
2020-11-03 19:30:33 +08:00
parent 90797ab8ea 55bac7ed22
commit 01e6e9cc73
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/AimlessModeListenerAdapter.java
View File

@@ -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 );

11
libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java
View File

@@ -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() ) {