Merge branch 'dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0

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)
                                 }

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) {