From 93ce6d2667bd25b9c23f81c15ff5161f231cfcb8 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 17 May 2023 17:39:59 +0800 Subject: [PATCH] =?UTF-8?q?[charter]=20[3.2.0]=20[100m=E5=86=85=E5=8F=AA?= =?UTF-8?q?=E6=92=AD=E6=94=BE=E4=B8=80=E6=AC=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/bus/passenger/model/CharterPassengerModel.kt | 3 ++- .../main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt index 440592c557..5d2d4086e2 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt @@ -934,8 +934,9 @@ object CharterPassengerModel { order.siteId?.let { siteId -> if (order.arriveStatus == OrderInfoResponse.ARRIVING) { if (broadcastList["${siteId}$ending100Key"] == null || broadcastList["${siteId}$ending100Key"] == false) { - val string = mContext.getString(R.string.arrived_station_left_100) + val string = mContext.getString(R.string.arrived_station_left_100,order.siteName) VoiceNotice.showNotice(string) + broadcastList["${siteId}$ending100Key"] = true } } } diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt index 4b0a45b090..012c15cf9f 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt @@ -162,13 +162,13 @@ class MainFragment : arriveTime:String ) { tv_distance.text = distance - tv_distance_unit.text = "距离(${distanceUnit})" + tv_distance_unit.text = distanceUnit tv_distance_surplus_time.text = leftTime tv_distance_arrive_time.text = arriveTime } fun setCarModle(rawInfo: Int){ - CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(rawInfo) + getMapUIController()?.changeCurrentIcon(rawInfo) HdMapBuildConfig.currentCarVrIconRes = rawInfo }