From 1492df10b642dfe8a788ef1484c0cd8d876148ed Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Tue, 21 Mar 2023 12:28:33 +0800
Subject: [PATCH] =?UTF-8?q?[m1]=20[=E5=88=B0=E7=AB=99=E7=BB=93=E6=9D=9F?=
 =?UTF-8?q?=E8=B7=AF=E7=AE=97]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/bus/passenger/model/CharterPassengerModel.kt  | 2 ++
 .../m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt    | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
index cf44b22aa5..8033d9a606 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
@@ -864,6 +864,8 @@ object CharterPassengerModel {
                                     broadcastList["${it}$endKey"] = true
                                     // 到站结束自驾
                                     CallerAutoPilotControlManager.cancelAutoPilot()
+                                    // 结束路距计算
+                                    endCalculateDistanceLoop()
                                     // 到站置距离位0
                                     iDistanceTimeCallback?.setOrderTimeCallBack(-1)
                                 }
diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt
index e4aff84aaf..34aff80614 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt
@@ -240,7 +240,8 @@ class M1SoftFragment :
         rv_aircondition_temperature.layoutManager = pickerLayoutManager
         rv_aircondition_temperature.adapter = adapter
         HorizontalDecoration.distance = SharedPrefsMgr.getInstance(requireContext()).getInt(HorizontalDecoration.distancekey,0)
-        rv_aircondition_temperature.addItemDecoration(HorizontalDecoration(20,data.size-1))
+        val space = AutoSizeUtils.dp2px(context, 22f)
+        rv_aircondition_temperature.addItemDecoration(HorizontalDecoration(space,data.size-1))
 
         pickerLayoutManager.setOnScrollStopListener { view ->
             if (view is TextView) {