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

Merge branch 'master' into dev_MogoAP_eagle-220_211207_8.0.17

Browse Source 
# Conflicts:
#	gradle.properties
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java
#	modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/IdentifyDataDrawer.java
This commit is contained in:
donghongyu
2022-01-14 14:49:29 +08:00
parent 974ab38155 261d777ae5
commit 9b59c2a8f1
19 changed files with 359 additions and 554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
View File

@@ -900,7 +900,7 @@ public class MockIntentHandler implements IntentHandler {
}
}
List<TrafficData> trafficData = new ArrayList<>();
ArrayList<TrafficData> trafficData = new ArrayList<>();
for (BufferedReader reader : readers) {
String line = reader.readLine();
TrafficData adasRecognizedResult = GsonUtil.objectFromJson(line, TrafficData.class);
@@ -936,7 +936,7 @@ public class MockIntentHandler implements IntentHandler {
}
}
List<TrafficData> trafficData = new ArrayList<>();
ArrayList<TrafficData> trafficData = new ArrayList<>();
for (BufferedReader reader : readers2) {
String line = reader.readLine();
TrafficData adasRecognizedResult = GsonUtil.objectFromJson(line, TrafficData.class);

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

@@ -113,8 +113,10 @@ public class MogoRouteOverlayManager implements IMoGoAutopilotPlanningListener,
public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autoPilotStatusInfo) {
this.STATUS_AUTOPILOT = autoPilotStatusInfo.getControl_pilotmode();
//Log.d("lianglihui","onAutopilotStatusResponse:"+STATUS_AUTOPILOT);
if (STATUS_AUTOPILOT == 1 && mEnding != null){
RouteOverlayDrawer.getInstance(mContext).addEndingMarker(mEnding.lat,mEnding.lon);
if (STATUS_AUTOPILOT == 1 ){
if (mEnding != null){
RouteOverlayDrawer.getInstance(mContext).addEndingMarker(mEnding.lat,mEnding.lon);
}
}else {
RouteOverlayDrawer.getInstance(mContext).clearEndingMarker();
RouteOverlayDrawer.getInstance(mContext).clearMogoRouteOverlay();

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

@@ -89,9 +89,9 @@ public class RouteOverlayDrawer {
markderOptions.latitude(lat).longitude(lon);
//Log.d("lianglihui","addEndingMarker-"+lat+":"+lon);
endMarker = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(mContext).addMarker(markerType, markderOptions);
if (DebugConfig.isDebug()){
ToastUtils.showLong("绘制终点marker,"+lat+":"+lon);
}
// if (DebugConfig.isDebug()){
// ToastUtils.showLong("绘制终点marker,"+lat+":"+lon);
// }
}
public void clearMogoRouteOverlay(){