Merge remote-tracking branch 'origin/feature/v1.0.2' into feature/v1.0.2

This commit is contained in:
董宏宇
2020-03-09 14:23:33 +08:00
44 changed files with 1427 additions and 470 deletions

View File

@@ -21,7 +21,9 @@ import com.mogo.map.location.MogoLocation;
import com.mogo.map.marker.IMogoMarkerClickListener;
import com.mogo.map.marker.IMogoMarkerManager;
import com.mogo.map.model.MogoPoi;
import com.mogo.map.navi.IMogoAimlessModeListener;
import com.mogo.map.navi.IMogoNaviListener;
import com.mogo.map.navi.MogoCongestionInfo;
import com.mogo.map.navi.MogoNaviInfo;
import com.mogo.map.navi.MogoTraffic;
import com.mogo.map.uicontroller.EnumMapUI;
@@ -60,7 +62,8 @@ public class MogoServices implements IMogoMapListener,
IMogoLocationListener,
IMogoNaviListener,
IMogoStatusChangedListener,
IMogoIntentListener {
IMogoIntentListener,
IMogoAimlessModeListener {
private MogoServices() {
// private constructor
@@ -601,8 +604,18 @@ public class MogoServices implements IMogoMapListener,
@Override
public void onUpdateTraffic( MogoTraffic traffic ) {
}
@Override
public void onUpdateTraffic2( MogoTraffic traffic ) {
if ( traffic != null ) {
if ( traffic.getSpeedLimit() <= 0 ) {
return;
}
Logger.i( TAG, "speed = %d, desc = %s", traffic.getSpeedLimit(), traffic.getDesc() );
// 发送当前限速到 adas
Intent intent = new Intent( "com.mogo.launcher.adas" );
@@ -611,8 +624,9 @@ public class MogoServices implements IMogoMapListener,
}
}
public IMogoMarkerClickListener getMarkerClickListener() {
return null;
@Override
public void onUpdateCongestion( MogoCongestionInfo info ) {
}
@Override

View File

@@ -8,7 +8,6 @@ import android.text.TextUtils;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.service.MogoServicePaths;
import com.mogo.service.intent.IMogoIntentManager;
import com.mogo.service.voice.IMogoVoiceManager;
import com.mogo.utils.logger.Logger;
/**