From c6a00ac63c58bbbc9051240b9d262f2f6b2a55e3 Mon Sep 17 00:00:00 2001 From: renwj Date: Mon, 5 Sep 2022 22:03:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E7=BA=BF=E7=A8=8B=E4=BC=98=E5=8C=96]?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e65d1be81d..859b9de1c5 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ buildscript { classpath "com.bytedance.android.byteX:base-plugin:0.3.0" classpath "com.mogo.cloud:hook:${HOOK_LOG_VERSION}" classpath 'com.volcengine:apm_insight_plugin:1.4.1' - classpath 'com.mogo.thread.opt:plg:2.1.6' + classpath 'com.mogo.thread.opt:plg:2.1.10' classpath 'com.mogo.cloud:systrace:1.0.1' classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18' classpath 'com.mogo.sticky:service:1.0.8' From 4f9bccdd82b0037a40b571daf51d97d73684e6b7 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Tue, 6 Sep 2022 10:41:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[1.5.0]bus=E4=B9=98=E5=AE=A2=E5=B1=8F?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E7=9B=91=E6=8E=A7=E5=87=BA=E8=BD=A6/?= =?UTF-8?q?=E6=94=B6=E8=BD=A6=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/bus/passenger/constant/BusPassengerConst.kt | 2 +- .../mogo/och/bus/passenger/model/BusPassengerModel.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt index 8d8bc5d97f..e2ba5ec9e0 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt @@ -45,6 +45,6 @@ class BusPassengerConst { // 订单总里程 const val BUS_SP_KEY_ORDER_SUM_DIS = "BUS_SP_KEY_ORDER_SUM_DIS" - const val QUERY_BUS_P_STATION_DELAY = 5 * 1000L + const val QUERY_BUS_P_STATION_DELAY = 3 * 1000L } } \ No newline at end of file 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 9a5fe1584f..9dc79238ae 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 @@ -111,6 +111,7 @@ public class BusPassengerModel { initListeners(); // TODO: 2022/3/31 queryDriverOperationStatus(); + startOrStopOrderLoop(true); } public void setDriverStatusCallback(IBusPassegerDriverStatusCallback callback){ @@ -131,7 +132,6 @@ public class BusPassengerModel { @Override public void onSuccess(BusPassengerOperationStatusResponse data) { if (data == null || data.data == null) return; - startOrStopOrderLoop(data.data.serviceStatus == 1); if(mDriverStatusCallback != null){ mDriverStatusCallback.changeOperationStatus(data.data.serviceStatus == 1); mDriverStatusCallback.updatePlateNumber(data.data.plateNumber); @@ -161,7 +161,10 @@ public class BusPassengerModel { @Override public void onFail(int code, String msg) { - + //code = 1003; message = bus车辆已收车或未出车; + if (code == 1003){ + queryDriverOperationDelay(); + } } }); }