diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt index 5ecbcb1992..d91c62fc57 100644 --- a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt +++ b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt @@ -270,14 +270,16 @@ class PM2DrivingModel private constructor() { d(SceneConstant.M_BUS_P + TAG, "可以接受轨迹") } d(SceneConstant.M_BUS_P + TAG, "接受轨迹中") - updateRoutePoints(it.wayPointsList) + it.wayPointsList?.let {list-> + updateRoutePoints(list) + } } } } @Synchronized - fun updateRoutePoints(routePoints: List?) { + fun updateRoutePoints(routePoints: List) { mRoutePoints.clear() val latLngModels = CoordinateCalculateRouteUtil .coordinateConverterWgsToGcjLocations(mContext, routePoints) @@ -487,7 +489,7 @@ class PM2DrivingModel private constructor() { .getArrivedPointIndexNew( mWipePreIndex, mRoutePoints, - mLocation + mLocation!! ) mWipePreIndex = haveArrivedIndex d(SceneConstant.M_BUS_P + TAG, @@ -518,7 +520,7 @@ class PM2DrivingModel private constructor() { if (mTwoStationsRouts.size > 0 && mLocation != null) { val lastPointsMap = CoordinateCalculateRouteUtil - .getRemainPointListByCompareNew(mPreRouteIndex, mTwoStationsRouts, mLocation) + .getRemainPointListByCompareNew(mPreRouteIndex, mTwoStationsRouts, mLocation!!) for (index in lastPointsMap.keys) { mPreRouteIndex = index break diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java index fd3b224b17..349be74b75 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java @@ -660,13 +660,11 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM @Override public void onAutopilotStatusResponse(int state) { - IMoGoAutopilotStatusListener.super.onAutopilotStatusResponse(state); // TODO: 2023/6/19 bingbing } @Override public void onAutopilotDockerInfo(@NonNull String dockerVersion) { - IMoGoAutopilotStatusListener.super.onAutopilotDockerInfo(dockerVersion); // TODO: 2023/6/19 bingbing } }