From 9c0ba1f3b0f440322da98b362061667d2ea892a7 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Mon, 10 Apr 2023 15:30:36 +0800 Subject: [PATCH] =?UTF-8?q?[2.0.0]=20=E4=BF=AE=E5=A4=8D=E6=8E=A5=E9=A9=B3?= =?UTF-8?q?=E4=B9=98=E5=AE=A2=E5=B1=8F=E5=81=B6=E7=8E=B0=E8=B7=AF=E7=BA=BF?= =?UTF-8?q?=E4=B8=8D=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/OchCommonLoginStatusDefaultModel.kt | 13 ++++------ .../mogo/och/data/bean/BusStationBean.java | 26 +++++++++++++++++++ .../passenger/model/BusPassengerModel.java | 3 ++- .../bus/passenger/model/PM2DrivingModel.kt | 5 ++-- .../src/m2/res/values/strings.xml | 2 +- .../com/mogo/och/bus/model/OrderModel.java | 2 +- 6 files changed, 38 insertions(+), 13 deletions(-) diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusDefaultModel.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusDefaultModel.kt index 54a78bfcff..9e32bd2aa5 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusDefaultModel.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusDefaultModel.kt @@ -37,16 +37,13 @@ object OchCommonLoginStatusDefaultModel : OchCommonLoginStatusModel() { } loginCallback?.loginSuccess(data) - updateLoginLocalStatus(isLogin()) + data?.data?.driverStatus?.let { updateLoginLocalStatus(it) } } - private fun updateLoginLocalStatus(isLogin: Boolean) { - var loginCacheStatus = LoginCacheStatus(if (isLogin){ - 1 - }else { - 0 - },DateTimeUtil.getCurrentTimeStamp()) + private fun updateLoginLocalStatus(loginStatus: Int = 0) { + var loginCacheStatus = LoginCacheStatus(loginStatus,DateTimeUtil.getCurrentTimeStamp()) + CacheDataManager.instance.putCacheData(mContext, BusCacheKey.BUS_LOGIN_STATUS_CACHE, GsonUtils.toJson(loginCacheStatus)) } @@ -60,7 +57,7 @@ object OchCommonLoginStatusDefaultModel : OchCommonLoginStatusModel() { } loginCallback?.loginFail(isLogin) - updateLoginLocalStatus(isLogin) + updateLoginLocalStatus(0) } } \ No newline at end of file diff --git a/OCH/mogo-och-data/src/main/java/com/mogo/och/data/bean/BusStationBean.java b/OCH/mogo-och-data/src/main/java/com/mogo/och/data/bean/BusStationBean.java index 143bb43db7..20baf93478 100644 --- a/OCH/mogo-och-data/src/main/java/com/mogo/och/data/bean/BusStationBean.java +++ b/OCH/mogo-och-data/src/main/java/com/mogo/och/data/bean/BusStationBean.java @@ -1,5 +1,7 @@ package com.mogo.och.data.bean; +import java.util.Objects; + /** * 单个网约车小巴车站信息 * @@ -93,6 +95,28 @@ public class BusStationBean { this.leaving = leaving; } + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + BusStationBean that = (BusStationBean) o; + return siteId == that.siteId + && seq == that.seq + && Double.compare(that.gcjLon, gcjLon) == 0 + && Double.compare(that.gcjLat, gcjLat) == 0 + && Double.compare(that.lon, lon) == 0 + && Double.compare(that.lat, lat) == 0 + && drivingStatus == that.drivingStatus + && leaving == that.leaving + && name.equals(that.name) + && nameKr.equals(that.nameKr); + } + + @Override + public int hashCode() { + return Objects.hash(siteId, name, nameKr, seq, gcjLon, gcjLat, lon, lat, drivingStatus, leaving); + } + @Override public String toString() { return "BusStationBean{" + @@ -107,4 +131,6 @@ public class BusStationBean { ", leaving=" + leaving + '}'; } + + } diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java index 58ac9e3d17..fa66012a85 100644 --- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java +++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java @@ -273,7 +273,7 @@ public class BusPassengerModel { clearLocalRouteResult(); return; } - + CallerLogger.INSTANCE.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = update"); routesResult = result; if (mRouteLineInfoCallback != null){ @@ -578,6 +578,7 @@ public class BusPassengerModel { public void dynamicCalculateRouteInfo() { //计算当前位置和下一站的剩余点集合 //计算剩余点总里程和时间 + CallerLogger.INSTANCE.d(M_BUS_P + TAG, "轨迹排查==mTwoStationsRouts.size() = " + mTwoStationsRouts.size()); if (mTwoStationsRouts.size() == 0){ calculateTwoStationsRoute(); } 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 98a3185650..977392b271 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 @@ -421,7 +421,7 @@ class PM2DrivingModel private constructor() { updateLocalOrder() return } - + d(SceneConstant.M_BUS_P+TAG, "queryDriverSiteByCoordinate= update") routesResult = result mDrivingInfoCallback?.updateLine(result.name, result.runningDur) @@ -445,6 +445,7 @@ class PM2DrivingModel private constructor() { mNextStationIndex = i + 1 return } else if (station.drivingStatus == BusPassengerConst.STATION_STATUS_STOPPED && !station.isLeaving) { + d(SceneConstant.M_BUS_P+TAG,"och-rotting--arrived ") mPreRouteIndex = 0 isGoingToNextStation = false startOrStopCalculateRouteInfo(false) @@ -484,7 +485,7 @@ class PM2DrivingModel private constructor() { fun dynamicCalculateRouteInfo(){ //计算当前位置和下一站的剩余点集合 //计算剩余点总里程和时间 - + d(SceneConstant.M_BUS_P + TAG, "och-rotting==mTwoStationsRouts.size() = " + mTwoStationsRouts.size) //计算当前位置和下一站的剩余点集合 //计算剩余点总里程和时间 if (mTwoStationsRouts.size == 0) { diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/values/strings.xml b/OCH/mogo-och-shuttle-passenger/src/m2/res/values/strings.xml index 9f2f2d5094..96812ea23f 100644 --- a/OCH/mogo-och-shuttle-passenger/src/m2/res/values/strings.xml +++ b/OCH/mogo-och-shuttle-passenger/src/m2/res/values/strings.xml @@ -13,7 +13,7 @@ m2_map_style.data m2_map_style_extra.data - Auto + AUTO 下一站： 已到站 暂无站点 diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java b/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java index 3b8cd646ce..f3e2f4c563 100644 --- a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java +++ b/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java @@ -79,7 +79,6 @@ import com.mogo.och.common.module.voice.VoiceNotice; import com.mogo.och.common.module.bean.dpmsg.BusCacheKey; import com.mogo.och.data.bean.BusTransferData; import com.mogo.och.data.manager.cache.CacheDataManager; -import com.zhidao.socket.utils.LoginStatusUtil; import org.jetbrains.annotations.NotNull; @@ -829,6 +828,7 @@ public class OrderModel { private void pushCacheTransferData(BusRoutesResult result) { BusTransferData data = new BusTransferData(LoginStatusManager.isLogin() ? 1:0,result); + CallerLogger.INSTANCE.d(M_BUS + TAG, "pushCacheTransferData = " + GsonUtils.toJson(data)); CacheDataManager.Companion.getInstance().putCacheData(mContext, BusCacheKey.BUS_LINE_CACHE, GsonUtils.toJson(data));