From 840a9e842c3d65037955db65131d148d37e937ef Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Mon, 1 Aug 2022 12:04:07 +0800 Subject: [PATCH] =?UTF-8?q?[290=20bus/taxi]=201=E3=80=81=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E9=93=BE=E8=B7=AF=E6=97=A5=E5=BF=97=E9=87=8C=E5=B7=B2=E6=9C=89?= =?UTF-8?q?=E4=B8=94=E9=A2=91=E7=B9=81=E6=89=93=E5=8D=B0=E7=9A=84log=202?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9bus=E4=B9=98=E5=AE=A2=E5=B1=8F?= =?UTF-8?q?=E5=B0=8F=E5=9C=B0=E5=9B=BE=E4=B8=A4=E8=BE=B9=E8=BE=B9=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/model/BusPassengerModel.java | 22 +++++++++---------- .../ui/BusPassengerMapDirectionView.java | 2 +- .../mogo/och/bus/presenter/BusPresenter.java | 2 +- .../passenger/model/TaxiPassengerModel.java | 2 +- .../com/mogo/och/taxi/model/TaxiModel.java | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java index c43f715dbe..7d06ba2d26 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java @@ -301,17 +301,17 @@ public class BusPassengerModel { @Override public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autopilotStatusInfo) { - if (autopilotStatusInfo == null) return; - int state = autopilotStatusInfo.getState(); - CallerLogger.INSTANCE.d( M_BUS_P + TAG, "state = %s", state ); - if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { - //2022.7.20 自动驾驶更换成带档位的 -// if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotRunning(); - } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) { -// if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotEnable(); - } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE) { -// if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotDisable(); - } +// if (autopilotStatusInfo == null) return; +// int state = autopilotStatusInfo.getState(); +// CallerLogger.INSTANCE.d( M_BUS_P + TAG, "state = %s", state ); +// if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { +// //2022.7.20 自动驾驶更换成带档位的 +//// if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotRunning(); +// } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) { +//// if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotEnable(); +// } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE) { +//// if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotDisable(); +// } } @Override diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java index 193ddd3703..b4e780ef1c 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java @@ -202,7 +202,7 @@ public class BusPassengerMapDirectionView } boundsBuilder.include(currentLatLng); //第二个参数为四周留空宽度 - mAMap.moveCamera(CameraUpdateFactory.newLatLngBoundsRect(boundsBuilder.build(),50,50,50,50)); + mAMap.moveCamera(CameraUpdateFactory.newLatLngBoundsRect(boundsBuilder.build(),100,100,100,100)); }else { //设置希望展示的地图缩放级别 diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java index d5cb01601e..fadc4ad8d1 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java @@ -165,7 +165,7 @@ public class BusPresenter extends Presenter public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autopilotStatusInfo) { if (autopilotStatusInfo == null) return; int state = autopilotStatusInfo.getState(); - CallerLogger.INSTANCE.d(M_BUS + TAG, "onStateChange: " + state + "currentAutopilotStatus = " + currentAutopilotStatus); +// CallerLogger.INSTANCE.d(M_BUS + TAG, "onStateChange: " + state + "currentAutopilotStatus = " + currentAutopilotStatus); switch (state) { case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE: if (currentAutopilotStatus != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) { diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java index 0a5042f633..43937448f5 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java @@ -505,7 +505,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autopilotStatusInfo) { if (autopilotStatusInfo == null) return; int state = autopilotStatusInfo.getState(); - CallerLogger.INSTANCE.d( M_TAXI_P + TAG, "state = %s", state ); +// CallerLogger.INSTANCE.d( M_TAXI_P + TAG, "state = %s", state ); if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotRunning(); if (mCurrentOCHOrder != null diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java index c9aff5714a..c5c7e2316f 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java @@ -1119,7 +1119,7 @@ public class TaxiModel { public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autopilotStatusInfo) { if (autopilotStatusInfo == null) return; int state = autopilotStatusInfo.getState(); - CallerLogger.INSTANCE.d(M_TAXI + TAG, "state = %s", state); +// CallerLogger.INSTANCE.d(M_TAXI + TAG, "state = %s", state); if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { if (state != mPrevAPStatus && mADASStatusCallback != null){ mADASStatusCallback.onAutopilotRunning();