Merge branch 'dev_MogoAP_eagle-930_210926_8.0.12' into dev/dev_eagle_architecture_upgrade

# Conflicts:
#	config.gradle
#	core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt
#	core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt
This commit is contained in:
董宏宇
2021-10-15 10:47:43 +08:00
6 changed files with 42 additions and 23 deletions

View File

@@ -21,6 +21,10 @@ public class MogoRouteOverlayManager implements IMogoCarLocationChangedListener2
}
public void init() {
MogoApisHandler.getInstance()
.getApis()
.getRegisterCenterApi()
.registerCarLocationChangedListener( "MogoRouteOverlayManager",this);
MogoApisHandler.getInstance().getApis().getAdasControllerApi().addAdasAutopilotRouteCallBack(new IMogoAdasRouteCallBack(){
@Override

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.map.MogoLatLng;
import com.mogo.map.location.MogoLocation;
@@ -92,8 +93,9 @@ public class RouteOverlayDrawer {
// Log.e("IMogoPolyline",polyline.getLat()+":"+polyline.lon);
//需要剔除已经行驶过的经纬度,这里需要比对推荐路线集合中的点是否在当前车辆行驶方向前面如果不在则抛弃
if (LocationUtils.isPointOnCarFront(carLocal, polyline)) {
mPolylinePointList.add(polyline);
}
Log.e("lianglihui",polyline.getLat()+":"+polyline.getLon());
mPolylinePointList.add(polyline);
}
}
@@ -102,6 +104,7 @@ public class RouteOverlayDrawer {
mPolylineColors.addAll(ColorUtils.getGradientAlpha("#002965ED", "#FF2965ED", "#002965ED", mPolylinePointList.size()));
// 替换路径集合
mPolylineOptions.points(mPolylinePointList);
mPolylineOptions.setGps(true);
// 线条粗细,渐变,渐变色值
mPolylineOptions.width(25).useGradient(true).colorValues(mPolylineColors);
// 绘制线

View File

@@ -92,6 +92,8 @@ public class EnvStatusManager {
stringBuilder.append(sStatusName[i]).append(":");
if (i == 3) {
stringBuilder.append(DebugConfig.getAutoPilotStatus()).append("\n");
} else if (i == 4) {
stringBuilder.append("true".equals(DebugConfig.getStatus(i, false)) ? "正常" : "异常").append("\n");
} else if (i == 5 || i == 6) {
stringBuilder.append(DebugConfig.getStatusData(i)).append("\n");
} else if (i == 7) {