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

Merge branch 'dev_robotaxi-d-app-module_255_220303_2.5.5' into dev_robotaxi-d-app-module_260_220304_2.6.0

Browse Source
This commit is contained in:
donghongyu
2022-03-09 17:42:37 +08:00
parent a6267114d4 6f6da8d6f3
commit c840d992a7
6 changed files with 71 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java
View File

@@ -1,6 +1,7 @@
package com.mogo.module.service.routeoverlay;
import android.content.Context;
import android.util.Log;
import com.mogo.eagle.core.data.autopilot.ADASTrajectoryInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotGuardianStatusInfo;
@@ -17,7 +18,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener
import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotPlanningListenerManager;
import com.mogo.eagle.core.function.call.map.CallerMapLocationListenerManager;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.eagle.core.utilcode.util.GsonUtils;
import com.mogo.module.common.utils.DrivingDirectionUtils;
import org.jetbrains.annotations.NotNull;
@@ -45,7 +46,7 @@ public class MogoRouteOverlayManager implements
public void init() {
CallerAutopilotPlanningListenerManager.INSTANCE.addListener(TAG, this);
CallerAutoPilotStatusListenerManager.INSTANCE.addListener(TAG, this);
CallerMapLocationListenerManager.INSTANCE.addListener(TAG,this);
CallerMapLocationListenerManager.INSTANCE.addListener(TAG, this);
// intiDrawer();
}
@@ -60,7 +61,7 @@ public class MogoRouteOverlayManager implements
return sInstance;
}
private void intiDrawer(){
private void intiDrawer() {
RouteOverlayDrawer.getInstance(mContext).initdraw();
}
@@ -97,7 +98,7 @@ public class MogoRouteOverlayManager implements
mTrajectoryList = mogoLatLngs;
builder.append("}");
//Log.d(TAG,builder.toString());
Log.d(TAG, builder.toString());
}
@Override
@@ -110,13 +111,13 @@ public class MogoRouteOverlayManager implements
latLngList.add(new MogoLatLng(routeModel.getLat(), routeModel.getLon()));
}
int listSize = latLngList.size();
mEnding = latLngList.get(listSize-1);
mEnding = latLngList.get(listSize - 1);
// RouteOverlayDrawer.getInstance(mContext).addEndingMarker(latLngList.get(listSize - 1).lat,latLngList.get(listSize - 1).lon);
}
@Override
public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autoPilotStatusInfo) {
if (FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData ){
if (FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData) {
return;
}
this.STATUS_AUTOPILOT = autoPilotStatusInfo.getControl_pilotmode();
@@ -128,7 +129,7 @@ public class MogoRouteOverlayManager implements
// }else {
//
// }我
if ( STATUS_AUTOPILOT != 1){
if (STATUS_AUTOPILOT != 1) {
RouteOverlayDrawer.getInstance(mContext).clearEndingMarker();
RouteOverlayDrawer.getInstance(mContext).clearMogoRouteOverlay();
}
@@ -137,7 +138,7 @@ public class MogoRouteOverlayManager implements
@Override
public void onAutopilotArriveAtStation(@Nullable AutopilotStationInfo autopilotWayArrive) {
if(autopilotWayArrive == null){
if (autopilotWayArrive == null) {
return;
}
Logger.d(TAG, "onArriveAt data : " + autopilotWayArrive.toString());
@@ -156,17 +157,44 @@ public class MogoRouteOverlayManager implements
}
@Override
public void onLocationChanged(@Nullable MogoLocation location) {
public void onLocationChanged(@Nullable MogoLocation location) { //todo 拖尾
// mLocation = location;
// if (mTrajectoryList.isEmpty()) {
// return;
// }
// Log.d(TAG, "onLocationChanged : " + mTrajectoryList.size());
// ArrayList list = new ArrayList();
// for (MogoLatLng latLng : mTrajectoryList) {
// if (!isPointOnCarFront(mLocation, latLng)) {
// list.add(latLng);
// }
// }
//
// StringBuilder builder = new StringBuilder();
// for (int i = 0; i < list.size(); i++) {
// MogoLatLng latLng = (MogoLatLng) list.get(i);
// builder.append(latLng.getLon()).append(",");
// builder.append(latLng.getLat()).append(",");
// }
// Log.d(TAG, "onLocationChanged : " + GsonUtils.toJson(builder.toString()));
// Log.d(TAG,"onLocationChanged size = " + list.size() + "---TrajectoryData = " + FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData + "----" + STATUS_AUTOPILOT);
// if (FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData || STATUS_AUTOPILOT == 1) {
// RouteOverlayDrawer.getInstance(mContext).drawTrajectoryList(list);
// }
mLocation = location;
if (mTrajectoryList.isEmpty()){
List<MogoLatLng> temp = mTrajectoryList;
if (temp.isEmpty()){
return;
}
// Log.e(TAG, "onLocationChanged: size = "+ mTrajectoryList.size()+" ----- "+mLocation.getLongitude()+"-"+mLocation.getLatitude());
ArrayList list = new ArrayList();
for (MogoLatLng latLng:mTrajectoryList) {
if(!isPointOnCarFront(mLocation,latLng)){
for (MogoLatLng latLng:temp) {
// if(!isPointOnCarFront(mLocation,latLng)){
list.add(latLng);
}
// }
}
Log.d(TAG,"TrajectoryData = " + FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData + "---status = " + STATUS_AUTOPILOT + "----size = " + list.size());
if (FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData || STATUS_AUTOPILOT == 1){
RouteOverlayDrawer.getInstance(mContext).drawTrajectoryList(list);
}

2
modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java
View File

@@ -115,7 +115,7 @@ public class RouteOverlayDrawer {
long drawstart = System.currentTimeMillis();
mPolylinePointList.clear();
if (routeList != null) {
if (routeList != null && routeList.size() > 0) {
for (MogoLatLng latLng : routeList) {
mPolylinePointList.add(latLng);
}