[code_opt_3.3.0] code opt

This commit is contained in:
zhongchao
2023-06-09 11:05:53 +08:00
parent 00a999c777
commit ad73ccf819
58 changed files with 293 additions and 712 deletions

View File

@@ -182,16 +182,16 @@ class MoGoMapDataCollectProvider : IMoGoMapDataCollectProvider, OnTaskListener,
}
override fun onChassisLocationWGS84(gnssInfo: MogoLocation) {
if (gnssInfo.gnssInfo != null
&& gnssInfo.gnssInfo.longitude != 0.0
&& gnssInfo.gnssInfo.latitude != 0.0
if (gnssInfo != null
&& gnssInfo.longitude != 0.0
&& gnssInfo.latitude != 0.0
) {
executor.get()?.updateLocation(
gnssInfo.gnssInfo.longitude,
gnssInfo.gnssInfo.latitude,
gnssInfo.gnssInfo.altitude,
gnssInfo.gnssInfo.heading.toFloat(),
gnssInfo.gnssInfo.gnssSpeed.toFloat(),
gnssInfo.longitude,
gnssInfo.latitude,
gnssInfo.altitude,
gnssInfo.heading.toFloat(),
gnssInfo.gnssSpeed,
true
)
}

View File

@@ -71,12 +71,12 @@ public class MogoRouteOverlayManager implements
if (gnssInfo == null) {
return;
}
if (isArriveAtStation.get() && autopilotMode.get() != 1) {
if (isArriveAtStation.get() && autopilotMode.get() != 2) {
RouteOverlayDrawer.getInstance().clearMogoRouteOverlay();
return;
}
boolean force = FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData;
if (!force && autopilotMode.get() != 1) {
if (!force && autopilotMode.get() != 2) {
RouteOverlayDrawer.getInstance().clearMogoRouteOverlay();
return;
}
@@ -92,8 +92,8 @@ public class MogoRouteOverlayManager implements
@Override
public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autoPilotStatusInfo) {
int mode = autoPilotStatusInfo.getPilotmode();
if (mode == 1) {
int mode = autoPilotStatusInfo.getState();
if (mode == 2) {
isArriveAtStation.set(false);
}
this.autopilotMode.set(mode);

View File

@@ -319,8 +319,8 @@ class SmallMapView @JvmOverloads constructor(
}
override fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) {
val tempStatus = autoPilotStatusInfo.pilotmode
if (tempStatus != 1) {
val tempStatus = autoPilotStatusInfo.state
if (tempStatus != 2) {
UiThreadHandler.post {
clearPolyline()
}