From 01fde7ba853bf7b4295bf4f1c5a6dd77e74f1218 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 6 Apr 2023 21:02:13 +0800 Subject: [PATCH] =?UTF-8?q?[B1/B2]=E4=B9=98=E5=AE=A2=E5=B1=8F=E8=B7=AF?= =?UTF-8?q?=E7=BA=BF=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/bus/passenger/model/BusPassengerModel.java | 3 +++ .../java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt | 4 +++- .../src/m2/res/layout/p_m2_driving_info_fragment.xml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) 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 d2ddb289c9..58ac9e3d17 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,6 +273,9 @@ public class BusPassengerModel { clearLocalRouteResult(); return; } + + routesResult = result; + if (mRouteLineInfoCallback != null){ mRouteLineInfoCallback.updateLineInfo(result.getName(),result.getRunningDur()); mRouteLineInfoCallback.hideNoTaskView(); 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 441861d081..98a3185650 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 @@ -105,7 +105,7 @@ class PM2DrivingModel private constructor() { private fun queryDriverByLocalDriver() { //本地去请求司机端 - val msg = TaskDetailsMsg("") + val msg = TaskDetailsMsg("task") sendMsgToServer(GsonUtils.toJson(msg)) } @@ -422,6 +422,8 @@ class PM2DrivingModel private constructor() { return } + routesResult = result + mDrivingInfoCallback?.updateLine(result.name, result.runningDur) if (result.sites != null) { mDrivingInfoCallback?.showNoTaskView(false) diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml index 791644deff..61a1312d0e 100644 --- a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml +++ b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml @@ -228,7 +228,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_50" android:layout_marginTop="@dimen/dp_27" - android:text="60" + android:text="0" android:textColor="@color/m2_p_speed_tv_color" android:textSize="@dimen/dp_60" android:textStyle="bold"