From bc98d20963706bc3cf054a4d9d2185b9a0f64c42 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 18 Jul 2022 11:22:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=82=AC=E6=B5=AE?= =?UTF-8?q?=E6=A1=86=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/video/FloatingDistanceInfoUtils.kt | 5 +++-- .../och/taxi/passenger/ui/video/VideoActivity.kt | 2 -- .../layout/taxi_p_window_float_distance_info.xml | 14 +++++++------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/FloatingDistanceInfoUtils.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/FloatingDistanceInfoUtils.kt index 513a22cd8d..116451e807 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/FloatingDistanceInfoUtils.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/FloatingDistanceInfoUtils.kt @@ -12,7 +12,6 @@ import androidx.appcompat.widget.AppCompatTextView import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.taxi.passenger.R -import java.lang.Exception /** * 视频全屏播放 @@ -106,8 +105,10 @@ object FloatingDistanceInfoUtils { } fun setSpeed(speed: Float) { + val newSpeed: Int = (Math.abs(speed) * 3.6f).toInt() // 倒车时工控机反馈定位信息中speed为负值 + UiThreadHandler.getsUiHandler().post { - actvSpeed?.text = "$speed" + actvSpeed?.text = "$newSpeed" } } diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt index b2a5539aec..80baefb9c4 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt @@ -97,10 +97,8 @@ class VideoActivity : AppCompatActivity() { beforeTime.add(Calendar.MINUTE, time) //到达时间 val arriveTime = DateTimeUtil.formatCalendarToString(beforeTime, DateTimeUtil.TAXI_HH_mm) - System.err.println("------剩余公里$remainDis$disUnit----剩余分钟:$time------到达时间:$arriveTime") FloatingDistanceInfoUtils.setDistance(remainDis,disUnit,time,arriveTime) }else{ - System.err.println("速度----$speed") FloatingDistanceInfoUtils.setSpeed(speed) } } diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_window_float_distance_info.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_window_float_distance_info.xml index 6b91c4b7ca..786364ee15 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_window_float_distance_info.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_window_float_distance_info.xml @@ -34,7 +34,7 @@ android:id="@+id/actv_speed" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="68" + android:text="--" android:textColor="@color/taxi_order_status_textColor" android:textSize="88px" app:layout_constraintVertical_chainStyle="packed" @@ -85,7 +85,7 @@ android:id="@+id/actv_distancew" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="68" + android:text="--" android:textColor="@color/taxi_order_status_textColor" android:textSize="88px" app:layout_constraintVertical_chainStyle="packed" @@ -98,7 +98,7 @@ android:id="@+id/actv_distancew_unit" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="KM/h" + android:text="距离(KM)" android:textColor="@color/taxi_order_status_textColor" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -120,7 +120,7 @@ android:id="@+id/actv_surplus_time" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="68" + android:text="--" android:textColor="@color/taxi_order_status_textColor" android:textSize="88px" app:layout_constraintVertical_chainStyle="packed" @@ -133,7 +133,7 @@ android:id="@+id/actv_surplus_time_unit" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="KM/h" + android:text="剩余(分)" android:textColor="@color/taxi_order_status_textColor" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -155,7 +155,7 @@ android:id="@+id/actv_arrived_time" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="68" + android:text="--" android:textColor="@color/taxi_order_status_textColor" android:textSize="88px" app:layout_constraintVertical_chainStyle="packed" @@ -168,7 +168,7 @@ android:id="@+id/actv_arrived_time_unit" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="KM/h" + android:text="到达" android:textColor="@color/taxi_order_status_textColor" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"