From 37820d8ba03be0661c5538b2beefb43c392fb34a Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 16 Nov 2023 21:05:23 +0800 Subject: [PATCH] =?UTF-8?q?[6.2.0]=20[shuttle]=20[=E6=8E=A5=E9=A9=B3?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AE=9E=E7=8E=B0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/utils/CoordinateCalculateRouteUtil.kt | 10 +++++----- .../och/bus/passenger/model/BusPassengerModel.java | 5 +++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.kt index 36018e3b40..97735b8d7a 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.kt @@ -732,7 +732,7 @@ object CoordinateCalculateRouteUtil { } distanceMap.clear() Logger.d(SceneConstant.M_OCHCOMMON + "calculateRouteSumLength", - "计算时间:${startTime-System.currentTimeMillis()}") + "计算时间:${System.currentTimeMillis()-startTime}") return getNearestPointInfo(preIndex,endIndex,mRoutePoints,location,type,size+2) } @@ -759,7 +759,7 @@ object CoordinateCalculateRouteUtil { } distanceMap.clear() Logger.d(SceneConstant.M_OCHCOMMON + "calculateRouteSumLength", - "计算时间:${startTime-System.currentTimeMillis()}") + "计算时间:${System.currentTimeMillis()-startTime}") return Triple(currentIndex,preIndexDistance?.isNext,preIndexDistance!!.distance) }else{ currentIndex = preIndex+1 @@ -770,7 +770,7 @@ object CoordinateCalculateRouteUtil { } distanceMap.clear() Logger.d(SceneConstant.M_OCHCOMMON + "calculateRouteSumLength", - "计算时间:${startTime-System.currentTimeMillis()}") + "计算时间:${System.currentTimeMillis()-startTime}") return Triple(currentIndex,preIndexNextDistance?.isNext,preIndexNextDistance!!.distance) } } @@ -832,7 +832,7 @@ object CoordinateCalculateRouteUtil { } distanceMap.clear() Logger.d(SceneConstant.M_OCHCOMMON + "calculateRouteSumLength", - "计算时间:${startTime-System.currentTimeMillis()}") + "计算时间:${System.currentTimeMillis()-startTime}") return Triple(currentIndex,key.isNext,key.distance) } key.distance.let { @@ -850,7 +850,7 @@ object CoordinateCalculateRouteUtil { } distanceMap.clear() Logger.d(SceneConstant.M_OCHCOMMON + "calculateRouteSumLength", - "计算时间:${startTime-System.currentTimeMillis()}") + "计算时间:${System.currentTimeMillis()-startTime}") return Triple(currentIndex,isNext,tempDistance) } } \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java index 28f8a23303..3babad1bc1 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java +++ b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java @@ -399,6 +399,11 @@ public class BusPassengerModel { }; private final IReceivedMsgListener mReceivedMsgListener = new IReceivedMsgListener() { + @Override + public void onDemoMode(boolean isDemoMode) { + + } + @Override public void onReceivedServerSn(@Nullable String sn) { }