From 9e276cb82b9aa24168ce1942f4287440a5597cd2 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Mon, 14 Aug 2023 18:12:29 +0800
Subject: [PATCH 01/13] =?UTF-8?q?[6.0.0]=20=E5=89=A9=E4=BD=99=E9=87=8C?=
 =?UTF-8?q?=E7=A8=8B=E5=92=8C=E6=97=B6=E9=97=B4=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/mogo/och/taxi/model/TaxiModel.kt    | 8 +++++++-
 .../java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt    | 8 +++++---
 .../src/main/java/com/mogo/och/taxi/ui/TaxiFragment.kt    | 3 +++
 .../src/main/res/layout/taxi_panel.xml                    | 7 +++++++
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt
index dbf5f092bd..55a0ef78d6 100644
--- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt
+++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt
@@ -731,7 +731,13 @@ object TaxiModel {
 
             })
     }
-
+    fun setArriveAtVirtualStation() {
+        if (mUntruthTask == null) {
+            ToastUtils.showShort("订单状态不匹配该操作！")
+            return
+        }
+        arriveSite(mUntruthTask!!.siteId, false)
+    }
     /**
      * 订单流转debug START
      */
diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt
index 0f0a7ac692..e3f8886e87 100644
--- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt
+++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt
@@ -197,7 +197,7 @@ class TaxiBeingTaskFragment : BaseFragment(),
             && mCurrentTaskAndOrder!!.currentStatus == TaskStatusEnum.StartTask.code){
 
             startNaviToStation(isVoicePlay,mCurrentTaskAndOrder!!.endSite!!.gcjLat,
-                mCurrentTaskAndOrder!!.endSite!!.gcjLat)
+                mCurrentTaskAndOrder!!.endSite!!.gcjLon)
             return
         }
 
@@ -205,7 +205,7 @@ class TaxiBeingTaskFragment : BaseFragment(),
             && mCurrentTaskAndOrder!!.currentStatus == TaskStatusEnum.GetTask.code){ //演练任务和送驾任务
 
             startNaviToStation(isVoicePlay,mCurrentTaskAndOrder!!.startSite!!.gcjLat,
-                mCurrentTaskAndOrder!!.startSite!!.gcjLat)
+                mCurrentTaskAndOrder!!.startSite!!.gcjLon)
         }
     }
 
@@ -512,7 +512,7 @@ class TaxiBeingTaskFragment : BaseFragment(),
     @RequiresApi(Build.VERSION_CODES.N)
     fun updateDistanceAndTime(meters: Long, timeInSecond: Long) {
 //        CallerLogger.INSTANCE.d(M_TAXI + TAG,"meters = "+meters+"timeInSecond ="+timeInSecond);
-        if (mCurrentTaskAndOrder == null || mCurrentTaskAndOrder!!.order == null) return
+        if (mCurrentTaskAndOrder == null || mCurrentTaskAndOrder!!.endSite == null) return
         var dis = "0"
         var disUnit = "公里"
         if (meters > 0) {
@@ -528,6 +528,8 @@ class TaxiBeingTaskFragment : BaseFragment(),
         val strHtml2 =
             ("<font color=\"#CAD6FF\">里程 </font>" + "<b><font color=\"#FFFFFF\">" + dis + "</font></b>" + "<font color=\"#CAD6FF\"> " + disUnit + "</font>"
                     + "<font color=\"#CAD6FF\">，剩余 </font>" + "<b><font color=\"#FFFFFF\">" + min + "</font></b>" + "<font color=\"#CAD6FF\"> 分钟</font>")
+
+        taskOtherInfo.text = Html.fromHtml(strHtml2,Html.FROM_HTML_MODE_LEGACY)
     }
 
     private fun speekVoice200mTipsOnce() {
diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.kt
index eb66fe52dc..9996bc77cf 100644
--- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.kt
+++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.kt
@@ -197,6 +197,9 @@ class TaxiFragment : BaseTaxiTabFragment<TaxiFragment, TaxiPresenter>(),
      * 订单流转debug START
      */
     private fun initOrderTestBar() {
+        findViewById<View>(R.id.test_bar_to_virtual)?.setOnClickListener{
+            TaxiModel.setArriveAtVirtualStation()
+        }
         findViewById<View>(R.id.test_bar_to_start)?.setOnClickListener {
             TaxiModel.setArriveAtStartStation()
         }
diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_panel.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_panel.xml
index 3e8f89336a..a8dd1b58d0 100644
--- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_panel.xml
+++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_panel.xml
@@ -66,6 +66,13 @@
             android:textColor="@android:color/white"
             android:textSize="@dimen/dp_24" />
 
+        <Button
+            android:id="@+id/test_bar_to_virtual"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="到达标定站点"
+            android:textSize="@dimen/dp_24" />
+
         <Button
             android:id="@+id/test_bar_to_start"
             android:layout_width="wrap_content"

From c93141d8f0bd8c8e2d854c84db960481f1c656d8 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Mon, 14 Aug 2023 19:30:56 +0800
Subject: [PATCH 02/13] =?UTF-8?q?[6.0.0]=20=E4=BB=BB=E5=8A=A1=E5=88=B0?=
 =?UTF-8?q?=E7=AB=99=E5=90=8E=E7=95=8C=E9=9D=A2=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/och/taxi/model/TaxiModel.kt     | 15 +++++++--------
 .../mogo/och/taxi/model/TaxiUnmannedViewModel.kt  |  4 +++-
 .../com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt |  8 +++++++-
 .../java/com/mogo/och/taxi/ui/TaxiFragment.kt     | 11 ++++++-----
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt
index 55a0ef78d6..746cb49ffe 100644
--- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt
+++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt
@@ -379,7 +379,7 @@ object TaxiModel {
                 && mCurrentTaskAndOrder!!.endSite != null
     }
 
-    fun checkCurrentOrder(): Boolean {
+    private fun checkCurrentOrder(): Boolean {
         return mCurrentTaskAndOrder != null && mCurrentTaskAndOrder!!.order != null
     }
 
@@ -458,8 +458,8 @@ object TaxiModel {
             false,
             mCurrentTaskAndOrder!!.startSite!!.siteName,
             mCurrentTaskAndOrder!!.endSite!!.siteName,
-            mCurrentTaskAndOrder!!.lineId.toLong(),
-            "" // todo 这里原来传的是订单号, 现在是任务没有订单号
+            mCurrentTaskAndOrder!!.lineId,
+            if (mCurrentTaskAndOrder!!.order != null) mCurrentTaskAndOrder!!.order!!.orderNo else ""
         )
         if (mControllerStatusCallback != null) {
             mControllerStatusCallback!!.startOpenAutopilot()
@@ -497,7 +497,7 @@ object TaxiModel {
                 mCurTaskContrail!!.txtFileUrl,
                 mCurTaskContrail!!.txtFileMd5,
                 mCurTaskContrail!!.contrailSaveTime,
-                "", // todo 这里原来传的是carModel, 现在没有这个信息, 是否传businessType
+                "", // todo 这里原来传的是carModel, 现在没有这个信息
                 mCurTaskContrail!!.csvFileUrlDPQP,
                 mCurTaskContrail!!.csvFileMd5DPQP,
                 mCurTaskContrail!!.txtFileUrlDPQP,
@@ -541,7 +541,6 @@ object TaxiModel {
             d(SceneConstant.M_TAXI + TAG, "onIntentReceived = %s", intentStr)
             if ((ConnectivityManager.CONNECTIVITY_ACTION == intentStr)) {
                 if (NetworkUtils.isConnected(mContext)) {
-//                    startOrStopOrderLoop(isLogin() && isOpeningOrderStatus())
                     loginService!!.queryLoginStatusByNet()
                 }
             }
@@ -716,7 +715,7 @@ object TaxiModel {
     /**
      * 查询当前任务的轨迹
      */
-    public fun queryTaskContrail(planningLines: Array<Long>?) {
+     fun queryTaskContrail(planningLines: Array<Long>?) {
         if (planningLines == null) return
         CarServiceManager.contrailList(mContext!!, planningLines,
             object : OchCommonServiceCallback<ContrailListRespBean> {
@@ -731,9 +730,9 @@ object TaxiModel {
 
             })
     }
-    fun setArriveAtVirtualStation() {
+    fun setArriveAtUntruthStation() {
         if (mUntruthTask == null) {
-            ToastUtils.showShort("订单状态不匹配该操作！")
+            ToastUtils.showShort("无虚拟站点！")
             return
         }
         arriveSite(mUntruthTask!!.siteId, false)
diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt
index 07ae7c1258..cc31be43a2 100644
--- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt
+++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt
@@ -149,7 +149,9 @@ class TaxiUnmannedViewModel : BaseViewModel<UnmannedState, UnmannedIntent>(){
                         TaxiModel.loginService!!.queryLoginStatusByNet()
                         VoiceNotice.showNotice("开始接单啦")
                         //虚拟任务要开启到站围栏
-                        updateUntruthTask(data.data)
+                        if (mCurrentTaskAndOrder == null || mCurrentTaskAndOrder!!.endSite == null){
+                            updateUntruthTask(data.data)
+                        }
                     }
 
                     override fun onFail(code: Int, msg: String?) {
diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt
index e3f8886e87..f694fef628 100644
--- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt
+++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt
@@ -219,6 +219,12 @@ class TaxiBeingTaskFragment : BaseFragment(),
             isHaveBeingOrder(false)
             return
         }
+
+        if (taskAndOrder.currentStatus == TaskStatusEnum.CompleteTask.code){
+            isHaveBeingOrder(false)
+            return
+        }
+
         isHaveBeingOrder(true)
         /**
          *  根据任务类型判断任务显示,
@@ -235,7 +241,7 @@ class TaxiBeingTaskFragment : BaseFragment(),
         updateUIShowStatus(taskType,currentStatus,order)
 
         when (taskType) {
-            TaskTypeEnum.VirtualTask.code -> {// 送驾驶任务
+            TaskTypeEnum.VirtualTask.code -> {// 演练任务
                 if (startSite == null || endSite == null) return
                 taskStatus.text = resources.getString(R.string.task_start_end_site)
                 taskTypeTv.background = resources.getDrawable(R.drawable.task_unreal_type_btn_bg,null)
diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.kt
index 9996bc77cf..a9d7af3822 100644
--- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.kt
+++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.kt
@@ -198,7 +198,7 @@ class TaxiFragment : BaseTaxiTabFragment<TaxiFragment, TaxiPresenter>(),
      */
     private fun initOrderTestBar() {
         findViewById<View>(R.id.test_bar_to_virtual)?.setOnClickListener{
-            TaxiModel.setArriveAtVirtualStation()
+            TaxiModel.setArriveAtUntruthStation()
         }
         findViewById<View>(R.id.test_bar_to_start)?.setOnClickListener {
             TaxiModel.setArriveAtStartStation()
@@ -230,10 +230,11 @@ class TaxiFragment : BaseTaxiTabFragment<TaxiFragment, TaxiPresenter>(),
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun openOperationalInfoView(eventLogout: EventLogout) {
-        if (eventLogout.messgae == EventLogout.PERSONAL_TYPE) {
-            d(SceneConstant.M_TAXI + TAG, "openOperationalInfoView Event个人中心")
-            openOperationalInfoView()
-        }
+//        if (eventLogout.messgae == EventLogout.PERSONAL_TYPE) {
+        // 个人信息, 运营数据在无人化阶段暂时不展示
+//            d(SceneConstant.M_TAXI + TAG, "openOperationalInfoView Event个人中心")
+//            openOperationalInfoView()
+//        }
     }
 
     private fun openOperationalInfoView() {

From bf3104733a41edc0973d5c9042733791677e55b4 Mon Sep 17 00:00:00 2001
From: chenfufeng <chenfufeng@zhidaoauto.com>
Date: Mon, 14 Aug 2023 19:51:01 +0800
Subject: [PATCH 03/13] =?UTF-8?q?[6.0.0][Opt]=E6=9B=B4=E6=96=B0=E8=BD=A8?=
 =?UTF-8?q?=E8=BF=B9=E6=93=A6=E9=99=A4=E7=AE=97=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/function/smp/MarkerDrawerManager.kt  | 130 ++++++++++++------
 .../eagle/core/function/view/OverMapView.kt   |  66 ++++++++-
 .../main/res/drawable-xhdpi/loc_azure_bg.png  | Bin 0 -> 2651 bytes
 .../utilcode/util/DrivingDirectionUtils.java  |  39 ++++++
 .../core/utilcode/util/LocationUtils.java     |   2 +
 5 files changed, 192 insertions(+), 45 deletions(-)
 create mode 100644 core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/loc_azure_bg.png

diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/MarkerDrawerManager.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/MarkerDrawerManager.kt
index f69b8bfeb1..c126b702a8 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/MarkerDrawerManager.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/MarkerDrawerManager.kt
@@ -5,7 +5,9 @@ import android.util.Log
 import com.amap.api.maps.CoordinateConverter
 import com.amap.api.maps.model.LatLng
 import com.mogo.eagle.core.utilcode.util.CoordinateUtils
-import com.mogo.eagle.core.utilcode.util.DrivingDirectionUtils
+import com.mogo.eagle.core.utilcode.util.DrivingDirectionUtils.getAngleDiff
+import com.mogo.eagle.core.utilcode.util.DrivingDirectionUtils.getLineAngle
+import com.mogo.eagle.core.utilcode.util.LocationUtils
 import io.reactivex.Observable
 import io.reactivex.ObservableOnSubscribe
 import io.reactivex.android.schedulers.AndroidSchedulers
@@ -132,54 +134,94 @@ object MarkerDrawerManager {
         var currentIndex = 0 //记录疑似点
         // 是否超过200KM
         var isLongDistance = false
-        if (routePoints.isNotEmpty()) {
-            //基础点
-            val baseLatLng = routePoints[0]
-            newPoints.add(LatLng(baseLatLng.latitude, baseLatLng.longitude))
-            var baseDiffDis = CoordinateUtils.calculateLineDistance(
-                realLon, realLat, baseLatLng.longitude, baseLatLng.latitude
-            ) // lon,lat, prelon, prelat
-            if (baseDiffDis > 200000) {
-                isLongDistance = true
-            }
-            val size = routePoints.size
-            for (i in 1 until size) {
-                val latLng = routePoints[i]
-                // 深拷贝数据用于高德地图上轨迹线的绘制
-                newPoints.add(LatLng(latLng.latitude, latLng.longitude))
-                if (isLongDistance) continue
-                val diff = CoordinateUtils.calculateLineDistance(
-                    realLon, realLat, latLng.longitude, latLng.latitude
-                )
-                if (baseDiffDis > diff) {
-                    baseDiffDis = diff
-                    // 距离最近的时候判断是否走过
-                    if (DrivingDirectionUtils.getDegreeOfCar2Poi2(
-                            realLon,
-                            realLat,
+        var distance = 0.0
+        var tmpDistance: Double
+        var angle = 0.0
+        routePoints.forEachIndexed { index, latLng ->
+            newPoints.add(LatLng(latLng.latitude, latLng.longitude))
+            when (index) {
+                0 -> {
+                    distance = LocationUtils.pointToLine(
+                        latLng.longitude,
+                        latLng.latitude,
+                        routePoints[index + 1].longitude,
+                        routePoints[index + 1].latitude,
+                        realLon,
+                        realLat
+                    )
+                    if (distance > 200000) {
+                        isLongDistance = true
+                    }
+                }
+
+                routePoints.size - 1 -> {}
+                else -> {
+                    // 车到两轨迹点距离最短(距离这条路最近)
+                    tmpDistance = LocationUtils.pointToLine(
+                        latLng.longitude,
+                        latLng.latitude,
+                        routePoints[index + 1].longitude,
+                        routePoints[index + 1].latitude,
+                        realLon,
+                        realLat
+                    )
+                    if (tmpDistance <= distance) {
+                        // 车此刻运动方向与两轨迹点朝向的夹角小于90(结合距离线段最近则车在两点之间，意味着已走过第index个轨迹点)
+                        angle = getLineAngle(
                             latLng.longitude,
                             latLng.latitude,
-                            heading
-                        ) >= 90
-                    ) {
-                        currentIndex = i
+                            routePoints[index + 1].longitude,
+                            routePoints[index + 1].latitude
+                        )
+                        if (getAngleDiff(angle, heading) < 90) {
+                            if (index < currentIndex) {
+                                return@forEachIndexed
+                            } else {
+                                distance = tmpDistance
+                                currentIndex = index
+                            }
+                        }
                     }
                 }
             }
-            Log.d("MarkerDrawerManager", "当次计算已走过的点的索引为：$currentIndex，存储的上次索引为：$lastArrivedIndex, ,起点为:(${newPoints[0].longitude},${newPoints[0].latitude}),终点为:(${newPoints.last().longitude},${newPoints.last().latitude})")
-            if (!isLongDistance) {
-                // 过滤缓存的非当次轨迹的索引，并且出现车已走过索引跳跃过大时视为无效复用上一次计算结果
-                if (currentIndex < lastArrivedIndex || (lastArrivedIndex >= 0 && currentIndex - lastArrivedIndex >= 10)) {
-                    if (lastArrivedIndex < size) {
-                        currentIndex = lastArrivedIndex
-                    }
-                } else {
-                    lastArrivedIndex = currentIndex
-                }
-                if (size >= 2) {
-                    newPoints.add(currentIndex + 1, LatLng(realLat, realLon))
-                    return currentIndex + 1
-                }
+        }
+        Log.d(
+            "MarkerDrawerManager", "起点为:(${newPoints[0].longitude},${newPoints[0].latitude}),终点为:(${newPoints.last().longitude},${newPoints.last().latitude})"
+        )
+        if (!isLongDistance && currentIndex > 0) {
+            val size = routePoints.size
+//            // 对于非法结果，需要纠正
+//            if (currentIndex < lastArrivedIndex || (lastArrivedIndex > 0 && currentIndex - lastArrivedIndex > 5)) {
+//                val lastNextIndex = lastArrivedIndex + 1
+//                var isLastNextArrived = false
+//                if (lastNextIndex in 0 until size) {
+//                    if (DrivingDirectionUtils.getDegreeOfCar2Poi2(
+//                            realLon,
+//                            realLat,
+//                            routePoints[lastNextIndex].longitude,
+//                            routePoints[lastNextIndex].latitude,
+//                            heading
+//                        ) >= 90
+//                    ) {
+//                        isLastNextArrived = true
+//                    }
+//                }
+//
+//                if (isLastNextArrived) {
+//                    currentIndex = lastNextIndex
+//                    lastArrivedIndex = currentIndex
+//                } else {
+//                    if (lastArrivedIndex in 0 until size) {
+//                        currentIndex = lastArrivedIndex
+//                    }
+//                }
+//            } else {
+//                lastArrivedIndex = currentIndex
+//            }
+            if (size >= 2) {
+                Log.d("MarkerDrawerManager", "最终绘制的已走过index为:$currentIndex,车所在位置为:${currentIndex + 1}")
+                newPoints.add(currentIndex + 1, LatLng(realLat, realLon))
+                return currentIndex + 1
             }
         }
         return 0
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt
index fbd634cfa3..ed4793e385 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt
@@ -88,6 +88,7 @@ class OverMapView @JvmOverloads constructor(
     private var mContext: Context? = null
     private var mTilt = 0f
     private var overLayerView: TextView? = null
+
     @Volatile
     private var isMapLoaded = false
 
@@ -112,10 +113,18 @@ class OverMapView @JvmOverloads constructor(
     var arrivedBitmap: BitmapDescriptor? = null
     var unArrivedBitmap: BitmapDescriptor? = null
     var transparentBitmap: BitmapDescriptor? = null
+    private val pointBitmap by lazy {
+        BitmapDescriptorFactory.fromResource(R.drawable.loc_azure_bg)
+    }
+    private val markerOptionsList by lazy {
+        ArrayList<MarkerOptions>()
+    }
+    private var isDebug = true
 
     // 绘制轨迹线的集合
     private val textureList: MutableList<BitmapDescriptor?> = ArrayList()
     private val texIndexList: MutableList<Int> = ArrayList()
+
     @Volatile
     private var mLocation: MogoLocation? = null
     private var isFirstLocation = true
@@ -123,6 +132,7 @@ class OverMapView @JvmOverloads constructor(
     var currMarkerList: ArrayList<Marker>? = null
     var siteMarkerList: ArrayList<Marker>? = null
     var siteNameList: ArrayList<Marker>? = null
+    private var pointMarkers: ArrayList<Marker>? = null
 
     @Volatile
     private var isFirst = true
@@ -148,6 +158,7 @@ class OverMapView @JvmOverloads constructor(
         private const val DRAW_POLY_LINE = 1
         private const val DRAW_CAR_LOCATION = 2
         private const val CLEAR_POLY_LINE = 3
+        private const val CLEAR_POINT_MARKERS = 4
 
         private const val DRAW_V2X_MARKERS = 1
         private const val DISPLAY_OVER_VIEW = 2
@@ -235,6 +246,16 @@ class OverMapView @JvmOverloads constructor(
         overLayerView?.visibility = View.GONE
     }
 
+    fun setDebugMode(isDebug: Boolean) {
+        this.isDebug = isDebug
+        if (!isDebug) {
+            Message.obtain().apply {
+                what = CLEAR_POINT_MARKERS
+                frequentHandler?.sendMessage(this)
+            }
+        }
+    }
+
     /**
      * siteLatLngs: 高德坐标集合
      * bitmap: Marker对应的图片
@@ -362,6 +383,10 @@ class OverMapView @JvmOverloads constructor(
             what = CLEAR_POLY_LINE
             frequentHandler?.sendMessage(this)
         }
+        Message.obtain().apply {
+            what = CLEAR_POINT_MARKERS
+            frequentHandler?.sendMessage(this)
+        }
         mStartMarker?.isVisible = false
         mEndMarker?.isVisible = false
 
@@ -778,6 +803,7 @@ class OverMapView @JvmOverloads constructor(
      * @param locIndex
      */
     private fun realDrawPolyline(coordinates: List<LatLng>, locIndex: Int) {
+        val drawPointMarkers = isDebug && pointMarkers.isNullOrEmpty()
         val time = System.currentTimeMillis()
         if (textureList.size > 0) {
             textureList.clear()
@@ -785,6 +811,7 @@ class OverMapView @JvmOverloads constructor(
         if (texIndexList.size > 0) {
             texIndexList.clear()
         }
+        if (drawPointMarkers) markerOptionsList.clear()
         if (isClearArrived) {
             textureList.add(transparentBitmap)// index:0
         } else {
@@ -793,7 +820,15 @@ class OverMapView @JvmOverloads constructor(
         }
         // 未走过的纹理
         textureList.add(unArrivedBitmap)// index:1
+
         for (i in coordinates.indices) {
+            if (drawPointMarkers) {
+                markerOptionsList.add(MarkerOptions().also {
+                    it.icon(pointBitmap)
+                    it.anchor(0.5f, 0.5f)
+                    it.position(coordinates[i])
+                })
+            }
             // 线段数比点数少一个
             if (i == 0) continue
             if (i <= locIndex) {
@@ -802,6 +837,9 @@ class OverMapView @JvmOverloads constructor(
                 texIndexList.add(1)
             }
         }
+        if (drawPointMarkers) {
+            pointMarkers = mAMap?.addMarkers(markerOptionsList, false)
+        }
         if (mCoveredPolyline != null) {
             mCoveredPolyline!!.options.customTextureList = textureList
             mCoveredPolyline!!.options.customTextureIndex = texIndexList
@@ -863,7 +901,8 @@ class OverMapView @JvmOverloads constructor(
                 //设置希望展示的地图缩放级别
                 Log.d(TAG, "切换视角展示车，定位为：${mLocation!!.longitude},${mLocation!!.latitude}")
                 val cameraPosition = CameraPosition.Builder()
-                    .target(LatLng(mLocation!!.latitude, mLocation!!.longitude)).tilt(mTilt).zoom(zoomLevel.toFloat()).build()
+                    .target(LatLng(mLocation!!.latitude, mLocation!!.longitude)).tilt(mTilt)
+                    .zoom(zoomLevel.toFloat()).build()
                 mAMap!!.moveCamera(CameraUpdateFactory.newCameraPosition(cameraPosition))
             }
         }
@@ -1006,6 +1045,13 @@ class OverMapView @JvmOverloads constructor(
         mCoveredPolyline?.points = emptyList()
     }
 
+    private fun realClearPointMarkers() {
+        pointMarkers?.forEach {
+            it.destroy()
+        }
+        pointMarkers = null
+    }
+
     private fun realClearSitePolyline() {
         mSitePolyline?.points = emptyList()
     }
@@ -1165,16 +1211,23 @@ class OverMapView @JvmOverloads constructor(
                         realDrawPolyline(first, second)
                     }
                 }
+
                 DRAW_CAR_LOCATION -> {
                     removeMessages(DRAW_CAR_LOCATION)
                     (msg.obj as MogoLocation).apply {
                         realDrawCarMarker(this)
                     }
                 }
+
                 CLEAR_POLY_LINE -> {
                     removeMessages(CLEAR_POLY_LINE)
                     realClearPolyline()
                 }
+
+                CLEAR_POINT_MARKERS -> {
+                    removeMessages(CLEAR_POINT_MARKERS)
+                    realClearPointMarkers()
+                }
             }
         }
     }
@@ -1192,57 +1245,68 @@ class OverMapView @JvmOverloads constructor(
                         realDrawSitePolyline(first, second)
                     }
                 }
+
                 DRAW_V2X_MARKERS -> {
                     removeMessages(DRAW_V2X_MARKERS)
                     (msg.obj as ArrayList<MarkerOptions>).apply {
                         realDrawV2XMarkers(this)
                     }
                 }
+
                 DISPLAY_OVER_VIEW -> {
                     removeMessages(DISPLAY_OVER_VIEW)
                     realDisplayOverView()
                 }
+
                 INCLUDE_SITES_OVER_VIEW -> {
                     removeMessages(INCLUDE_SITES_OVER_VIEW)
                     (msg.obj as List<LatLng>).also {
                         realIncludeSitePointsAndRefresh(it)
                     }
                 }
+
                 DRAW_START_AND_END -> {
                     removeMessages(DRAW_START_AND_END)
                     (msg.obj as List<LatLng>).also {
                         realDrawStartAndEndMarker(it)
                     }
                 }
+
                 CLEAR_SITE_POLYLINE -> {
                     removeMessages(CLEAR_SITE_POLYLINE)
                     MarkerDrawerManager.isStopCalculate = false
                     realClearSitePolyline()
                 }
+
                 CLEAR_V2X_MARKERS -> {
                     removeMessages(CLEAR_V2X_MARKERS)
                     realClearV2XMarkers()
                 }
+
                 DRAW_SITE_NAME -> {
                     removeMessages(DRAW_SITE_NAME)
                     (msg.obj as ArrayList<MarkerOptions>).also {
                         realDrawSiteNames(it)
                     }
                 }
+
                 CLEAR_SITE_NAME -> {
                     removeMessages(CLEAR_SITE_NAME)
                     realClearSiteNameViews()
                 }
+
                 DRAW_SITE_MARKER -> {
                     (msg.obj as ArrayList<MarkerOptions>).also {
                         realDrawSiteMarkers(it)
                     }
                     removeMessages(DRAW_SITE_MARKER)
                 }
+
                 CLEAR_SITE_MARKER -> {
                     removeMessages(CLEAR_SITE_MARKER)
                     realClearSiteMarkers()
                 }
+
                 DRAW_INF_STRUCTURE -> {
                     removeMessages(DRAW_INF_STRUCTURE)
                     (msg.obj as ArrayList<MarkerOptions>).also {
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/loc_azure_bg.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/loc_azure_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc778d7d287ee1a6271dfc51e815b07e7e56685d
GIT binary patch
literal 2651
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
JPDHLkV1i3$7@+_F

literal 0
HcmV?d00001

diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DrivingDirectionUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DrivingDirectionUtils.java
index eb79646a84..6d0c419431 100644
--- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DrivingDirectionUtils.java
+++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DrivingDirectionUtils.java
@@ -153,4 +153,43 @@ public class DrivingDirectionUtils {
         return 180 - Math.abs(Math.abs(angle1 - angle2) - 180);
     }
 
+    /**
+     *
+     * @param dx1
+     * @param dy1
+     * @param dx2
+     * @param dy2
+     * @return 两点组成的线段与正北的夹角
+     */
+    public static double getLineAngle(double dx1, double dy1, double dx2, double dy2) {
+        return getAngleToNorth((dx2 - dx1), (dy2 - dy1));
+    }
+
+    public static double getAngleToNorth(double x, double y) {
+        double resAngle = 0;
+
+        if (0 == x && 0 == y) {
+            resAngle = -400;
+        } else if (0 == y) {
+            if (0 < x) {
+                resAngle = 90;
+            } else {
+                resAngle = 270;
+            }
+        } else if (0 == x) {
+            if (0 < y) {
+                resAngle = 0;
+            } else {
+                resAngle = 180;
+            }
+        } else if (0 < y) {
+            resAngle = (Math.atan((x / y)) * 180 / PI);
+            if (0 > resAngle) {
+                resAngle += 360;
+            }
+        } else {
+            resAngle = (180 + Math.atan((x / y)) * 180 / PI);
+        }
+        return resAngle;
+    }
 }
diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/LocationUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/LocationUtils.java
index 72d2d21990..5d709ac3cf 100644
--- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/LocationUtils.java
+++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/LocationUtils.java
@@ -68,6 +68,8 @@ public class LocationUtils {
         }
         double p = (a + b + c) / 2;// 半周长
         double s = Math.sqrt(p * (p - a) * (p - b) * (p - c));// 海伦公式求面积
+        // 如果三个点在一条直线上则求出来的面积为NaN
+        if (Double.isNaN(s)) return 0.0;
         space = 2 * s / a;// 返回点到线的距离（利用三角形面积公式求高）
         return space;
     }

From 60deadfb96c669ba10d00fccc01e7db48a2f3905 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Mon, 14 Aug 2023 20:00:42 +0800
Subject: [PATCH 04/13] =?UTF-8?q?[5.0.0]=20[video=20=E6=8A=BD=E5=8F=96view?=
 =?UTF-8?q?]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/bus/passenger/ui/MainFragment.kt |  92 +++++---
 .../ui/softcontrol/SoftControlView.kt         | 196 +++++++++++-------
 .../ui/softcontrol/SoftControlViewModel.kt    | 160 ++++++++------
 .../layoutmanage/CarouselLayoutManager.java   |  15 +-
 .../ui/softcontrol/view/DrawBitmapView.kt     |  13 +-
 .../och/bus/passenger/ui/video/VideoView.kt   | 167 +++++++++++++++
 .../src/main/res/layout/m1_main_fragment.xml  | 155 +++++++-------
 .../src/main/res/layout/m1_soft_fragment.xml  |   2 +
 .../src/main/res/layout/m1_video_fragment.xml |   2 +
 .../src/main/res/values/dimens.xml            |   1 +
 10 files changed, 545 insertions(+), 258 deletions(-)
 create mode 100644 OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/VideoView.kt

diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
index bf0c577ea2..c271afd4c0 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
@@ -22,7 +22,6 @@ import com.mogo.och.bus.passenger.callback.IClearViewCallback
 import com.mogo.och.bus.passenger.presenter.BusPassengerPresenter
 import com.mogo.och.bus.passenger.ui.bottom.BottomBar
 import com.mogo.och.bus.passenger.ui.bottom.BottomClickView
-import com.mogo.och.common.module.manager.debug.DebugViewWatchDogFragment
 import com.mogo.och.bus.passenger.ui.dialogfragment.M1CarUserNoOrderFragment
 import com.mogo.och.bus.passenger.ui.dialogfragment.M1ContainFragment
 import com.mogo.och.bus.passenger.ui.dialogfragment.NoviceGuidanceFragment
@@ -44,13 +43,17 @@ class MainFragment :
     private var noviceGuidanceFragment: WeakReference<NoviceGuidanceFragment>? = null
 
     private val endStation =
-        BitmapFactory.decodeResource(AbsMogoApplication.getApp().resources,
-            R.drawable.m1_small_map_view_dir_end)
+        BitmapFactory.decodeResource(
+            AbsMogoApplication.getApp().resources,
+            R.drawable.m1_small_map_view_dir_end
+        )
     private val lineTrajectory =
-        BitmapFactory.decodeResource(AbsMogoApplication.getApp().resources,
-            R.drawable.charter_p_trajectory_line)
+        BitmapFactory.decodeResource(
+            AbsMogoApplication.getApp().resources,
+            R.drawable.charter_p_trajectory_line
+        )
 
-    private val goneView = object : IClearViewCallback{
+    private val goneView = object : IClearViewCallback {
         override fun goneAllView() {
             bb_boorombar.setCheckIndex(BottomBar.SelectView.NONE)
         }
@@ -90,20 +93,20 @@ class MainFragment :
 
         })
 
-        bb_boorombar.setCheckChangeListener(object :BottomBar.ApplyClickLintener{
+        bb_boorombar.setCheckChangeListener(object : BottomBar.ApplyClickLintener {
             override fun onApplyClick(selectItem: BottomBar.SelectView) {
                 when (selectItem) {
                     BottomBar.SelectView.ORDERINFO -> showBizView(orderinfo = true)
                     BottomBar.SelectView.SETTING -> showBizView(softControl = true)
                     BottomBar.SelectView.LINE -> showBizView(selectLine = true)
-                    //BottomBar.SelectView.VIDEO -> TODO()
-                    else ->{
+                    BottomBar.SelectView.VIDEO -> showBizView(showVideo = true)
+                    else -> {
                         showBizView()
                     }
                 }
             }
         })
-        bb_boorombar.setApplyClickListener(object : BottomClickView.ApplyClickLintener{
+        bb_boorombar.setApplyClickListener(object : BottomClickView.ApplyClickLintener {
             override fun onApplyClick() {
                 bb_boorombar.setCheckIndex(BottomBar.SelectView.NONE)
             }
@@ -111,9 +114,10 @@ class MainFragment :
         biz_orderinfo.goneViewListener = goneView
         biz_softcontrol.goneViewListener = goneView
         biz_selectline.goneViewListener = goneView
+        biz_video.goneViewListener = goneView
 
-        aciv_enter_video.setOnClickListener{
-            openSettingPage(M1ContainFragment.VIDEOTAB)
+        aciv_enter_video.setOnClickListener {
+            bb_boorombar.setCheckIndex(BottomBar.SelectView.VIDEO)
         }
         aciv_map_2_default.setOnClickListener {
             omvOverMap.displayCustomOverView()
@@ -127,26 +131,36 @@ class MainFragment :
         }
     }
 
-    fun setCarMode(type: Int){
+    fun setCarMode(type: Int) {
         mPresenter?.setCarChangeListener(type)
     }
 
-    private fun showBizView(orderinfo:Boolean=false,softControl:Boolean=false,selectLine:Boolean=false){
-        if(orderinfo){
+    private fun showBizView(
+        orderinfo: Boolean = false,
+        softControl: Boolean = false,
+        selectLine: Boolean = false,
+        showVideo: Boolean = false
+    ) {
+        if (orderinfo) {
             biz_orderinfo.visibility = View.VISIBLE
-        }else{
+        } else {
             biz_orderinfo.visibility = View.GONE
         }
-        if(softControl){
+        if (softControl) {
             biz_softcontrol.visibility = View.VISIBLE
-        }else{
+        } else {
             biz_softcontrol.visibility = View.GONE
         }
-        if(selectLine){
+        if (selectLine) {
             biz_selectline.visibility = View.VISIBLE
-        }else{
+        } else {
             biz_selectline.visibility = View.GONE
         }
+        if (showVideo) {
+            biz_video.visibility = View.VISIBLE
+        } else {
+            biz_video.visibility = View.GONE
+        }
     }
 
     private fun openSettingPage(tab: String) {
@@ -154,10 +168,10 @@ class MainFragment :
             bpFunctionGroupDialogFragment = WeakReference(M1ContainFragment.newInstance())
         }
         val bpFunctionGroup = bpFunctionGroupDialogFragment?.get()
-        M1ContainFragment.openSettingPage(childFragmentManager,parentFragmentManager,bpFunctionGroup,tab)
+        M1ContainFragment.openSettingPage(childFragmentManager, parentFragmentManager, bpFunctionGroup, tab)
     }
 
-    fun setCarModle(rawInfo: Int){
+    fun setCarModle(rawInfo: Int) {
         getMapUIController()?.changeCurrentIcon(rawInfo)
         HdMapBuildConfig.currentCarVrIconRes = rawInfo
     }
@@ -174,9 +188,10 @@ class MainFragment :
 
     fun drawEndStation(latLng: LatLng) {
         val listOf = listOf(latLng)
-        omvOverMap.drawSiteMarkers(listOf,endStation,0.5f,1f)
+        omvOverMap.drawSiteMarkers(listOf, endStation, 0.5f, 1f)
     }
-    fun cleanEndStation(){
+
+    fun cleanEndStation() {
         omvOverMap.clearSiteMarkers()
         omvOverMap.clearCustomPolyline()
     }
@@ -220,23 +235,33 @@ class MainFragment :
             m1CarUserNoOrderFragment = WeakReference(M1CarUserNoOrderFragment.newInstance())
         }
         val m1CarUserNoOrderFragment = m1CarUserNoOrderFragment?.get()
-        M1CarUserNoOrderFragment.showOpenAndCloseDoor(childFragmentManager,parentFragmentManager,m1CarUserNoOrderFragment)
+        M1CarUserNoOrderFragment.showOpenAndCloseDoor(
+            childFragmentManager,
+            parentFragmentManager,
+            m1CarUserNoOrderFragment
+        )
     }
+
     fun showNoviceGuidanceFragment() {
         if (noviceGuidanceFragment?.get() == null) {
             noviceGuidanceFragment = WeakReference(NoviceGuidanceFragment.newInstance())
         }
         val noviceGuidanceFragmentWeak = noviceGuidanceFragment?.get()
-        NoviceGuidanceFragment.showNoviceGuidance(childFragmentManager,parentFragmentManager,noviceGuidanceFragmentWeak)
+        NoviceGuidanceFragment.showNoviceGuidance(
+            childFragmentManager,
+            parentFragmentManager,
+            noviceGuidanceFragmentWeak
+        )
     }
-    fun closeOpenAndCloseDoor(){
+
+    fun closeOpenAndCloseDoor() {
         val bpFunctionGroup = m1CarUserNoOrderFragment?.get()
         bpFunctionGroup?.let {
             bpFunctionGroup.dismissAllowingStateLoss()
         }
         UiThreadHandler.postDelayed({
             cleanEndStation()
-        },2_000)
+        }, 2_000)
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
@@ -249,15 +274,18 @@ class MainFragment :
             omvOverMap?.clearSiteNameViews()
             mPresenter?.drawEndStation()
         } else {
-            if(eventLineSites.lineInfo==null){//更新站点
+            if (eventLineSites.lineInfo == null) {//更新站点
                 mPresenter?.drawStationInfo(eventLineSites.sites!!)
-            }else{// 更新轨迹和站点
-                mPresenter?.getLineTrajectory(eventLineSites.lineInfo,eventLineSites.sites!!)
+            } else {// 更新轨迹和站点
+                mPresenter?.getLineTrajectory(eventLineSites.lineInfo, eventLineSites.sites!!)
             }
         }
     }
 
-    fun drawOverMapViewStation(stationsList: MutableList<SiteMarkerBean>,siteMarkers: List<SiteMarkerBean>?){
+    fun drawOverMapViewStation(
+        stationsList: MutableList<SiteMarkerBean>,
+        siteMarkers: List<SiteMarkerBean>?
+    ) {
         omvOverMap?.clearSiteMarkers()
         omvOverMap?.clearSiteNameViews()
         omvOverMap?.drawSiteMarkers(stationsList)
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlView.kt
index b9dea77481..2cfcf5f3e3 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlView.kt
@@ -76,7 +76,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
 
     private val TAG = "OrderInfoView"
 
-    private var viewModel:SoftControlViewModel?=null
+    private var viewModel: SoftControlViewModel? = null
 
     constructor(context: Context) : super(context)
 
@@ -95,7 +95,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
         defStyleRes: Int
     ) : super(context, attributeSet, defStyleAttr, defStyleRes)
 
-    var goneViewListener: IClearViewCallback?=null
+    var goneViewListener: IClearViewCallback? = null
 
     private var currentTemperature: Temperature? = null
 
@@ -106,12 +106,13 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
     private var subscribeAnimator: Disposable? = null
 
     private var animator1: ObjectAnimator? = null
-    
-    private val loadingAni = ObjectAnimator.ofFloat(iv_loading, "rotation", 0f, 90f ,180f, 270f, 360f).apply {
-        repeatCount = -1
-        interpolator = LinearInterpolator()
-        duration = 1000
-    }
+
+    private val loadingAni =
+        ObjectAnimator.ofFloat(iv_loading, "rotation", 0f, 90f, 180f, 270f, 360f).apply {
+            repeatCount = -1
+            interpolator = LinearInterpolator()
+            duration = 1000
+        }
 
 
     private fun initView() {
@@ -121,7 +122,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
         }
     }
 
-    private fun setViewGone(){
+    private fun setViewGone() {
         goneViewListener?.goneAllView()
     }
 
@@ -136,28 +137,31 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
                 R.id.tv_setting_aircondition -> {
                     g_light_setting.visibility = View.GONE
                     g_voice_setting.visibility = View.GONE
-                    if(loadingAni.isRunning){
+                    if (loadingAni.isRunning) {
                         iv_loading.visibility = View.VISIBLE
                         g_aircondition_setting.visibility = View.GONE
-                    }else{
+                    } else {
                         g_aircondition_setting.visibility = View.VISIBLE
                     }
                 }
+
                 R.id.tv_setting_lighting -> {
                     g_light_setting.visibility = View.VISIBLE
                     g_voice_setting.visibility = View.GONE
                     g_aircondition_setting.visibility = View.GONE
                     iv_loading.visibility = View.GONE
                 }
+
                 R.id.tv_setting_voice -> {
                     g_voice_setting.visibility = View.VISIBLE
                     g_aircondition_setting.visibility = View.GONE
                     g_light_setting.visibility = View.GONE
                     iv_loading.visibility = View.GONE
                 }
+
                 else -> {}
             }
-            if(rb_pattern_heating.isChecked){
+            if (rb_pattern_heating.isChecked) {
                 iv_temperature_select.visibility = View.GONE
             }
         }
@@ -169,9 +173,9 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
     }
 
 
-    fun setWind(check: RadioButton, resource:Int){
+    fun setWind(check: RadioButton, resource: Int) {
         check.isChecked = true
-        dbv_wind.setDrawableImage(BitmapFactory.decodeResource(resources,resource))
+        dbv_wind.setDrawableImage(BitmapFactory.decodeResource(resources, resource))
     }
 
     /**
@@ -191,18 +195,28 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
             layoutManager.setHorizontallyScroll(enable)
         }
         val adapter = rv_aircondition_temperature.adapter as TemperatureAdapter
-        if(enable){
+        if (enable) {
             adapter.setEnable(true)
-            if(tv_setting_aircondition.isChecked) {
-                if(iv_loading.visibility==View.GONE){
+            if (tv_setting_aircondition.isChecked) {
+                if (iv_loading.visibility == View.GONE) {
                     iv_temperature_select.visibility = View.VISIBLE
                 }
             }
-            rb_wind_speed_low.setTextColor(ContextCompat.getColorStateList(context,R.color.bus_p_function_airconditon_pattern_text_color_selector))
-        }else{
+            rb_wind_speed_low.setTextColor(
+                ContextCompat.getColorStateList(
+                    context,
+                    R.color.bus_p_function_airconditon_pattern_text_color_selector
+                )
+            )
+        } else {
             adapter.setEnable(false)
             iv_temperature_select.visibility = View.GONE
-            rb_wind_speed_low.setTextColor(ContextCompat.getColor(context,R.color.bus_p_m1_6647576e))
+            rb_wind_speed_low.setTextColor(
+                ContextCompat.getColor(
+                    context,
+                    R.color.bus_p_m1_6647576e
+                )
+            )
         }
     }
 
@@ -220,12 +234,15 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
                 rb_wind_speed_middle.toggle()
                 switch = 1
             }
+
             R.id.rb_wind_speed_middle -> {
                 switch = 1
             }
+
             R.id.rb_wind_speed_high -> {
                 switch = 2
             }
+
             else -> {
                 rb_wind_speed_middle.tag = M1SoftFragment.touchTag
                 rb_wind_speed_middle.toggle()
@@ -262,7 +279,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
         viewModel?.closeAircondition(modeCmd, windSpeedCmd, temperatureCmd)
     }
 
-    fun showAni(){
+    fun showAni() {
         iv_loading.visibility = View.VISIBLE
         loadingAni.target = iv_loading
         loadingAni.start()
@@ -272,9 +289,9 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
             .subscribe {
                 loadingAni.cancel()
                 iv_loading.visibility = View.GONE
-                if(tv_setting_aircondition.isChecked){
+                if (tv_setting_aircondition.isChecked) {
                     g_aircondition_setting.visibility = View.VISIBLE
-                    if(rb_pattern_heating.isChecked){
+                    if (rb_pattern_heating.isChecked) {
                         iv_temperature_select.visibility = View.GONE
                     }
                 }
@@ -308,7 +325,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
         viewModel?.openAndSetAircondition(modeCmd, windSpeedCmd, temperatureCmd)
     }
 
-    private fun setCheckAir(adapter: TemperatureAdapter, tag:Temperature){
+    private fun setCheckAir(adapter: TemperatureAdapter, tag: Temperature) {
         adapter.setCheckIndex(tag.index)
         currentTemperature = tag
         if (rv_aircondition_temperature.tag == M1SoftFragment.touchTag) {
@@ -325,7 +342,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
     // region 灯
     private fun setLightListener(viewModel: SoftControlViewModel?) {
         tv_light_top_01.setOnCheckedChangeListener { buttonView, isChecked ->
-            if(!buttonView.isPressed){
+            if (!buttonView.isPressed) {
                 return@setOnCheckedChangeListener
             }
             tv_light_top_01.isEnabled = false
@@ -336,26 +353,26 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
                 }
             SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di)
             viewModel?.setLightData1(isChecked)
-            setLightTop1View(isChecked,true)
-            setLightView(isChecked,tv_light_top_02.isChecked)
+            setLightTop1View(isChecked, true)
+            setLightView(isChecked, tv_light_top_02.isChecked)
         }
         tv_light_top_02.setOnCheckedChangeListener { buttonView, isChecked ->
-            if(!buttonView.isPressed){
+            if (!buttonView.isPressed) {
                 return@setOnCheckedChangeListener
             }
             tv_light_top_02.isEnabled = false
-            subscribeLightTop2 =  Observable.timer(2000, TimeUnit.MILLISECONDS)
+            subscribeLightTop2 = Observable.timer(2000, TimeUnit.MILLISECONDS)
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe {
                     tv_light_top_02.isEnabled = true
                 }
             SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di)
             viewModel?.setLightData2(isChecked)
-            setLightTop2View(isChecked,true)
-            setLightView(tv_light_top_01.isChecked,isChecked)
+            setLightTop2View(isChecked, true)
+            setLightView(tv_light_top_01.isChecked, isChecked)
         }
         tv_light_atmosphere.setOnCheckedChangeListener { buttonView, isChecked ->
-            if(!buttonView.isPressed){
+            if (!buttonView.isPressed) {
                 return@setOnCheckedChangeListener
             }
             tv_light_atmosphere.isEnabled = false
@@ -366,48 +383,50 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
                 }
             SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di)
             viewModel?.setAtmosphereLightData2(isChecked)
-            setLightAtmosphereView(isChecked,true)
+            setLightAtmosphereView(isChecked, true)
         }
     }
 
-    override fun setLightTop1View(leftLight: Boolean, isFirst: Boolean){
+    override fun setLightTop1View(leftLight: Boolean, isFirst: Boolean) {
         tv_light_top_01?.let {
             if (leftLight) {
                 tv_light_top_01.text = context.getString(R.string.bus_p_m1_close_light1)
                 tv_light_top_01.isChecked = true
-                if(!isFirst) ToastCharterUtils.showShort("打开顶灯1")
+                if (!isFirst) ToastCharterUtils.showShort("打开顶灯1")
             } else {
                 tv_light_top_01.text = context.getString(R.string.bus_p_m1_open_light1)
                 tv_light_top_01.isChecked = false
-                if(!isFirst) ToastCharterUtils.showShort("关闭顶灯1")
+                if (!isFirst) ToastCharterUtils.showShort("关闭顶灯1")
             }
         }
     }
-    override fun setLightTop2View(rightLight: Boolean, isFirst: Boolean){
+
+    override fun setLightTop2View(rightLight: Boolean, isFirst: Boolean) {
         tv_light_top_02?.let {
             if (rightLight) {
                 tv_light_top_02.text = context.getString(R.string.bus_p_m1_close_light2)
                 tv_light_top_02.isChecked = true
-                if(!isFirst) ToastCharterUtils.showShort("打开顶灯2")
+                if (!isFirst) ToastCharterUtils.showShort("打开顶灯2")
             } else {
                 tv_light_top_02.text = context.getString(R.string.bus_p_m1_open_light2)
                 tv_light_top_02.isChecked = false
-                if(!isFirst) ToastCharterUtils.showShort("关闭顶灯2")
+                if (!isFirst) ToastCharterUtils.showShort("关闭顶灯2")
             }
         }
     }
-    override fun setLightAtmosphereView(atmosphereLight: Boolean, isFirst: Boolean){
+
+    override fun setLightAtmosphereView(atmosphereLight: Boolean, isFirst: Boolean) {
         tv_light_atmosphere?.let {
             if (atmosphereLight) {
                 tv_light_atmosphere.text = context.getString(R.string.bus_p_m1_close_atmosphere)
                 tv_light_atmosphere.isChecked = true
                 iv_bottom_light_setting.setImageResource(R.drawable.bus_p_function_atmosphere_select)
-                if(!isFirst) ToastCharterUtils.showShort("打开氛围灯")
+                if (!isFirst) ToastCharterUtils.showShort("打开氛围灯")
             } else {
                 tv_light_atmosphere.text = context.getString(R.string.bus_p_m1_open_atmosphere)
                 tv_light_atmosphere.isChecked = false
                 iv_bottom_light_setting.setImageResource(R.drawable.bus_p_function_atmosphere_nor)
-                if(!isFirst) ToastCharterUtils.showShort("关闭氛围灯")
+                if (!isFirst) ToastCharterUtils.showShort("关闭氛围灯")
             }
         }
     }
@@ -506,7 +525,6 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
     // endregion
 
 
-
     private fun setAirConditionAni() {
         dbv_wind.post {
             dbv_wind?.let {
@@ -514,7 +532,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
                 animator1 = ObjectAnimator.ofInt(it, "showHeight", 0, measuredHeight).apply {
                     duration = 1000
                     repeatCount = ValueAnimator.INFINITE
-                    if(rg_setting_windspeed.checkedRadioButtonId!=0&&tv_aircondition_switch.isChecked){
+                    if (rg_setting_windspeed.checkedRadioButtonId != 0 && tv_aircondition_switch.isChecked) {
                         start()
                     }
                 }
@@ -525,11 +543,11 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
     private fun setAirconditionListener(viewModel: SoftControlViewModel?) {
         // 开关空调或暖风机
         tv_aircondition_switch.setOnCheckedChangeListener { buttonView, isChecked ->
-            if(!buttonView.isPressed){
+            if (!buttonView.isPressed) {
                 return@setOnCheckedChangeListener
             }
             SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di)
-            if(isChecked){//打开
+            if (isChecked) {//打开
                 tv_aircondition_switch.setText("关闭空调")
                 if (rg_setting_pattern.checkedRadioButtonId == R.id.rb_pattern_heating) {
                     openHeater()// 打开暖风机
@@ -537,7 +555,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
                     openAircondition()// 打开空调
                 }
                 showAni()
-            }else{// 关闭
+            } else {// 关闭
                 tv_aircondition_switch.setText("打开空调")
                 closeHeater()// 关闭暖风机
                 closeAircondition()//关闭空调
@@ -548,38 +566,42 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
             CallerLogger.d(SceneConstant.M_BUS_P + M1SoftFragment.TAG, "调节模式")
             when (checkedId) {
                 R.id.rb_pattern_heating -> {
-                    if(!rb_pattern_heating.isPressed){
+                    if (!rb_pattern_heating.isPressed) {
                         return@setOnCheckedChangeListener
                     }
                     SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di)
                     openHeater()
                 }
-                R.id.rb_pattern_automatic->{
-                    if(!rb_pattern_automatic.isPressed){
+
+                R.id.rb_pattern_automatic -> {
+                    if (!rb_pattern_automatic.isPressed) {
                         return@setOnCheckedChangeListener
                     }
                     SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di)
                     openAircondition()
                 }
-                R.id.rb_pattern_refrigeration->{
-                    if(!rb_pattern_refrigeration.isPressed){
+
+                R.id.rb_pattern_refrigeration -> {
+                    if (!rb_pattern_refrigeration.isPressed) {
                         return@setOnCheckedChangeListener
                     }
                     SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di)
                     openAircondition()
                 }
-                R.id.rb_pattern_ventilate->{
-                    if(!rb_pattern_ventilate.isPressed){
+
+                R.id.rb_pattern_ventilate -> {
+                    if (!rb_pattern_ventilate.isPressed) {
                         return@setOnCheckedChangeListener
                     }
                     SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di)
                     openAircondition()
                 }
+
                 else -> {
                     openAircondition()
                 }
             }
-            if(tv_aircondition_switch.isChecked) {
+            if (tv_aircondition_switch.isChecked) {
                 showAni()
             }
         }
@@ -587,21 +609,24 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
         // 风速调节
         rg_setting_windspeed.setOnCheckedChangeListener { group, checkedId ->
             when (checkedId) {
-                R.id.rb_wind_speed_low-> {
-                    if(!rb_wind_speed_low.isPressed){
+                R.id.rb_wind_speed_low -> {
+                    if (!rb_wind_speed_low.isPressed) {
                         return@setOnCheckedChangeListener
                     }
                 }
-                R.id.rb_wind_speed_middle-> {
-                    if(!rb_wind_speed_middle.isPressed){
+
+                R.id.rb_wind_speed_middle -> {
+                    if (!rb_wind_speed_middle.isPressed) {
                         return@setOnCheckedChangeListener
                     }
                 }
-                R.id.rb_wind_speed_high-> {
-                    if(!rb_wind_speed_high.isPressed){
+
+                R.id.rb_wind_speed_high -> {
+                    if (!rb_wind_speed_high.isPressed) {
                         return@setOnCheckedChangeListener
                     }
                 }
+
                 else -> {}
             }
             SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di)
@@ -628,7 +653,8 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
         rv_aircondition_temperature.layoutManager = pickerLayoutManager
         rv_aircondition_temperature.adapter = adapter
         HorizontalDecoration.distance = SharedPrefsMgr.getInstance(context).getInt(
-            HorizontalDecoration.distancekey,0)
+            HorizontalDecoration.distancekey, 0
+        )
         val space = AutoSizeUtils.dp2px(context, 15f)
         rv_aircondition_temperature.addItemDecoration(
             HorizontalDecoration(
@@ -643,25 +669,25 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
                 val tag = view.tag
                 if (tag is Temperature) {
                     RxUtils.disposeSubscribe(subscribeAir)
-                    if(tag.index==0||tag.index==adapter.data.size-1){
+                    if (tag.index == 0 || tag.index == adapter.data.size - 1) {
                         subscribeAir = Observable.timer(200, TimeUnit.MILLISECONDS)
                             .observeOn(AndroidSchedulers.mainThread())
                             .subscribe {
-                                setCheckAir(adapter,tag)
+                                setCheckAir(adapter, tag)
                             }
-                    }else {
+                    } else {
                         if (ClickUtils.isClickTooFrequent(rv_aircondition_temperature)) {
                             return@setOnScrollStopListener
                         }
-                        setCheckAir(adapter,tag)
+                        setCheckAir(adapter, tag)
                     }
                 }
 
             }
         }
-        if(HorizontalDecoration.distance!=0){
-            rv_aircondition_temperature.scrollToPosition(data.size-1)
-            adapter.setCheckIndex(data.size-1)
+        if (HorizontalDecoration.distance != 0) {
+            rv_aircondition_temperature.scrollToPosition(data.size - 1)
+            adapter.setCheckIndex(data.size - 1)
         }
     }
 
@@ -718,27 +744,39 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
                             rv_aircondition_temperature.tag = M1SoftFragment.touchTag
                             UiThreadHandler.postDelayed({
                                 rv_aircondition_temperature?.smoothScrollToPosition(it.index)
-                            },500)
+                            }, 500)
                         }
                     }
                 }
                 when (pattern) {//1: 自动模式, 2: 制冷模式, 3: 通风模式（仅送风，无温度）
-                    1 -> {rb_pattern_automatic.isChecked = true}
-                    2 -> {rb_pattern_refrigeration.isChecked = true}
-                    3 -> {rb_pattern_ventilate.isChecked = true}
+                    1 -> {
+                        rb_pattern_automatic.isChecked = true
+                    }
+
+                    2 -> {
+                        rb_pattern_refrigeration.isChecked = true
+                    }
+
+                    3 -> {
+                        rb_pattern_ventilate.isChecked = true
+                    }
+
                     else -> {}
                 }
                 heaterAirEnable(true)
                 when (windSpeed) {//1: 1档，2: 2档，3:3档
                     1 -> {
-                        setWind(rb_wind_speed_low,R.drawable.bus_pm1_aircondition_wind_low)
+                        setWind(rb_wind_speed_low, R.drawable.bus_pm1_aircondition_wind_low)
                     }
+
                     2 -> {
-                        setWind(rb_wind_speed_middle,R.drawable.bus_pm1_aircondition_wind_middle)
+                        setWind(rb_wind_speed_middle, R.drawable.bus_pm1_aircondition_wind_middle)
                     }
+
                     3 -> {
-                        setWind(rb_wind_speed_high,R.drawable.bus_pm1_aircondition_wind_high)
+                        setWind(rb_wind_speed_high, R.drawable.bus_pm1_aircondition_wind_high)
                     }
+
                     else -> {}
                 }
             }
@@ -747,11 +785,13 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
                 heaterAirEnable(false)
                 when (windSpeed) {//1: 1档，2: 2档
                     1 -> {
-                        setWind(rb_wind_speed_middle,R.drawable.bus_pm1_warm_wind_middle)
+                        setWind(rb_wind_speed_middle, R.drawable.bus_pm1_warm_wind_middle)
                     }
+
                     2 -> {
-                        setWind(rb_wind_speed_high,R.drawable.bus_pm1_warm_wind_high)
+                        setWind(rb_wind_speed_high, R.drawable.bus_pm1_warm_wind_high)
                     }
+
                     else -> {}
                 }
             }
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlViewModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlViewModel.kt
index e1ed48616f..e7eea21b46 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlViewModel.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlViewModel.kt
@@ -14,18 +14,18 @@ import com.mogo.och.common.module.manager.devicemanage.data.LightStatus
 import com.mogo.och.common.module.utils.RxUtils
 import io.reactivex.disposables.Disposable
 
-class SoftControlViewModel: ViewModel(), LightAirconditionDoorCallback {
+class SoftControlViewModel : ViewModel(), LightAirconditionDoorCallback {
 
     private val TAG = SoftControlViewModel::class.java.simpleName
 
-    private var viewCallback:SoftControlCallback?=null
+    private var viewCallback: SoftControlCallback? = null
 
-    private var subscribeLightTop1: Disposable?=null
-    private var subscribeLightTop2: Disposable?=null
-    private var subscribeLightAtmosphere: Disposable?=null
+    private var subscribeLightTop1: Disposable? = null
+    private var subscribeLightTop2: Disposable? = null
+    private var subscribeLightAtmosphere: Disposable? = null
 
-    private var airconditionDisposable: Disposable?=null
-    private var heaterDisposable: Disposable?=null
+    private var airconditionDisposable: Disposable? = null
+    private var heaterDisposable: Disposable? = null
 
 
     init {
@@ -38,7 +38,7 @@ class SoftControlViewModel: ViewModel(), LightAirconditionDoorCallback {
         LightAirconditionDoorStatusManager.removeListener(TAG)
     }
 
-    fun setViewCallback(viewCallback:SoftControlCallback){
+    fun setViewCallback(viewCallback: SoftControlCallback) {
         this.viewCallback = viewCallback
         LightAirconditionDoorStatusManager.addListener(TAG, this)
     }
@@ -46,14 +46,20 @@ class SoftControlViewModel: ViewModel(), LightAirconditionDoorCallback {
     /**
      * 空调状态变化
      */
-    override fun onAirconditionStatusCallback(heaterIsOpen: Boolean, airconditionStatus: AirconditionStatus, isFirst: Boolean) {
-        CallerLogger.d(M_BUS_P + TAG,
+    override fun onAirconditionStatusCallback(
+        heaterIsOpen: Boolean,
+        airconditionStatus: AirconditionStatus,
+        isFirst: Boolean
+    ) {
+        CallerLogger.d(
+            M_BUS_P + TAG,
             "回写--空调开关:${LightAirconditionDoorStatusManager.airconditionStatus.isOpen}、" +
                     "空调温度:${LightAirconditionDoorStatusManager.airconditionStatus.temperature}" +
                     "空调模式:${LightAirconditionDoorStatusManager.airconditionStatus.pattert}" +
-                    "空调风速:${LightAirconditionDoorStatusManager.airconditionStatus.windSpeed}")
+                    "空调风速:${LightAirconditionDoorStatusManager.airconditionStatus.windSpeed}"
+        )
         UiThreadHandler.post {
-            if(airconditionStatus.isOpen){
+            if (airconditionStatus.isOpen) {
                 viewCallback?.setAirconditionHeaterView(
                     airconditionStatus.isOpen,
                     heaterIsOpen,
@@ -61,7 +67,7 @@ class SoftControlViewModel: ViewModel(), LightAirconditionDoorCallback {
                     airconditionStatus.pattert,
                     airconditionStatus.windSpeed
                 )
-            }else{
+            } else {
                 viewCallback?.setAirconditionHeaterView(
                     airconditionStatus.isOpen,
                     heaterIsOpen,
@@ -72,15 +78,22 @@ class SoftControlViewModel: ViewModel(), LightAirconditionDoorCallback {
             }
         }
     }
+
     /**
      * 暖风机状态变化
      */
-    override fun onHeaterStatusCallback(airconditionIsOpen:Boolean, heaterStatue: HeaterStatue, isFirst: Boolean) {
-        CallerLogger.d(M_BUS_P + TAG,
+    override fun onHeaterStatusCallback(
+        airconditionIsOpen: Boolean,
+        heaterStatue: HeaterStatue,
+        isFirst: Boolean
+    ) {
+        CallerLogger.d(
+            M_BUS_P + TAG,
             "回写--暖风机开关:${heaterStatue.isOpen}、" +
-                    "风速:${heaterStatue.windSpeed}")
+                    "风速:${heaterStatue.windSpeed}"
+        )
         UiThreadHandler.post {
-            if(heaterStatue.isOpen) {
+            if (heaterStatue.isOpen) {
                 viewCallback?.setAirconditionHeaterView(
                     airconditionIsOpen,
                     heaterStatue.isOpen,
@@ -88,7 +101,7 @@ class SoftControlViewModel: ViewModel(), LightAirconditionDoorCallback {
                     0,
                     heaterStatue.windSpeed
                 )
-            }else{
+            } else {
                 viewCallback?.setAirconditionHeaterView(
                     airconditionIsOpen,
                     heaterStatue.isOpen,
@@ -99,41 +112,50 @@ class SoftControlViewModel: ViewModel(), LightAirconditionDoorCallback {
             }
         }
     }
+
     /**
      * 灯状态变化
      */
     override fun onLightTop1Callback(lightStatus: LightStatus, isFirst: Boolean) {
-        CallerLogger.d(M_BUS_P + TAG,
+        CallerLogger.d(
+            M_BUS_P + TAG,
             "回写--顶灯1开关:${lightStatus.isOpenLight1}、" +
                     "顶灯2开关:${lightStatus.isOpenLight2}、" +
-                    "氛围灯开关:${lightStatus.isOpenatmosphere}、")
+                    "氛围灯开关:${lightStatus.isOpenatmosphere}、"
+        )
         UiThreadHandler.post {
-            viewCallback?.setLightTop1View(lightStatus.isOpenLight1,isFirst)
+            viewCallback?.setLightTop1View(lightStatus.isOpenLight1, isFirst)
         }
     }
+
     /**
      * 灯状态变化
      */
     override fun onLightTop2Callback(lightStatus: LightStatus, isFirst: Boolean) {
-        CallerLogger.d(M_BUS_P + TAG,
+        CallerLogger.d(
+            M_BUS_P + TAG,
             "回写--顶灯1开关:${lightStatus.isOpenLight1}、" +
                     "顶灯2开关:${lightStatus.isOpenLight2}、" +
-                    "氛围灯开关:${lightStatus.isOpenatmosphere}、")
+                    "氛围灯开关:${lightStatus.isOpenatmosphere}、"
+        )
         UiThreadHandler.post {
-            viewCallback?.setLightTop2View(lightStatus.isOpenLight2,isFirst)
-            viewCallback?.setLightView(lightStatus.isOpenLight1,lightStatus.isOpenLight2)
+            viewCallback?.setLightTop2View(lightStatus.isOpenLight2, isFirst)
+            viewCallback?.setLightView(lightStatus.isOpenLight1, lightStatus.isOpenLight2)
         }
     }
+
     /**
      * 灯状态变化
      */
     override fun onLightAtmosphereCallback(lightStatus: LightStatus, isFirst: Boolean) {
-        CallerLogger.d(M_BUS_P + TAG,
+        CallerLogger.d(
+            M_BUS_P + TAG,
             "回写--顶灯1开关:${lightStatus.isOpenLight1}、" +
                     "顶灯2开关:${lightStatus.isOpenLight2}、" +
-                    "氛围灯开关:${lightStatus.isOpenatmosphere}、")
+                    "氛围灯开关:${lightStatus.isOpenatmosphere}、"
+        )
         UiThreadHandler.post {
-            viewCallback?.setLightAtmosphereView(lightStatus.isOpenatmosphere,isFirst)
+            viewCallback?.setLightAtmosphereView(lightStatus.isOpenatmosphere, isFirst)
         }
     }
 
@@ -141,106 +163,124 @@ class SoftControlViewModel: ViewModel(), LightAirconditionDoorCallback {
      * 设置空调
      */
     fun openAndSetAircondition(modeCmd: Int, windSpeedCmd: Int, temperatureCmd: Int) {
-        CallerLogger.d(M_BUS_P + TAG, "" +
-                "打开空调，模式$modeCmd--档位${windSpeedCmd}--温度:$temperatureCmd")
-        CallerAutoPilotControlManager.sendRoboBusJinlvM1AirConditionerCmd(1,modeCmd,windSpeedCmd,temperatureCmd)
+        CallerLogger.d(
+            M_BUS_P + TAG, "" +
+                    "打开空调，模式$modeCmd--档位${windSpeedCmd}--温度:$temperatureCmd"
+        )
+        CallerAutoPilotControlManager.sendRoboBusJinlvM1AirConditionerCmd(
+            1,
+            modeCmd,
+            windSpeedCmd,
+            temperatureCmd
+        )
         RxUtils.disposeSubscribe(airconditionDisposable)
-        airconditionDisposable = RxUtils.createSubscribe(10000){
-            if (!LightAirconditionDoorStatusManager.airconditionStatus.isOpen&&
-                LightAirconditionDoorStatusManager.airconditionStatus.windSpeed!=windSpeedCmd&&
-                LightAirconditionDoorStatusManager.airconditionStatus.temperature!=temperatureCmd&&
-                LightAirconditionDoorStatusManager.airconditionStatus.pattert!=modeCmd) {
+        airconditionDisposable = RxUtils.createSubscribe(10000) {
+            if (!LightAirconditionDoorStatusManager.airconditionStatus.isOpen &&
+                LightAirconditionDoorStatusManager.airconditionStatus.windSpeed != windSpeedCmd &&
+                LightAirconditionDoorStatusManager.airconditionStatus.temperature != temperatureCmd &&
+                LightAirconditionDoorStatusManager.airconditionStatus.pattert != modeCmd
+            ) {
                 ToastCharterUtils.showShort("控制系统繁忙，请稍后再试")
             }
         }
     }
+
     fun closeAircondition(modeCmd: Int, windSpeedCmd: Int, temperatureCmd: Int) {
         CallerLogger.d(M_BUS_P + TAG, "关闭空调")
-        CallerAutoPilotControlManager.sendRoboBusJinlvM1AirConditionerCmd(2,modeCmd,windSpeedCmd,temperatureCmd)
+        CallerAutoPilotControlManager.sendRoboBusJinlvM1AirConditionerCmd(
+            2,
+            modeCmd,
+            windSpeedCmd,
+            temperatureCmd
+        )
         RxUtils.disposeSubscribe(airconditionDisposable)
-        airconditionDisposable = RxUtils.createSubscribe(10000){
+        airconditionDisposable = RxUtils.createSubscribe(10000) {
             if (LightAirconditionDoorStatusManager.airconditionStatus.isOpen) {
                 ToastCharterUtils.showShort("控制系统繁忙，请稍后再试")
             }
         }
     }
+
     /**
      * 设置暖风
      */
     fun openAndSetHeader(windSpeedCmd: Int) {
         CallerLogger.d(M_BUS_P + TAG, "打开暖风机、档位${windSpeedCmd}")
-        CallerAutoPilotControlManager.sendRoboBusJinlvM1HeaderCmd(1,windSpeedCmd)
+        CallerAutoPilotControlManager.sendRoboBusJinlvM1HeaderCmd(1, windSpeedCmd)
         RxUtils.disposeSubscribe(heaterDisposable)
-        heaterDisposable = RxUtils.createSubscribe(10000){
-            if (!LightAirconditionDoorStatusManager.heaterStatue.isOpen&&
-                LightAirconditionDoorStatusManager.heaterStatue.windSpeed!=windSpeedCmd) {
+        heaterDisposable = RxUtils.createSubscribe(10000) {
+            if (!LightAirconditionDoorStatusManager.heaterStatue.isOpen &&
+                LightAirconditionDoorStatusManager.heaterStatue.windSpeed != windSpeedCmd
+            ) {
                 ToastCharterUtils.showShort("暖风机操作未生效，请稍后重试吧～")
             }
         }
     }
 
-    fun closeHeader(){
+    fun closeHeader() {
         CallerLogger.d(M_BUS_P + TAG, "关闭暖风机")
-        CallerAutoPilotControlManager.sendRoboBusJinlvM1HeaderCmd(2,0)
+        CallerAutoPilotControlManager.sendRoboBusJinlvM1HeaderCmd(2, 0)
         RxUtils.disposeSubscribe(heaterDisposable)
-        heaterDisposable = RxUtils.createSubscribe(10000){
+        heaterDisposable = RxUtils.createSubscribe(10000) {
             if (LightAirconditionDoorStatusManager.heaterStatue.isOpen) {
                 ToastCharterUtils.showShort("暖风机操作未生效，请稍后重试吧～")//还是开着的
             }
         }
     }
 
-    fun setLightData1(leftLight: Boolean){
+    fun setLightData1(leftLight: Boolean) {
         CallerLogger.d(M_BUS_P + TAG, "顶灯2:$leftLight")
         RxUtils.disposeSubscribe(subscribeLightTop1)
-        subscribeLightTop1 = if(leftLight){
+        subscribeLightTop1 = if (leftLight) {
             CallerAutoPilotControlManager.sendRoboBusJinlvM1MainLamp1Cmd(1)
-            RxUtils.createSubscribe{
+            RxUtils.createSubscribe {
                 if (!LightAirconditionDoorStatusManager.lightStatus.isOpenLight1) {
                     ToastCharterUtils.showShort("控制系统繁忙，请稍后再试")
                 }
             }
-        }else{
+        } else {
             CallerAutoPilotControlManager.sendRoboBusJinlvM1MainLamp1Cmd(2)
-            RxUtils.createSubscribe{
+            RxUtils.createSubscribe {
                 if (LightAirconditionDoorStatusManager.lightStatus.isOpenLight1) {
                     ToastCharterUtils.showShort("控制系统繁忙，请稍后再试")
                 }
             }
         }
     }
-    fun setLightData2(rightLight: Boolean){
+
+    fun setLightData2(rightLight: Boolean) {
         CallerLogger.d(M_BUS_P + TAG, "顶灯1:$rightLight")
         RxUtils.disposeSubscribe(subscribeLightTop2)
-        subscribeLightTop2 = if(rightLight){
+        subscribeLightTop2 = if (rightLight) {
             CallerAutoPilotControlManager.sendRoboBusJinlvM1MainLamp2Cmd(1)
-            RxUtils.createSubscribe{
+            RxUtils.createSubscribe {
                 if (!LightAirconditionDoorStatusManager.lightStatus.isOpenLight2) {
                     ToastCharterUtils.showShort("控制系统繁忙，请稍后再试")
                 }
             }
-        }else{
+        } else {
             CallerAutoPilotControlManager.sendRoboBusJinlvM1MainLamp2Cmd(2)
-            RxUtils.createSubscribe{
+            RxUtils.createSubscribe {
                 if (LightAirconditionDoorStatusManager.lightStatus.isOpenLight2) {
                     ToastCharterUtils.showShort("控制系统繁忙，请稍后再试")
                 }
             }
         }
     }
-    fun setAtmosphereLightData2(atmosphereLight: Boolean){
+
+    fun setAtmosphereLightData2(atmosphereLight: Boolean) {
         CallerLogger.d(M_BUS_P + TAG, "氛围灯:$atmosphereLight")
         RxUtils.disposeSubscribe(subscribeLightAtmosphere)
         subscribeLightAtmosphere = if (atmosphereLight) {
             CallerAutoPilotControlManager.sendRoboBusJinlvM1SmallLampCmd(1)
-            RxUtils.createSubscribe{
+            RxUtils.createSubscribe {
                 if (!LightAirconditionDoorStatusManager.lightStatus.isOpenatmosphere) {
                     ToastCharterUtils.showShort("控制系统繁忙，请稍后再试")
                 }
             }
         } else {
             CallerAutoPilotControlManager.sendRoboBusJinlvM1SmallLampCmd(2)
-            RxUtils.createSubscribe{
+            RxUtils.createSubscribe {
                 if (LightAirconditionDoorStatusManager.lightStatus.isOpenatmosphere) {
                     ToastCharterUtils.showShort("控制系统繁忙，请稍后再试")
                 }
@@ -249,8 +289,7 @@ class SoftControlViewModel: ViewModel(), LightAirconditionDoorCallback {
     }
 
 
-
-    interface SoftControlCallback{
+    interface SoftControlCallback {
         /**
          * 根据车的状态会写页面状态
          */
@@ -261,6 +300,7 @@ class SoftControlViewModel: ViewModel(), LightAirconditionDoorCallback {
             pattern: Int,
             windSpeed: Int
         )
+
         fun setLightTop1View(leftLight: Boolean, isFirst: Boolean)
         fun setLightTop2View(rightLight: Boolean, isFirst: Boolean)
         fun setLightView(leftLight: Boolean, rightLight: Boolean)
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/CarouselLayoutManager.java b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/CarouselLayoutManager.java
index 341a00cc13..a3b734dddd 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/CarouselLayoutManager.java
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/CarouselLayoutManager.java
@@ -288,7 +288,7 @@ public class CarouselLayoutManager extends RecyclerView.LayoutManager implements
      * <br />
      * This method may do relayout work.
      *
-     * @param diff    要滚动的距离
+     * @param diff     要滚动的距离
      * @param recycler 回收期
      * @param state    Transient state of RecyclerView
      * @return distance that we actually scrolled by
@@ -449,8 +449,8 @@ public class CarouselLayoutManager extends RecyclerView.LayoutManager implements
     private void detectOnItemSelectionChanged(final float currentScrollPosition, final RecyclerView.State state) {
         final float absCurrentScrollPosition = makeScrollPositionInRange0ToCount(currentScrollPosition, state.getItemCount());
         final int centerItem = Math.round(absCurrentScrollPosition);
-        if(currentScrollPosition-centerItem!=0){
-            new Handler(Looper.getMainLooper()).post(() -> dragDxDiff(currentScrollPosition,mCenterItemPosition));
+        if (currentScrollPosition - centerItem != 0) {
+            new Handler(Looper.getMainLooper()).post(() -> dragDxDiff(currentScrollPosition, mCenterItemPosition));
         }
         if (mCenterItemPosition != centerItem) {
             mCenterItemPosition = centerItem;
@@ -468,9 +468,10 @@ public class CarouselLayoutManager extends RecyclerView.LayoutManager implements
             onCenterItemSelectionListener.onCenterItemChanged(centerItem);
         }
     }
-    private void dragDxDiff(final float centerItem,final int currentPosition) {
+
+    private void dragDxDiff(final float centerItem, final int currentPosition) {
         for (final OnDargAutoDiffListener onDargAutoDiffListener : onDargAutoDiffListeners) {
-            onDargAutoDiffListener.onDxChanged(centerItem,currentPosition);
+            onDargAutoDiffListener.onDxChanged(centerItem, currentPosition);
         }
     }
 
@@ -522,7 +523,7 @@ public class CarouselLayoutManager extends RecyclerView.LayoutManager implements
             view.setScaleY(transformation.mScaleY);
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                 view.setTransitionAlpha(transformation.mAlpha);
-            }else {
+            } else {
                 view.setAlpha(transformation.mAlpha);
             }
         }
@@ -804,7 +805,7 @@ public class CarouselLayoutManager extends RecyclerView.LayoutManager implements
     }
 
     public interface OnDargAutoDiffListener {
-        void onDxChanged(final float adapterPosition,final int currentPosition);
+        void onDxChanged(final float adapterPosition, final int currentPosition);
     }
 
     /**
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/view/DrawBitmapView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/view/DrawBitmapView.kt
index be17245bc4..a369c95154 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/view/DrawBitmapView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/view/DrawBitmapView.kt
@@ -10,14 +10,14 @@ import android.view.View
 import com.mogo.och.bus.passenger.R
 
 
-class DrawBitmapView  @JvmOverloads constructor(
+class DrawBitmapView @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
 ) : View(context, attrs, defStyleAttr) {
     private lateinit var mBitmap: Bitmap
     private lateinit var mBitPaint: Paint
-    private var drawBitmapViewResource =  R.drawable.bus_pm1_aircondition_wind_high
+    private var drawBitmapViewResource = R.drawable.bus_pm1_aircondition_wind_high
     private var mBitWidth = 0
     private var showHeight = 0
         set(value) {
@@ -27,13 +27,16 @@ class DrawBitmapView  @JvmOverloads constructor(
 
     init {
         val typedArray = context.obtainStyledAttributes(attrs, R.styleable.MainWindStatus)
-        drawBitmapViewResource = typedArray.getResourceId(R.styleable.MainWindStatus_main_wind_drawable,R.drawable.bus_pm1_aircondition_wind_high)
+        drawBitmapViewResource = typedArray.getResourceId(
+            R.styleable.MainWindStatus_main_wind_drawable,
+            R.drawable.bus_pm1_aircondition_wind_high
+        )
         typedArray.recycle()
         initBitmap()
         initPaint()
     }
 
-    fun setDrawableImage(bitmap: Bitmap){
+    fun setDrawableImage(bitmap: Bitmap) {
         mBitmap = bitmap
     }
 
@@ -51,7 +54,7 @@ class DrawBitmapView  @JvmOverloads constructor(
     override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
         canvas.clipRect(0, 0, mBitWidth, showHeight)
-        canvas.drawBitmap(mBitmap, (width-mBitmap.width)/2f, 0f, mBitPaint)
+        canvas.drawBitmap(mBitmap, (width - mBitmap.width) / 2f, 0f, mBitPaint)
     }
 
 }
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/VideoView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/VideoView.kt
new file mode 100644
index 0000000000..098bb93864
--- /dev/null
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/VideoView.kt
@@ -0,0 +1,167 @@
+package com.mogo.och.bus.passenger.ui.video
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.recyclerview.widget.RecyclerView
+import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
+import com.mogo.eagle.core.utilcode.kotlin.onClick
+import com.mogo.och.bus.passenger.R
+import com.mogo.och.bus.passenger.bean.TaxiPassengerVideoPlay
+import com.mogo.och.bus.passenger.callback.IClearViewCallback
+import com.mogo.och.bus.passenger.ui.softcontrol.layoutmanage.CarouselLayoutManager
+import com.mogo.och.bus.passenger.ui.softcontrol.layoutmanage.CarouselZoomPostLayoutListener
+import com.mogo.och.bus.passenger.ui.softcontrol.layoutmanage.CenterScrollListener
+import com.mogo.och.bus.passenger.ui.video.adapter.RecyclerVideoAdapter
+import com.shuyu.gsyvideoplayer.video.base.GSYVideoView
+import kotlinx.android.synthetic.main.m1_video_fragment.view.rvVideoPlaylist
+import kotlin.math.floor
+
+class VideoView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr), IMoGoAutopilotStatusListener {
+
+    companion object {
+        const val TAG = "DebugView"
+    }
+
+    private val arrayListOf = ArrayList<TaxiPassengerVideoPlay>()
+
+    var goneViewListener: IClearViewCallback? = null
+
+    init {
+        LayoutInflater.from(context).inflate(R.layout.m1_video_fragment, this, true)
+        onClick {
+            goneViewListener?.goneAllView()
+        }
+        initConsultData()
+        val carouselLayoutManager = CarouselLayoutManager(CarouselLayoutManager.HORIZONTAL, true)
+        carouselLayoutManager.setPostLayoutListener(CarouselZoomPostLayoutListener())
+        carouselLayoutManager.maxVisibleItems = 1
+        rvVideoPlaylist.addOnScrollListener(object : CenterScrollListener() {
+            var prePlayerPosition = 0
+            override fun pageSelect(recyclerView: RecyclerView?, newState: Int) {
+                //播放视频
+                val (centerItemPosition, player) = getPlayer(carouselLayoutManager)
+                if (player is ConsultVideoPlayer) {
+                    if (prePlayerPosition != centerItemPosition) {
+                        if (player.currentState == GSYVideoView.CURRENT_STATE_PAUSE) {
+                            player.onVideoReset()
+                        }
+                        val playerHolder =
+                            carouselLayoutManager.findViewByPosition(prePlayerPosition)
+                        val prePlayer =
+                            playerHolder?.findViewById<ConsultVideoPlayer>(R.id.video_item_player)
+                        prePlayer?.onVideoReset()
+                    } else {
+                        player.onVideoResume(false)
+                    }
+                }
+                prePlayerPosition = centerItemPosition
+            }
+
+            override fun pageStop() {
+                val (_, player) = getPlayer(carouselLayoutManager)
+                if (player is ConsultVideoPlayer) {
+                    player.onVideoPause()
+                }
+            }
+
+        })
+        carouselLayoutManager.addOnDargAutoDiffListener { adapterPosition, currentPosition ->
+            val fl = adapterPosition - floor(adapterPosition)
+            var currentIndex = currentPosition
+            if (fl > 0.5) {
+                if (currentPosition == 0) {
+                    currentIndex = rvVideoPlaylist?.adapter!!.itemCount - 1
+                } else {
+                    currentIndex -= 1
+                }
+            }
+        }
+        val recyclerVideoAdapter = RecyclerVideoAdapter(context, arrayListOf, rvVideoPlaylist)
+        recyclerVideoAdapter.setOnThumbImageClilckListener {
+            val (_, player) = getPlayer(carouselLayoutManager)
+            if (player is ConsultVideoPlayer) {
+                player.onVideoReset()
+                player.thumbImageViewLayout.visibility = View.VISIBLE
+            }
+            rvVideoPlaylist?.smoothScrollToPosition(it)
+        }
+        rvVideoPlaylist?.layoutManager = carouselLayoutManager
+        rvVideoPlaylist?.setHasFixedSize(true)
+        rvVideoPlaylist?.adapter = recyclerVideoAdapter
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+
+    }
+
+    private fun getPlayer(carouselLayoutManager: CarouselLayoutManager): Pair<Int, ConsultVideoPlayer?> {
+        val centerItemPosition: Int = carouselLayoutManager.centerItemPosition
+        val playerHolder = carouselLayoutManager.findViewByPosition(centerItemPosition)
+        val player = playerHolder?.findViewById<ConsultVideoPlayer>(R.id.video_item_player)
+        return Pair(centerItemPosition, player)
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+    }
+
+    override fun onVisibilityChanged(changedView: View, visibility: Int) {
+        super.onVisibilityChanged(changedView, visibility)
+        if (changedView != this) {
+            return
+        }
+        val carouselLayoutManager = rvVideoPlaylist?.layoutManager as CarouselLayoutManager
+        val (_, player) = getPlayer(carouselLayoutManager)
+        when (visibility) {
+            View.VISIBLE -> {}
+            else -> {
+                player?.let {
+                    if (!player.isIfCurrentIsFullscreen) {
+                        player.onVideoReset()
+                    }
+                }
+            }
+        }
+    }
+
+    private fun initConsultData() {
+        arrayListOf.clear()
+        arrayListOf.add(
+            TaxiPassengerVideoPlay(
+                "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655708596763/全车型混剪增加红旗车队.m4v",
+                "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655969511280/车队.png",
+                "蘑菇车联覆盖生活的方方面面"
+            )
+        )
+        arrayListOf.add(
+            TaxiPassengerVideoPlay(
+                "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655708554279/红旗车队.m4v",
+                "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655969553174/红旗重新排版.png",
+                "蘑菇车联之红旗车队"
+            )
+        )
+        arrayListOf.add(
+            TaxiPassengerVideoPlay(
+                "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655708499497/大运会合作解说版.m4v",
+                "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655969536177/大运会.png",
+                "蘑菇车联牵手成都大运会"
+            )
+        )
+        arrayListOf.add(
+            TaxiPassengerVideoPlay(
+                "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655708409810/20210610重新排版3屏.m4v",
+                "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655969579713/三屏.png",
+                "多视角体验蘑菇车联自动驾驶"
+            )
+        )
+    }
+
+}
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_main_fragment.xml b/OCH/charter/passenger/src/main/res/layout/m1_main_fragment.xml
index ff2cd87e1b..ec3ea80438 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_main_fragment.xml
+++ b/OCH/charter/passenger/src/main/res/layout/m1_main_fragment.xml
@@ -1,43 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="match_parent">
 
     <com.mogo.eagle.core.function.view.MapBizView
         android:id="@+id/mapBizView"
         android:layout_width="0dp"
-        app:layout_constraintWidth_percent="0.662"
         android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"/>
+        app:layout_constraintWidth_percent="0.662" />
+
     <com.mogo.eagle.core.function.view.OverMapView
         android:id="@+id/omvOverMap"
-        app:mapStylePath="m1_style.data"
-        app:mapStyleExtraPath="m1_style_extra.data"
-        app:layout_constraintTop_toTopOf="parent"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        app:bottomPadding="200"
+        app:carDrawable="@drawable/bug_p_overmap_car_model"
+        app:isClearArrived="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/mapBizView"
+        app:layout_constraintTop_toTopOf="parent"
+        app:mapStyleExtraPath="m1_style_extra.data"
+        app:mapStylePath="m1_style.data"
         app:resetDrawable="@drawable/bus_p_overmap_reset_size"
-        app:carDrawable="@drawable/bug_p_overmap_car_model"
-        app:startPointDrawable="@null"
-        app:resetDrawableMarginRight="34dp"
         app:resetDrawableMarginBottom="54dp"
-        app:bottomPadding="200"
-        app:topPadding="100"
-        app:isClearArrived="true"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"/>
+        app:resetDrawableMarginRight="34dp"
+        app:startPointDrawable="@null"
+        app:topPadding="100" />
 
     <androidx.appcompat.widget.AppCompatImageView
-        app:layout_constraintEnd_toEndOf="parent"
         android:id="@+id/aciv_map_2_default"
+        android:layout_width="@dimen/dp_148"
+        android:layout_height="@dimen/dp_150"
         android:src="@drawable/bus_p_overmap_reset"
         app:layout_constraintBottom_toTopOf="@+id/bb_boorombar"
-        android:layout_width="@dimen/dp_148"
-        android:layout_height="@dimen/dp_150"/>
+        app:layout_constraintEnd_toEndOf="parent" />
 
     <!--V2X预警红色边框-->
     <com.mogo.eagle.core.function.hmi.ui.widget.V2XWarningView
@@ -57,68 +58,23 @@
         app:layout_constraintEnd_toEndOf="@+id/mapBizView"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <com.mogo.och.bus.passenger.ui.itinerary.ItineraryView
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
-    <com.mogo.och.bus.passenger.ui.orderinfo.OrderInfoView
-        android:id="@+id/biz_orderinfo"
-        android:layout_width="match_parent"
-        android:visibility="gone"
-        android:layout_height="0dp"
-        android:paddingBottom="@dimen/dp_34_5"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/bb_boorombar" />
-
-    <com.mogo.och.bus.passenger.ui.softcontrol.SoftControlView
-        android:id="@+id/biz_softcontrol"
-        android:layout_width="match_parent"
-        android:visibility="gone"
-        android:paddingBottom="@dimen/dp_34_5"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/bb_boorombar"
-        android:layout_height="0dp"/>
-
-    <com.mogo.och.bus.passenger.ui.selectline.SelectLineView
-        android:id="@+id/biz_selectline"
-        android:layout_width="0dp"
-        android:visibility="gone"
-        android:paddingBottom="@dimen/dp_34_5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="@+id/mapBizView"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/bb_boorombar"
-        android:layout_height="0dp"/>
-
-
-    <com.mogo.och.bus.passenger.ui.bottom.BottomBar
-        android:id="@+id/bb_boorombar"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_107"/>
-
-
     <!--消息盒子选择入口-->
     <com.mogo.eagle.core.function.hmi.ui.msgbox.MMsgBoxButtonView
         android:id="@+id/viewBusPM1MsgBoxButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dp_50"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/aciv_enter_video"
+        android:layout_width="@dimen/dp_147"
+        android:layout_height="@dimen/dp_149"
+        android:layout_marginTop="-20dp"
         android:src="@drawable/charter_p_video"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/viewBusPM1MsgBoxButton"
-        android:layout_marginTop="-20dp"
-        android:layout_width="@dimen/dp_147"
-        android:layout_height="@dimen/dp_149"/>
+        app:layout_constraintTop_toBottomOf="@+id/viewBusPM1MsgBoxButton" />
 
     <!--消息盒子打开视图-->
     <com.mogo.eagle.core.function.hmi.ui.msgbox.MMsgBoxListView
@@ -126,8 +82,8 @@
         android:layout_width="450dp"
         android:layout_height="520dp"
         android:layout_marginTop="-30dp"
-        android:visibility="gone"
         android:layout_marginEnd="@dimen/dp_34"
+        android:visibility="gone"
         app:layout_constraintEnd_toEndOf="@+id/viewBusPM1MsgBoxButton"
         app:layout_constraintTop_toBottomOf="@+id/viewBusPM1MsgBoxButton" />
 
@@ -140,14 +96,61 @@
         android:layout_marginEnd="@dimen/dp_34"
         android:visibility="visible"
         app:layout_constraintEnd_toEndOf="@+id/viewBusPM1MsgBoxButton"
-        app:layout_constraintTop_toBottomOf="@+id/viewBusPM1MsgBoxButton"/>
+        app:layout_constraintTop_toBottomOf="@+id/viewBusPM1MsgBoxButton" />
+
+    <com.mogo.och.bus.passenger.ui.itinerary.ItineraryView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.mogo.och.bus.passenger.ui.orderinfo.OrderInfoView
+        android:id="@+id/biz_orderinfo"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:paddingBottom="@dimen/dp_34_5"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/bb_boorombar"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.mogo.och.bus.passenger.ui.softcontrol.SoftControlView
+        android:id="@+id/biz_softcontrol"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone" />
+
+    <com.mogo.och.bus.passenger.ui.selectline.SelectLineView
+        android:id="@+id/biz_selectline"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:paddingBottom="@dimen/dp_34_5"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/bb_boorombar"
+        app:layout_constraintEnd_toEndOf="@+id/mapBizView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.mogo.och.bus.passenger.ui.video.VideoView
+        android:id="@+id/biz_video"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone" />
+
+
+    <com.mogo.och.bus.passenger.ui.bottom.BottomBar
+        android:id="@+id/bb_boorombar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_107"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <com.mogo.och.bus.passenger.ui.debugview.DebugView
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginTop="@dimen/dp_47"
-        app:layout_constraintEnd_toEndOf="@+id/mapBizView"
-        android:visibility="gone"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_47"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="@+id/mapBizView"
+        app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_soft_fragment.xml b/OCH/charter/passenger/src/main/res/layout/m1_soft_fragment.xml
index 6cee245295..66d7eea319 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_soft_fragment.xml
+++ b/OCH/charter/passenger/src/main/res/layout/m1_soft_fragment.xml
@@ -2,6 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:background="@drawable/m1_function_bg"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -9,6 +10,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:clickable="true"
+        android:layout_marginBottom="@dimen/dp_141_5"
         android:background="@drawable/bus_p_function_setting_soft_b_shape"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintDimensionRatio="3:1"
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_video_fragment.xml b/OCH/charter/passenger/src/main/res/layout/m1_video_fragment.xml
index 3dd1e32646..9ae5b83786 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_video_fragment.xml
+++ b/OCH/charter/passenger/src/main/res/layout/m1_video_fragment.xml
@@ -2,6 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@drawable/m1_function_bg"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.recyclerview.widget.RecyclerView
@@ -9,6 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="731dp"
         android:orientation="horizontal"
+        android:layout_marginBottom="@dimen/dp_141_5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/core/mogo-core-res/src/main/res/values/dimens.xml b/core/mogo-core-res/src/main/res/values/dimens.xml
index 32bb5daeea..2abf9b6e93 100644
--- a/core/mogo-core-res/src/main/res/values/dimens.xml
+++ b/core/mogo-core-res/src/main/res/values/dimens.xml
@@ -166,6 +166,7 @@
     <dimen name="dp_139">139dp</dimen>
     <dimen name="dp_140">140dp</dimen>
     <dimen name="dp_141">141dp</dimen>
+    <dimen name="dp_141_5">141.5dp</dimen>
     <dimen name="dp_142">142dp</dimen>
     <dimen name="dp_143">143dp</dimen>
     <dimen name="dp_144">144dp</dimen>

From cf3850ba895e2308be3c47054c5a8fb3a446d862 Mon Sep 17 00:00:00 2001
From: pangfan <pangfan@zhidao.com>
Date: Tue, 15 Aug 2023 11:24:40 +0800
Subject: [PATCH 05/13] =?UTF-8?q?[6.0.0/5.0.0]MessagePad.Line=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9ElineName=E5=AD=97=E6=AE=B5=EF=BC=88=E4=BE=9BMAP?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=B5=8B=E8=AF=95=E6=9C=9F=E9=97=B4=E6=89=80?=
 =?UTF-8?q?=E8=B7=91=E7=BA=BF=E8=B7=AF=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../autopilot/AutopilotControlParameters.kt   | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlParameters.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlParameters.kt
index 29618d99cd..76b0986708 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlParameters.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlParameters.kt
@@ -64,6 +64,7 @@ fun AutopilotControlParameters.toRouteInfo(): MessagePad.RouteInfo {
     val line = MessagePad.Line.newBuilder()
     this.autoPilotLine?.let {
         line.lineId = it.lineId
+        line.lineName = it.lineName
         line.trajMd5 = it.trajMd5
         line.trajUrl = it.trajUrl
         line.stopMd5 = it.stopMd5
@@ -85,6 +86,7 @@ fun AutopilotControlParameters.toRouteInfo(): MessagePad.RouteInfo {
 fun AutopilotControlParameters.AutoPilotLine.toAutoPilotLine(): MessagePad.Line {
     val line = MessagePad.Line.newBuilder()
     line.lineId = this.lineId
+    line.lineName = this.lineName
     line.trajMd5 = this.trajMd5
     line.trajUrl = this.trajUrl
     line.stopMd5 = this.stopMd5
@@ -139,6 +141,7 @@ class AutopilotControlParameters {
 
     class AutoPilotLine {
         var lineId = 0L
+        var lineName = ""
         var trajUrl = ""
         var trajMd5 = ""
         var stopUrl = ""
@@ -164,7 +167,9 @@ class AutopilotControlParameters {
             this.vehicleModel = vehicleModel
         }
 
-        constructor(lineId: Long, trajUrl: String, trajMd5: String, stopUrl: String, stopMd5: String, timestamp: Long, vehicleModel: String, trajUrl_dpqp: String, trajMd5_dpqp: String, stopUrl_dpqp: String, stopMd5_dpqp: String, timestamp_dpqp: Long) {
+        constructor(lineId: Long, trajUrl: String, trajMd5: String, stopUrl: String, stopMd5: String,
+                    timestamp: Long, vehicleModel: String, trajUrl_dpqp: String, trajMd5_dpqp: String,
+                    stopUrl_dpqp: String, stopMd5_dpqp: String, timestamp_dpqp: Long) {
             this.lineId = lineId
             this.trajUrl = trajUrl
             this.trajMd5 = trajMd5
@@ -179,8 +184,29 @@ class AutopilotControlParameters {
             this.timestamp_dpqp = timestamp_dpqp
         }
 
+        constructor(lineId: Long, lineName: String, trajUrl: String,
+                    trajMd5: String, stopUrl: String, stopMd5: String, timestamp: Long, vehicleModel: String,
+                    trajUrl_dpqp: String, trajMd5_dpqp: String, stopUrl_dpqp: String, stopMd5_dpqp: String, timestamp_dpqp: Long) {
+            this.lineId = lineId
+            this.lineName = lineName
+            this.trajUrl = trajUrl
+            this.trajMd5 = trajMd5
+            this.stopUrl = stopUrl
+            this.stopMd5 = stopMd5
+            this.timestamp = timestamp
+            this.vehicleModel = vehicleModel
+            this.trajUrl_dpqp = trajUrl_dpqp
+            this.trajMd5_dpqp = trajMd5_dpqp
+            this.stopUrl_dpqp = stopUrl_dpqp
+            this.stopMd5_dpqp = stopMd5_dpqp
+            this.timestamp_dpqp = timestamp_dpqp
+        }
+
         override fun toString(): String {
-            return "AutoPilotLine(lineId=$lineId, trajUrl='$trajUrl', trajMd5='$trajMd5', stopUrl='$stopUrl', stopMd5='$stopMd5', timestamp=$timestamp, vehicleModel='$vehicleModel', trajUrl_dpqp='$trajUrl_dpqp', trajMd5_dpqp='$trajMd5_dpqp', stopUrl_dpqp='$stopUrl_dpqp', stopMd5_dpqp='$stopMd5_dpqp', timestamp_dpqp=$timestamp_dpqp)"
+            return "AutoPilotLine(lineId=$lineId, lineName=$lineName, trajUrl='$trajUrl', trajMd5='$trajMd5', " +
+                    "stopUrl='$stopUrl', stopMd5='$stopMd5', timestamp=$timestamp, vehicleModel='$vehicleModel', " +
+                    "trajUrl_dpqp='$trajUrl_dpqp', trajMd5_dpqp='$trajMd5_dpqp', stopUrl_dpqp='$stopUrl_dpqp', stopMd5_dpqp='$stopMd5_dpqp', " +
+                    "timestamp_dpqp=$timestamp_dpqp)"
         }
 
     }

From 01344f773c39ed8dda3c8d07a77af1eea095c45c Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Tue, 15 Aug 2023 11:27:21 +0800
Subject: [PATCH 06/13] [5.0.0] [orderinfo]

---
 .../bus/passenger/ui/orderinfo/OrderInfoView.kt   | 15 ++++++++++++++-
 .../passenger/ui/orderinfo/OrderInfoViewModel.kt  |  7 +++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoView.kt
index 4b5186f1ed..c3796ff8d6 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoView.kt
@@ -44,6 +44,8 @@ class OrderInfoView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback
 
     var goneViewListener: IClearViewCallback?=null
 
+    var viewModel:OrderInfoViewModel?=null
+
     private fun initView() {
         LayoutInflater.from(context).inflate(R.layout.m1_devices_fragment, this, true)
         onClick {
@@ -54,7 +56,7 @@ class OrderInfoView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
 
-        val viewModel = findViewTreeViewModelStoreOwner()?.let {
+        viewModel = findViewTreeViewModelStoreOwner()?.let {
             ViewModelProvider(it).get(OrderInfoViewModel::class.java)
         }
 
@@ -66,6 +68,8 @@ class OrderInfoView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback
 
         actv_contain_order.setOnClickListener {
             setViewGone()
+            cl_order_info.visibility = View.VISIBLE
+            cl_order_info_endorder_comfit.visibility = View.GONE
         }
 
         actv_end_order.setOnClickListener {
@@ -74,6 +78,15 @@ class OrderInfoView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback
         }
     }
 
+    override fun onVisibilityChanged(changedView: View, visibility: Int) {
+        if(changedView!=this){
+            return
+        }
+        if(visibility==View.VISIBLE) {
+            viewModel?.getDataInfo()
+        }
+    }
+
     override fun setViewGone(){
         goneViewListener?.goneAllView()
     }
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoViewModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoViewModel.kt
index 24d554f2a9..004e1379fe 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoViewModel.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoViewModel.kt
@@ -6,6 +6,7 @@ import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.GsonUtils
+import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.bus.passenger.callback.ITimeCallback
 import com.mogo.och.bus.passenger.model.CharterPassengerModel
 import com.mogo.och.bus.passenger.utils.ToastCharterUtils
@@ -37,7 +38,7 @@ class OrderInfoViewModel: ViewModel(), ITimeCallback {
         getDataInfo()
     }
 
-    private fun getDataInfo() {
+    fun getDataInfo() {
         val currentOrderInfo = CharterPassengerModel.getCurrentOrderInfo()
         currentOrderInfo?.let {
             viewCallback?.setPhone(it.passengerPhone?:"")
@@ -53,7 +54,9 @@ class OrderInfoViewModel: ViewModel(), ITimeCallback {
 
     override fun setOrderTimeCallBack(timeInSecond: Long) {
         val leftTime = DateTimeUtil.second2Time(timeInSecond)
-        viewCallback?.setLeftTime(leftTime)
+        UiThreadHandler.post {
+            viewCallback?.setLeftTime(leftTime)
+        }
     }
 
 

From dfe0ded4c2673c26f41173b50b354c19df8bc926 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Tue, 15 Aug 2023 11:33:27 +0800
Subject: [PATCH 07/13] =?UTF-8?q?[6.0.0]=201=E3=80=81=E5=A2=9E=E5=8A=A0lin?=
 =?UTF-8?q?eName=202=E3=80=81=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E8=B7=AF?=
 =?UTF-8?q?=E7=BA=BF=E5=85=A8=E7=A8=8B=E5=92=8C=E6=80=BB=E7=94=A8=E6=97=B6?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/taxi/bean/UnmannedTaskBean.kt    |  10 ++++--
 .../och/taxi/model/TaxiUnmannedViewModel.kt   |  30 +++++++++++++++++-
 .../och/taxi/network/CarServiceManager.kt     |  10 ++++++
 .../taxi/network/UnmannedTaskServiceApi.kt    |  12 +++++++
 .../mogo/och/taxi/ui/TaxiBeingTaskFragment.kt |   4 +--
 .../taxi_driver_circle_blue_big.png           | Bin 1409 -> 3683 bytes
 .../taxi_driver_circle_green_big.png          | Bin 1498 -> 12805 bytes
 .../main/res/layout/unmanned_being_order.xml  |   2 +-
 8 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/UnmannedTaskBean.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/UnmannedTaskBean.kt
index 28bc5b0071..a6e755832d 100644
--- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/UnmannedTaskBean.kt
+++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/UnmannedTaskBean.kt
@@ -14,7 +14,9 @@ data class OrderDetail(
     var orderEndSite: Site?,
     var planningLines: Array<Long>,
     var phone: String,
-    var passengerNum: Int
+    var passengerNum: Int,
+    var fullMinutes: Long, //单独接口查询到
+    var mileage: Long // 单独接口查询到
 ) {
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -108,10 +110,14 @@ data class QueryCarOrderByNoRespBean(
 data class ContrailListRespBean(var data: MutableList<Result>?) //轨迹路线集合
     : BaseData() {
     data class Result(
-        var lineId: Long, var csvFileUrl: String, var csvFileMd5: String,
+        var lineId: Long,var lineName: String, var csvFileUrl: String, var csvFileMd5: String,
         var txtFileUrl: String, var txtFileMd5: String, var contrailSaveTime: Long,
         var csvFileUrlDPQP: String, var csvFileMd5DPQP: String, var txtFileUrlDPQP: String,
         var txtFileMd5DPQP: String, var contrailSaveTimeDPQP: Long
     )
 }
 
+data class QueryLineInfoRespBean(
+    var id: Long, var fullMinutes: Long, var mileage: Long
+): BaseData()
+
diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt
index cc31be43a2..606173c2d6 100644
--- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt
+++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt
@@ -20,6 +20,7 @@ import com.mogo.och.taxi.base.IUiIntent
 import com.mogo.och.taxi.bean.ContrailListRespBean
 import com.mogo.och.taxi.bean.QueryCarOrderByNoRespBean
 import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean
+import com.mogo.och.taxi.bean.QueryLineInfoRespBean
 import com.mogo.och.taxi.bean.StartServiceRespBean
 import com.mogo.och.taxi.constant.TaxiOrderStatusEnum
 import com.mogo.och.taxi.constant.TaxiUnmannedConst
@@ -28,6 +29,7 @@ import com.mogo.och.taxi.network.CarServiceManager
 import com.mogo.och.taxi.network.CarServiceManager.cancelOrder
 import com.mogo.och.taxi.network.CarServiceManager.contrailList
 import com.mogo.och.taxi.network.CarServiceManager.queryCarOrderByOrderNo
+import com.mogo.och.taxi.network.CarServiceManager.queryLineInfo
 import com.mogo.och.taxi.ui.unmanned.TaskAndOrderUiState
 import com.mogo.och.taxi.ui.unmanned.UnmannedIntent
 import com.mogo.och.taxi.ui.unmanned.UnmannedState
@@ -74,7 +76,7 @@ class TaxiUnmannedViewModel : BaseViewModel<UnmannedState, UnmannedIntent>(){
 
             is UnmannedIntent.CloseOrderByDriver -> {
                 if (mCurrentTaskAndOrder != null && mCurrentTaskAndOrder!!.order != null){
-                    val site = mCurrentTaskAndOrder!!.order!!.orderEndSite;
+                    val site = mCurrentTaskAndOrder!!.order!!.orderEndSite
                     TaxiModel.arriveSite(site!!.siteId,true)
                 }
             }
@@ -320,6 +322,10 @@ class TaxiUnmannedViewModel : BaseViewModel<UnmannedState, UnmannedIntent>(){
                     if (data!!.orderStatus == TaxiOrderStatusEnum.Cancel.code){
                         VoiceNotice.showNotice("乘客已经取消")
                         updateNoTaskAndOrderCancelUi()
+                        return
+                    }
+                    if (data.orderStatus == TaxiOrderStatusEnum.ArriveAtEnd.code){//到站
+                        queryRouteInfo()
                     }
                 }
 
@@ -330,6 +336,28 @@ class TaxiUnmannedViewModel : BaseViewModel<UnmannedState, UnmannedIntent>(){
             })
     }
 
+    /**
+     * 到站后查询总里程和总用时
+     */
+    private fun queryRouteInfo() {
+        if (mCurrentTaskAndOrder != null && mCurrentTaskAndOrder!!.endSite != null)
+        queryLineInfo(mContext, mCurrentTaskAndOrder!!.lineId,
+            object : OchCommonServiceCallback<QueryLineInfoRespBean>{
+                override fun onSuccess(data: QueryLineInfoRespBean?) {
+                    if (data == null || data.code != 0) return
+                    mCurrentTaskAndOrder?.order?.orderStatus = TaxiOrderStatusEnum.ArriveAtEnd.code
+                    mCurrentTaskAndOrder?.order?.fullMinutes = data.fullMinutes
+                    mCurrentTaskAndOrder?.order?.mileage = data.mileage
+                    updateTaskAndOrderUi()
+                }
+
+                override fun onFail(code: Int, msg: String?) {
+                    TODO("Not yet implemented")
+                }
+
+            })
+    }
+
 
     private fun startInAndWaitCurrentTaskLoop() {
         if (mInAndWaitServiceDisposable != null && !mInAndWaitServiceDisposable!!.isDisposed) {
diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/CarServiceManager.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/CarServiceManager.kt
index 6abfc6f8d9..1c42fce722 100644
--- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/CarServiceManager.kt
+++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/CarServiceManager.kt
@@ -172,4 +172,14 @@ object CarServiceManager {
         ).transformTry()
             .subscribe(OchCommonSubscribeImpl(context, callback, "contrailList"))
     }
+
+    /**
+     * 到站查询总里程和总用时
+     */
+    fun queryLineInfo(context: Context,lineId: Long,callback: OchCommonServiceCallback<QueryLineInfoRespBean>?){
+        mOCHTaxiServiceApi.queryTaxiLineInfoById(lineId = lineId)
+            .transformTry()
+            .subscribe(OchCommonSubscribeImpl(context, callback, "contrailList"))
+
+    }
 }
\ No newline at end of file
diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/UnmannedTaskServiceApi.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/UnmannedTaskServiceApi.kt
index 65f6620305..3d74cba5ba 100644
--- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/UnmannedTaskServiceApi.kt
+++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/UnmannedTaskServiceApi.kt
@@ -13,6 +13,7 @@ import com.mogo.och.taxi.bean.PrepareTaskRespBean
 import com.mogo.och.taxi.bean.QueryCarOrderByNoReqBean
 import com.mogo.och.taxi.bean.QueryCarOrderByNoRespBean
 import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean
+import com.mogo.och.taxi.bean.QueryLineInfoRespBean
 import com.mogo.och.taxi.bean.StartServiceReqBean
 import com.mogo.och.taxi.bean.StartServiceRespBean
 import com.mogo.och.taxi.bean.StartTaskReqBean
@@ -149,4 +150,15 @@ interface UnmannedTaskServiceApi {
         @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token,
         @Body data: QueryCarOrderByNoReqBean?
     ): Observable<QueryCarOrderByNoRespBean>
+
+    /**
+     * 查询总用时和里程
+     */
+    @Headers("Content-type:application/json;charset=UTF-8")
+    @GET("/och-taxi-cabin/api/business/v1/queryTaxiLineById")
+    fun queryTaxiLineInfoById(
+        @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId,
+        @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token,
+        @Query("id") lineId: Long?
+    ): Observable<QueryLineInfoRespBean>
 }
\ No newline at end of file
diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt
index f694fef628..4e5505ed0a 100644
--- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt
+++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt
@@ -125,7 +125,6 @@ class TaxiBeingTaskFragment : BaseFragment(),
                                 return@collect
                             }
 
-                            isHaveBeingOrder(true)
                             if (taskAndOrderUiState.untruthTask != null){
                                 updateUntruthTask(taskAndOrderUiState.untruthTask)
                             }else{
@@ -149,6 +148,7 @@ class TaxiBeingTaskFragment : BaseFragment(),
 
     private fun updateUntruthTask(untruthTask: StartServiceRespBean.Result?) {
         if (untruthTask == null) return
+        isHaveBeingOrder(true)
         updateUntruthTaskView()
         updateUntruthTaskUIData(untruthTask.siteName)
         updateUntruthTaskOtherInfo()
@@ -169,7 +169,7 @@ class TaxiBeingTaskFragment : BaseFragment(),
 
     private fun updateUntruthTaskView() {
         taskStatus.visibility  = View.VISIBLE
-        taskTypeTv.visibility = View.VISIBLE
+        taskTypeTv.visibility = View.GONE
         orderPhoneAndNum.visibility = View.GONE
         startStationName.visibility = View.VISIBLE
         endStationName.visibility = View.VISIBLE
diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_circle_blue_big.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_circle_blue_big.png
index 0c73689e8eda3331fa5ed0975ff62420138bf9fb..db99b30702cff579615fb08da8373637297ec36c 100644
GIT binary patch
delta 3648
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
S4Y|Jn0000<MNUMnLSTa0Tg%e`

delta 1356
zcmV-S1+)6&9DxfViBL{Q4GJ0x0000DNk~Le0000U0000U2nGNE06Q?QqLCp;e;%L%
z00aO40096103HAU007ECHw6Fy1nWseK~zW$jg?JkTvZgu-+PlclTMkLq_#!cByF^|
zs354I3pavvQ^ZDb=SmB@u`8FYQq(S8DdGp%3Mwwd25WKUN`h3RLP2C2KieWPO`5M}
z@->;~|99UzFL!1V>w%O1z2}^JfBxs3d*>w#{-1<dSSQ-)BwKW%`Mb~(bva}(AGnor
z4zjJ({9v2(wCy%FK2aodwDYMKij|jMABn29CxfWxp)iW>Bs@u46Ty1(QfqPU>xFk;
z8=d;<qg9z(nQl1&>xvvEM(PM<?73_7&yhm^?l*%l8V*9a6XgRDQnPeDf4BZvpZVwH
z?<4z1Wob(N0;~v`H^%8U+1>~XI}aU-``;Qn9hNJ{9hpUW=<{L@RZ!AcczfoR$4*Su
z>uWNtOZ@@}%kR<F)LzK6c<|ih>8M<L*^(1v>$dW7bV$;ed*{m2yHCi>=pjcr=8k6b
z${!Eia__~vKlu5Xc+Y_|e>O!6%*UD;Z0aE5$2b4}_4)A^@BdO}$ZhnF93m6WIO6iX
z4{tBsF?=d&hC!%d8M5wF^MU@FxOm6@Q{+-!njv>yzY*u8au)X<`|xPgD(s8ak|0`F
zLPM=xAsMDcBv~<_;$5*RMoGMH@3Hrfl2h77&IZyp;<&cw2uYpbe_=QvqP2U_Hd-E&
z=FFoqQF*ouinW0w+Sn_%hZb%|T<VF+4+N?l;jhx>sca3JY<RI)m1$)Kas@$2%01H#
z2OY7{ZFtQTQVf&Qu8^l7;n742^&by*qoq-N8x7|k!sILM64<EWaG4=Oh;|Q47)Q9W
zOd6zfr>Ny7VpN;Be}XV=JeCix{DF0j+I1Z+El&sWwlay_2f@2TyHC*hRdeE9hOI#)
zSzVeIz(Z~$ZX31iY3I$^8{@_Pp+O7~q@zv~*%~zQmP(NB3|Hr-#uaCT9B}~{x@7UU
zi(}!Mj!M&?M~eR1{QQK{HQ24>>LQTAh|_k|plq${=Z=3De>4^+xNG;j%`pAlrZ!vq
z9}Ty*4~Z~oG$vfG^jqz7IARQrP{{ABxw3e3W%|-*AN!;f;R^APm+!hYWJ3DExJe0b
zDhIj9ndRo6h2!JGnK{ZD<pmaJ>KAVG4Il0+Z67=sCK|g+3U%zZ>SB}N*0t|1)IWdr
z3*}mnE=rfAfA-Bzd}1T#1)}lv<xj8F1|F}7{GNz}t=ntR66s%K-~95);WJ6HKCe7R
zyqpm;RYxq$yXMYO_xyFRFnRfGJuXxy%RBBHE`+`1P>It5Kt*O#0GrFRQ<FcwceZ~1
zx$_?BEk)6>jhs_zBNfPO%)MIkAEheolh&k_xVKUre|q%QM`{C4JlI<u94f?B{6TYV
zetu>C+SR%1-~M#<;u}A#EiYJ?b8^p0*+Wdnd@|`+vr7duaz1a{q>xvn5P<Bl+vksX
zgbsK-+#mM{3FEZ_{QGsJ@+FMa#9lT@7>gB!-A~L1p9km@(+Owj3L=ydH>7PN*4~K`
zlN_OXf2yK-1Uq{Ylay<Km~%d{6-x{XAqXkC@=mpOTt=*YY7jz>aKH*NV#e%$@QJfg
z6T=xJV@*L_q_XAXWNpHT?at|n;yTrShMcjfK+>rcg%aaB6*{qdw7sE``vp)0grNC}
zx1=^5Bl8K{NIA3>vF|gI&5$@F-VDtTw#k1HBKv_B*NGNm9d)AlyYOFfq&F)xS;y1>
O0000<MNUMnLSTZSNtGu6

diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_circle_green_big.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_circle_green_big.png
index 650c5132c2d04e881efc5138babdc3995291c771..a3b5174e55f40729c3d540bf8b1c3add2dadeb2c 100644
GIT binary patch
literal 12805
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
XQ0dGgnUht#00000NkvXXu0mjf#BKf$

delta 1445
zcmV;W1zP%rWZDZMiBL{Q4GJ0x0000DNk~Le0000U0000U2nGNE06Q?QqLCp;e;%L%
z00aO40096103HAU007ECHw6Fy1w=_iK~zW$jg?JkTvZgu-+MFjW}0>;A5Bsbn@~y(
zT{K{Y3Kl=Wx(R|s7vk1M!9{W7(nS%8D7tcQje@IE3R;3f&{_v-7gkZhPK%|jA0bVs
zNi#_%nK#e#JNKQL_a+nY!kKgLf4TRb|NnpPy>EQ)|202Z*6nR~oOHUq&2RITXxoGY
zY!1JZu@A7F%;xc#md}hjgEUYe;b7vm<Kfur$4?f@#TVjya5V7zhgvN`Y{v6(v-RWF
za^uUt&Q>p6|G2s->t#l5#|oIL4rE820?I`G#1C(t42Sl-;|1{nU&Oasf0D1|d$G7U
z5(CEdZ#5QI-}>(P4=zZgDV8Q+BqZ#4IsNVYKm<VI`QeF)@ab<(y_@gf^`0O2gI+At
zY!}d$0J^k7K!G9R5BkOM<*`?vtkkb8Tv}UNl105+8raH93=5x{J2jo#Q#|eaF1acc
z5Cuv+eNzr0%+Kea*!$d}fAXErzP}`SOsRQgV!#H9TFyOucJA~`#eL;zCakncIXk7L
z+)BVaiy<Q5x!keQ6Gv))pTAm@D4-c&fUJR`z{8J^@9ukK@C;I1NnL5_bEa16Rus3-
z*y1r{SSR4c(Y<Ge50CGb9f%<}7}^ZD4Jy&_@Y_=_dbwa+lZXO4e@~Z?u>eXO0;(7w
z>9bDBp&Ej|KfeDB$t5|(GT_D{16&%dOeqKn&631A1~dW)#pWdjpjb=pv+XMk^-uKx
z_F(~N8n_sQg~`s@IdyU72_=f9oV?|>a{6+TS`GES7lh%YM2lj)?=3OK1DM8ui^e$g
za=8(wECJ;ip+pq&f24Fy6Q>AJ+60t&`g$q-U_^7e++gs&6$qbJTu{amLZwrV2Ru<|
z;KU59t-M3V)4M=wuOOB=<L*+c>ehO+<b{5p10pjj6B6C(1yG5qmo-Ynk!F9ivB_5i
z9CEksRQgs++$mpQT)jcLw6wC>mE9@!G%hQNt4aq<U%%b9e?Hm2b$|Uv3eYf=0fS6i
z`RUK9drA%z0?v#KU^XZHG?}JbYx`G!zgx{DPX?w~3ZxC+s=YsZIjV2XQ(pImom!{R
z0F%-SsHyK%##JF&+nm2WbMZ1O#L^h5n1BL`Crz`lTyM<J{ygJYI{^JKB+878zE?^t
z1ob{7m9c8vf3N;B)0AA~OmZ86m;>k9Ve~O>V7OGR-5Wf5a3CBRcr<&KcD9M<;%V8r
zSV?7sN4<9U;>`~~KPR~!h}Ff`#dyn*$N(ESHxMh_oBORcaAdq34i6l17e}JP86w<X
zE3y5FC_#y@)^5+<oc{D|97QX#%78bd4=`0#VDW9$f1Ej{*Izc~=D)gjJy!}B`u6WT
zAb)p#c4-t`l<FbLXA>gPT4QnH>noq!`smyjDbQ8Phhi(amK&8cz^u$A>GO|L5gQQe
z7b_R~N|lFSdFEJU^5A2Ip~_fLDpg`BLsZ{fX)LbXdGPBW*Zw*G?bT>)!&ENIzJJ9S
z1B_xmf0@a3l%6yQ7&!kVyTkx5i$MU-n0Wf1MuvK0IXBA4IRZj?jX?T*6;$S8N@`6{
zO$H>PELIKT>BM~SxquL*Q96{c2UP%Jlz2@nQ(_rwGhmX_NCGR^(}*)BF-bWFfZ3M@
zHnOb20K@}o7fR1o#)@UYGIjy+ETFN$h!`+sdrp7wS;rcHS;HO!qffkDUg?{_b~z>1
zZj{*09959(HhceUvZ?^mZIHrP(*~7(Phg986R^vNw>j2YQmc-Er2#Xb27vF?NKP}5
zUY>aa?&WPBpJ|pn6YMdtb=}^UnxbxR^V|G?RFh7mvA0%%00000NkvXXu0mjfoi?tV

diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/unmanned_being_order.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/unmanned_being_order.xml
index 80e9dcfd34..f656b46094 100644
--- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/unmanned_being_order.xml
+++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/unmanned_being_order.xml
@@ -140,7 +140,7 @@
         android:id="@+id/greenPoint"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/green_point"
+        android:src="@drawable/taxi_driver_circle_green_big"
         app:layout_constraintTop_toTopOf="@+id/startStationName"
         app:layout_constraintBottom_toBottomOf="@+id/startStationName"
         app:layout_constraintLeft_toLeftOf="@+id/taskStatus"/>

From 347ee9bfc1a5d4677cb5ad45665752b8ae6330ee Mon Sep 17 00:00:00 2001
From: pangfan <pangfan@zhidao.com>
Date: Tue, 15 Aug 2023 15:36:14 +0800
Subject: [PATCH 08/13] =?UTF-8?q?[6.0.0/5.0.0]MessagePad.Line=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9ElineName=E5=AD=97=E6=AE=B5:=E5=90=84=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manager/CharterTrajectoryManager.kt       | 13 +++++++---
 .../mogo/och/charter/model/DriverM1Model.kt   |  5 ++--
 .../passenger/model/CharterPassengerModel.kt  |  5 ++--
 .../bus/passenger/model/BusPassengerModel.kt  |  2 +-
 .../com/mogo/och/bus/model/OrderModel.java    |  2 +-
 .../och/bus/util/BusTrajectoryManager.java    | 26 ++++---------------
 .../com/mogo/och/bus/model/OrderModel.java    |  2 +-
 .../och/bus/util/BusTrajectoryManager.java    | 26 ++++---------------
 .../fragment/BaseSweeperTabFragment.java      |  2 +-
 .../och/sweeper/model/SweeperTaskModel.java   |  2 +-
 .../util/SweeperTrajectoryManager.java        | 25 +++---------------
 .../biz/dispatch/DispatchAutoPilotManager.kt  |  7 ++---
 12 files changed, 37 insertions(+), 80 deletions(-)

diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt
index 39498449c5..40c9647688 100644
--- a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt
+++ b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt
@@ -26,13 +26,15 @@ object CharterTrajectoryManager {
     private const val TAG = "CharterTrajectoryManager"
     private var mAutoPilotLine: AutoPilotLine? = null
     private var mLineId = 0
+    private var mLineName = ""
     private var mSendReqDisposable: Disposable? = null
 
     /**
      * 同步Bus路线信息
      */
-    fun syncTrajectoryInfo(lineId: Int) {
+    fun syncTrajectoryInfo(lineId: Int, lineName: String) {
         mLineId = lineId
+        mLineName = lineName
         val routesResult = get().getBusRoutesResult()
         if (LoginStatusManager.isLogin()  && routesResult != null) {
             d(SceneConstant.M_CHARTER_D + TAG, "syncTrajectoryInfo() start.")
@@ -81,7 +83,8 @@ object CharterTrajectoryManager {
         } else if ("ISSM_FUNC_AUTO_PILOT_READY" == guardianInfo.getCode()) {
             // 收到ssm的自动驾驶变为ready，再次下发轨迹下载.解决：域控重启，或者102域控启动太早，107节点初始化未完成导致的轨迹未进行下载。
             d(SceneConstant.M_CHARTER_D + TAG, "onAutopilotGuardian() ssm ready，再次发起下载")
-            syncTrajectoryInfo(get().getBusOrderResult()?.lineId!!)
+            syncTrajectoryInfo(get().getBusOrderResult()?.lineId!!,
+                get().getBusOrderResult()?.lineName!!)
         }
     }
 
@@ -96,7 +99,7 @@ object CharterTrajectoryManager {
         } else {
             if (mAutoPilotLine == null) {
                 mAutoPilotLine = AutoPilotLine(
-                    mLineId.toLong(),
+                    mLineId.toLong(), mLineName,
                     routesResult.csvFileUrl, routesResult.csvFileMd5,
                     routesResult.txtFileUrl, routesResult.txtFileMd5,
                     routesResult.contrailSaveTime, routesResult.carModel,
@@ -106,6 +109,7 @@ object CharterTrajectoryManager {
                 )
             } else {
                 mAutoPilotLine!!.lineId = mLineId.toLong()
+                mAutoPilotLine!!.lineName = mLineName
                 mAutoPilotLine!!.trajUrl = routesResult.csvFileUrl
                 mAutoPilotLine!!.trajMd5 = routesResult.csvFileMd5
                 mAutoPilotLine!!.stopUrl = routesResult.txtFileUrl
@@ -124,6 +128,7 @@ object CharterTrajectoryManager {
     private fun clearAutoPilotLine() {
         if (mAutoPilotLine == null) return
         mAutoPilotLine!!.lineId = -1
+        mAutoPilotLine!!.lineName = ""
         mAutoPilotLine!!.trajUrl = ""
         mAutoPilotLine!!.trajMd5 = ""
         mAutoPilotLine!!.stopUrl = ""
@@ -206,7 +211,7 @@ object CharterTrajectoryManager {
 
     init {
         mAutoPilotLine = AutoPilotLine(
-            -1,
+            -1, "",
             "", "", "", "", 0, "",
             "", "", "", "", 0
         )
diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
index d03324e646..ab9161791e 100644
--- a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
+++ b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
@@ -607,7 +607,7 @@ class DriverM1Model {
         parameters.vehicleType = VEHICLE_TYPE
         if (parameters.autoPilotLine == null) {
             parameters.autoPilotLine = AutopilotControlParameters.AutoPilotLine(
-                mCurrentOrder!!.lineId.toLong(),
+                mCurrentOrder!!.lineId.toLong(), mCurrentOrder!!.lineName,
                 mCurrentRoute!!.csvFileUrl, mCurrentRoute!!.csvFileMd5,
                 mCurrentRoute!!.txtFileUrl, mCurrentRoute!!.txtFileMd5,
                 mCurrentRoute!!.contrailSaveTime, mCurrentRoute!!.carModel,
@@ -841,7 +841,8 @@ class DriverM1Model {
                       d(SceneConstant.M_CHARTER_D + TAG, "checkoutContrail-=="
                               + GsonUtils.toJson(data.data))
                       mCurrentRoute = data.data
-                      CharterTrajectoryManager.syncTrajectoryInfo(mCurrentOrder?.lineId!!)
+                      CharterTrajectoryManager.syncTrajectoryInfo(mCurrentOrder?.lineId!!,
+                          mCurrentOrder?.lineName!!)
                   }
 
                   override fun onFail(code: Int, msg: String?) {
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
index de418e60b7..a76bf127a3 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
@@ -1132,9 +1132,8 @@ object CharterPassengerModel {
                 locusInfo?.let { locus ->
                     if (parameters.autoPilotLine == null) {
                         parameters.autoPilotLine = AutoPilotLine(
-                            orderInfo.lineId!!,
-                            locus.csvFileUrl!!,
-                            locus.csvFileMd5!!,
+                            orderInfo.lineId!!, orderInfo.lineName!!,
+                            locus.csvFileUrl!!, locus.csvFileMd5!!,
                             locus.txtFileUrl!!, locus.txtFileMd5!!,
                             locus.contrailSaveTime!!, locus.carModel!!,
                             locus.csvFileUrlDPQP!!, locus.csvFileMd5DPQP!!,
diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt
index f90176c027..f8138e6112 100644
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt
@@ -295,7 +295,7 @@ object BusPassengerModel{
         parameters.vehicleType = 10
         if (parameters.autoPilotLine == null) {
             parameters.autoPilotLine = AutoPilotLine(
-                busRoutesResult.lineId.toLong(),
+                busRoutesResult.lineId.toLong(), busRoutesResult.name,
                 busRoutesResult.csvFileUrl, busRoutesResult.csvFileMd5,
                 busRoutesResult.txtFileUrl, busRoutesResult.txtFileMd5,
                 busRoutesResult.contrailSaveTime, busRoutesResult.carModel,
diff --git a/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java b/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java
index ad92e2fc57..58391d279f 100644
--- a/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java
+++ b/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java
@@ -1272,7 +1272,7 @@ public class OrderModel {
         parameters.vehicleType = VEHICLE_TYPE;
         if (parameters.autoPilotLine == null) {
             parameters.autoPilotLine = new AutopilotControlParameters.AutoPilotLine(
-                    busRoutesResult.getLineId(),
+                    busRoutesResult.getLineId(), busRoutesResult.getName(),
                     busRoutesResult.csvFileUrl, busRoutesResult.csvFileMd5,
                     busRoutesResult.txtFileUrl, busRoutesResult.txtFileMd5,
                     busRoutesResult.contrailSaveTime, busRoutesResult.carModel,
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java
index 930045f7bd..51814cbd37 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java
@@ -41,7 +41,7 @@ public class BusTrajectoryManager {
     private Disposable mSendReqDisposable = null;
 
     public BusTrajectoryManager() {
-        mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(-1,
+        mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(-1, "",
                 "", "", "", "", 0, "",
                 "", "", "", "", 0);
     }
@@ -108,7 +108,8 @@ public class BusTrajectoryManager {
             return;
         } else {
             if (mAutoPilotLine == null) {
-                mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(routesResult.getLineId(),
+                mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(
+                        routesResult.getLineId(), routesResult.getName(),
                         routesResult.csvFileUrl, routesResult.csvFileMd5,
                         routesResult.txtFileUrl, routesResult.txtFileMd5,
                         routesResult.contrailSaveTime, routesResult.carModel,
@@ -117,6 +118,7 @@ public class BusTrajectoryManager {
                         routesResult.contrailSaveTimeDPQP);
             } else {
                 mAutoPilotLine.setLineId(routesResult.getLineId());
+                mAutoPilotLine.setLineName(routesResult.getName());
                 mAutoPilotLine.setTrajUrl(routesResult.csvFileUrl);
                 mAutoPilotLine.setTrajMd5(routesResult.csvFileMd5);
                 mAutoPilotLine.setStopUrl(routesResult.txtFileUrl);
@@ -135,6 +137,7 @@ public class BusTrajectoryManager {
     private void clearAutoPilotLine() {
         if (mAutoPilotLine == null) return;
         mAutoPilotLine.setLineId(-1);
+        mAutoPilotLine.setLineName("");
         mAutoPilotLine.setTrajUrl("");
         mAutoPilotLine.setTrajMd5("");
         mAutoPilotLine.setStopUrl("");
@@ -184,25 +187,6 @@ public class BusTrajectoryManager {
             return;
         }
 
-        // TODO: 2022/6/24
-        // test1
-//        mAutoPilotLine.setLineId(148);
-//        mAutoPilotLine.setTrajUrl("http://file-qa.zhidaozhixing.com/fileServer/upload/downloadFileStream?key=fileServer/online_car_hailing/e27c20c2da32481021d934c3ef084536/traj_148.csv");
-//        mAutoPilotLine.setTrajMd5("e27c20c2da32481021d934c3ef084536");
-//        mAutoPilotLine.setStopUrl("http://file-qa.zhidaozhixing.com/fileServer/upload/downloadFileStream?key=fileServer/online_car_hailing/6224c9dd2c0e2bd990c6482c0464de45/stop_148.txt");
-//        mAutoPilotLine.setStopMd5("6224c9dd2c0e2bd990c6482c0464de45");
-//        mAutoPilotLine.setTimestamp(1654596000000L); //20220607 18:00
-//        mAutoPilotLine.setVehicleModel("红旗H9");
-
-        // test2
-//        mAutoPilotLine.setLineId(148);
-//        mAutoPilotLine.setTrajUrl("http://file-qa.zhidaozhixing.com/fileServer/upload/downloadFileStream?key=fileServer/online_car_hailing/8654497cf918be461a59c7ad8e22920d/traj_148.csv");
-//        mAutoPilotLine.setTrajMd5("8654497cf918be461a59c7ad8e22920d");
-//        mAutoPilotLine.setStopUrl("http://file-qa.zhidaozhixing.com/fileServer/upload/downloadFileStream?key=fileServer/online_car_hailing/1bb098b244922649bf3e7bada0d3950f/stop_148.txt");
-//        mAutoPilotLine.setStopMd5("1bb098b244922649bf3e7bada0d3950f");
-//        mAutoPilotLine.setTimestamp(1654761600000L); //20220609 16:00
-//        mAutoPilotLine.setVehicleModel("红旗H9");
-
         CallerAutoPilotControlManager.INSTANCE.sendTrajectoryDownloadReq(mAutoPilotLine);
         CallerLogger.INSTANCE.d(M_BUS + TAG, "sendTrajectoryReq(): "
                 + GsonUtils.toJson(mAutoPilotLine));
diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java b/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java
index 787429540c..50ab8f5bb7 100644
--- a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java
+++ b/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java
@@ -1342,7 +1342,7 @@ public class OrderModel {
         parameters.vehicleType = VEHICLE_TYPE;
         if (parameters.autoPilotLine == null) {
             parameters.autoPilotLine = new AutopilotControlParameters.AutoPilotLine(
-                    busRoutesResult.getLineId(),
+                    busRoutesResult.getLineId(), busRoutesResult.getName(),
                     busRoutesResult.csvFileUrl, busRoutesResult.csvFileMd5,
                     busRoutesResult.txtFileUrl, busRoutesResult.txtFileMd5,
                     busRoutesResult.contrailSaveTime, busRoutesResult.carModel,
diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java b/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java
index fed001d399..8e009220fb 100644
--- a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java
+++ b/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java
@@ -40,7 +40,7 @@ public class BusTrajectoryManager {
     private Disposable mSendReqDisposable = null;
 
     public BusTrajectoryManager() {
-        mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(-1,
+        mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(-1, "",
                 "", "", "", "", 0, "",
                 "", "", "", "", 0);
     }
@@ -107,7 +107,8 @@ public class BusTrajectoryManager {
             return;
         } else {
             if (mAutoPilotLine == null) {
-                mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(routesResult.getLineId(),
+                mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(
+                        routesResult.getLineId(), routesResult.getName(),
                         routesResult.csvFileUrl, routesResult.csvFileMd5,
                         routesResult.txtFileUrl, routesResult.txtFileMd5,
                         routesResult.contrailSaveTime, routesResult.carModel,
@@ -116,6 +117,7 @@ public class BusTrajectoryManager {
                         routesResult.contrailSaveTimeDPQP);
             } else {
                 mAutoPilotLine.setLineId(routesResult.getLineId());
+                mAutoPilotLine.setLineName(routesResult.getName());
                 mAutoPilotLine.setTrajUrl(routesResult.csvFileUrl);
                 mAutoPilotLine.setTrajMd5(routesResult.csvFileMd5);
                 mAutoPilotLine.setStopUrl(routesResult.txtFileUrl);
@@ -134,6 +136,7 @@ public class BusTrajectoryManager {
     private void clearAutoPilotLine() {
         if (mAutoPilotLine == null) return;
         mAutoPilotLine.setLineId(-1);
+        mAutoPilotLine.setLineName("");
         mAutoPilotLine.setTrajUrl("");
         mAutoPilotLine.setTrajMd5("");
         mAutoPilotLine.setStopUrl("");
@@ -183,25 +186,6 @@ public class BusTrajectoryManager {
             return;
         }
 
-        // TODO: 2022/6/24
-        // test1
-//        mAutoPilotLine.setLineId(148);
-//        mAutoPilotLine.setTrajUrl("http://file-qa.zhidaozhixing.com/fileServer/upload/downloadFileStream?key=fileServer/online_car_hailing/e27c20c2da32481021d934c3ef084536/traj_148.csv");
-//        mAutoPilotLine.setTrajMd5("e27c20c2da32481021d934c3ef084536");
-//        mAutoPilotLine.setStopUrl("http://file-qa.zhidaozhixing.com/fileServer/upload/downloadFileStream?key=fileServer/online_car_hailing/6224c9dd2c0e2bd990c6482c0464de45/stop_148.txt");
-//        mAutoPilotLine.setStopMd5("6224c9dd2c0e2bd990c6482c0464de45");
-//        mAutoPilotLine.setTimestamp(1654596000000L); //20220607 18:00
-//        mAutoPilotLine.setVehicleModel("红旗H9");
-
-        // test2
-//        mAutoPilotLine.setLineId(148);
-//        mAutoPilotLine.setTrajUrl("http://file-qa.zhidaozhixing.com/fileServer/upload/downloadFileStream?key=fileServer/online_car_hailing/8654497cf918be461a59c7ad8e22920d/traj_148.csv");
-//        mAutoPilotLine.setTrajMd5("8654497cf918be461a59c7ad8e22920d");
-//        mAutoPilotLine.setStopUrl("http://file-qa.zhidaozhixing.com/fileServer/upload/downloadFileStream?key=fileServer/online_car_hailing/1bb098b244922649bf3e7bada0d3950f/stop_148.txt");
-//        mAutoPilotLine.setStopMd5("1bb098b244922649bf3e7bada0d3950f");
-//        mAutoPilotLine.setTimestamp(1654761600000L); //20220609 16:00
-//        mAutoPilotLine.setVehicleModel("红旗H9");
-
         CallerAutoPilotControlManager.INSTANCE.sendTrajectoryDownloadReq(mAutoPilotLine);
         CallerLogger.INSTANCE.d(M_BUS + TAG, "sendTrajectoryReq(): "
                 + GsonUtils.toJson(mAutoPilotLine));
diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperTabFragment.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperTabFragment.java
index e3842fcf82..8a455a177d 100644
--- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperTabFragment.java
+++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperTabFragment.java
@@ -170,7 +170,7 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
                         parameters.vehicleType = 10;
                         MessagePad.Line line = routeInfo.getLine();
                         parameters.autoPilotLine = new AutopilotControlParameters.AutoPilotLine(
-                                line.getLineId(),
+                                line.getLineId(), line.getLineName(),
                                 line.getTrajUrl(), line.getTrajMd5(),
                                 line.getStopUrl(), line.getStopMd5(),
                                 line.getTimestamp(), line.getVehicleModel(),
diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java
index 6b9f7d2e5e..b95e988d3c 100644
--- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java
+++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java
@@ -518,7 +518,7 @@ public class SweeperTaskModel {
                     .AutoPilotLonLat(mCurrentSubTaskDetail.getEndSiteWgs64Lat(), mCurrentSubTaskDetail.getEndSiteWgs64Lon());
             parameters.vehicleType = VEHICLE_TYPE;
             parameters.autoPilotLine = new AutopilotControlParameters.AutoPilotLine(
-                    mCurrentSubTaskDetail.getLineId(),
+                    mCurrentSubTaskDetail.getLineId(), mCurrentSubTaskDetail.getLineName(),
                     mCurrentSubTaskDetail.getCsvFileUrl(), mCurrentSubTaskDetail.getCsvFileMd5(),
                     mCurrentSubTaskDetail.getTxtFileUrl(), mCurrentSubTaskDetail.getTxtFileMd5(),
                     mCurrentSubTaskDetail.getPublishTime(), mCurrentSubTaskDetail.getCarModel(),
diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java
index dd61622c93..43b81e2828 100644
--- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java
+++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java
@@ -37,7 +37,7 @@ public class SweeperTrajectoryManager {
     private Disposable mSendReqDisposable = null;
 
     public SweeperTrajectoryManager() {
-        mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(-1,
+        mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(-1, "",
                 "", "", "", "", 0, "",
                 "", "", "", "", 0);
     }
@@ -99,7 +99,8 @@ public class SweeperTrajectoryManager {
             CallerLogger.INSTANCE.e(M_SWEEPER + TAG, "setupAutoPilotLine(): routesResult is null.");
             return;
         } else {
-            mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(subTaskDetail.getLineId(),
+            mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(
+                    subTaskDetail.getLineId(), subTaskDetail.getLineName(),
                     subTaskDetail.getCsvFileUrl(), subTaskDetail.getCsvFileMd5(),
                     subTaskDetail.getTxtFileUrl(), subTaskDetail.getTxtFileMd5(),
                     subTaskDetail.getPublishTime(), subTaskDetail.getCarModel(),
@@ -112,6 +113,7 @@ public class SweeperTrajectoryManager {
     private void clearAutoPilotLine() {
         if (mAutoPilotLine == null) return;
         mAutoPilotLine.setLineId(-1);
+        mAutoPilotLine.setLineName("");
         mAutoPilotLine.setTrajUrl("");
         mAutoPilotLine.setTrajMd5("");
         mAutoPilotLine.setStopUrl("");
@@ -161,25 +163,6 @@ public class SweeperTrajectoryManager {
             return;
         }
 
-        // TODO: 2022/6/24
-        // test1
-//        mAutoPilotLine.setLineId(148);
-//        mAutoPilotLine.setTrajUrl("http://file-qa.zhidaozhixing.com/fileServer/upload/downloadFileStream?key=fileServer/online_car_hailing/e27c20c2da32481021d934c3ef084536/traj_148.csv");
-//        mAutoPilotLine.setTrajMd5("e27c20c2da32481021d934c3ef084536");
-//        mAutoPilotLine.setStopUrl("http://file-qa.zhidaozhixing.com/fileServer/upload/downloadFileStream?key=fileServer/online_car_hailing/6224c9dd2c0e2bd990c6482c0464de45/stop_148.txt");
-//        mAutoPilotLine.setStopMd5("6224c9dd2c0e2bd990c6482c0464de45");
-//        mAutoPilotLine.setTimestamp(1654596000000L); //20220607 18:00
-//        mAutoPilotLine.setVehicleModel("红旗H9");
-
-        // test2
-//        mAutoPilotLine.setLineId(148);
-//        mAutoPilotLine.setTrajUrl("http://file-qa.zhidaozhixing.com/fileServer/upload/downloadFileStream?key=fileServer/online_car_hailing/8654497cf918be461a59c7ad8e22920d/traj_148.csv");
-//        mAutoPilotLine.setTrajMd5("8654497cf918be461a59c7ad8e22920d");
-//        mAutoPilotLine.setStopUrl("http://file-qa.zhidaozhixing.com/fileServer/upload/downloadFileStream?key=fileServer/online_car_hailing/1bb098b244922649bf3e7bada0d3950f/stop_148.txt");
-//        mAutoPilotLine.setStopMd5("1bb098b244922649bf3e7bada0d3950f");
-//        mAutoPilotLine.setTimestamp(1654761600000L); //20220609 16:00
-//        mAutoPilotLine.setVehicleModel("红旗H9");
-
         CallerAutoPilotControlManager.INSTANCE.sendTrajectoryDownloadReq(mAutoPilotLine);
         CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "sendTrajectoryReq(): "
                 + GsonUtils.toJson(mAutoPilotLine));
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt
index 3fe8bac6bd..38f79472f2 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt
@@ -121,8 +121,9 @@ class DispatchAutoPilotManager private constructor() :
         //同步调用路线下载逻辑
         adasAutoPilotLocReceiverBean?.let {
             if(it.type == 1){
-                val mAutoPilotLine = AutopilotControlParameters.AutoPilotLine(it.lineId.toLong(),it.trajUrl,it.trajMd5,it.stopUrl,it.stopMd5,it.timestamp,
-                    it.vehicleModel,it.trajUrl_dpqp,it.trajMd5_dpqp,it.stopUrl_dpqp,it.stopMd5_dpqp,it.timestamp_dpqp)
+                val mAutoPilotLine = AutopilotControlParameters.AutoPilotLine(it.lineId.toLong(), it.lineName,
+                    it.trajUrl,it.trajMd5,it.stopUrl,it.stopMd5,it.timestamp, it.vehicleModel,
+                    it.trajUrl_dpqp,it.trajMd5_dpqp,it.stopUrl_dpqp,it.stopMd5_dpqp,it.timestamp_dpqp)
                 CallerAutoPilotControlManager.sendTrajectoryDownloadReq(mAutoPilotLine)
                 CallerLogger.i("$M_BIZ$TAG","调用路线下载逻辑")
             }
@@ -176,7 +177,7 @@ class DispatchAutoPilotManager private constructor() :
                 ToastUtils.showShort("endLocAddress数据为空")
                 return
             }
-            val currentAutoPilotLine = AutopilotControlParameters.AutoPilotLine(it.lineId.toLong(),it.trajUrl,it.trajMd5,
+            val currentAutoPilotLine = AutopilotControlParameters.AutoPilotLine(it.lineId.toLong(),it.lineName,it.trajUrl,it.trajMd5,
                 it.stopUrl,it.stopMd5,it.timestamp,it.vehicleModel,it.trajUrl_dpqp+"",it.trajMd5_dpqp+"",it.stopUrl_dpqp+"",
                 it.stopMd5_dpqp,it.timestamp_dpqp)
             currentAutopilot.autoPilotLine = currentAutoPilotLine

From 66ecfaf95beebf00e2bf400cbc1f9ae268086f8b Mon Sep 17 00:00:00 2001
From: xinfengkun <xinfengkun@zhidaoauto.com>
Date: Tue, 15 Aug 2023 16:58:14 +0800
Subject: [PATCH 09/13] =?UTF-8?q?[600]=20=E4=BF=AE=E6=94=B9=E8=83=BD?=
 =?UTF-8?q?=E5=90=A6=E5=90=AF=E5=8A=A8=E8=87=AA=E9=A9=BE=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=BC=95=E8=B5=B7=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/common/module/manager/OCHAdasAbilityManager.java  | 3 +--
 .../call/autopilot/CallerAutopilotActionsListenerManager.kt    | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHAdasAbilityManager.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHAdasAbilityManager.java
index 01a13c7a39..a3d85fbfd8 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHAdasAbilityManager.java
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHAdasAbilityManager.java
@@ -14,7 +14,6 @@ import com.zhjt.mogo.adas.data.bean.AutopilotStatistics;
 import com.zhjt.mogo.adas.data.bean.UnableAutopilotReason;
 
 import java.util.ArrayList;
-import java.util.List;
 
 /**
  * Created on 2022/10/9
@@ -55,7 +54,7 @@ public class OCHAdasAbilityManager implements IMoGoAutopilotActionsListener, IMo
     }
 
     public String getAutopilotUnAbilityReason(){
-        return unableAutopilotReasons.toString();//TODO 临时toString 需要拼接数据
+        return unableAutopilotReasons == null ? "" : unableAutopilotReasons.toString();//TODO 临时toString 需要拼接数据
     }
 
     public String getStartFailedCode() {
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotActionsListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotActionsListenerManager.kt
index 1b70176e34..bb494b549e 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotActionsListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotActionsListenerManager.kt
@@ -17,7 +17,7 @@ object CallerAutopilotActionsListenerManager : CallerBase<IMoGoAutopilotActionsL
     private var unableAutopilotReasons: ArrayList<UnableAutopilotReason>? = null
 
     init {
-        isConnected = isConnected()
+//        isConnected = isConnected() //TODO 重复初始
         isAutopilotAbility = false
         unableAutopilotReasons = disconnectedReason()
         printLog("初始化")

From 1d1a0ae7e1bfac08ba7888a772d895505dc1c182 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Tue, 15 Aug 2023 17:26:20 +0800
Subject: [PATCH 10/13] [5.0.0] [feature]

---
 .../passenger/model/CharterPassengerModel.kt  |  7 --
 .../BusPassengerFunctionOrderPresenter.kt     |  3 -
 .../presenter/BusPassengerPresenter.kt        |  2 +-
 .../mogo/och/bus/passenger/ui/MainFragment.kt | 27 +++++++-
 .../och/bus/passenger/ui/bottom/BottomBar.kt  | 15 ++--
 .../ui/bottom/BottomOrderInfoView.kt          |  5 ++
 .../passenger/ui/orderinfo/OrderInfoView.kt   |  4 +-
 .../ui/orderinfo/OrderInfoViewModel.kt        | 12 ++--
 .../ui/selectline/M1OrderLineFragment.kt      |  6 --
 .../passenger/ui/selectline/SelectLineView.kt | 43 +++++++-----
 .../ui/selectline/SelectLineViewModel.kt      | 52 ++++++++------
 .../ui/softcontrol/SoftControlView.kt         | 42 ++++-------
 .../ui/softcontrol/SoftControlViewModel.kt    | 69 ++++---------------
 .../bus/passenger/utils/ToastCharterUtils.kt  | 38 +++++++---
 .../eagle/core/utilcode/util/UtilsBridge.java |  2 +-
 15 files changed, 166 insertions(+), 161 deletions(-)

diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
index a76bf127a3..c4c92b5708 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
@@ -120,7 +120,6 @@ object CharterPassengerModel {
     private var carTypeChageListener: IOrderChangeCallback? = null
 
     private var subscribeCountDown: Disposable? = null
-    var switchLine5minWait: Disposable? = null
 
     @Volatile
     var newCheckedSite: SiteInfoResponse.SiteInfo? = null
@@ -529,7 +528,6 @@ object CharterPassengerModel {
         orderInfo = null
         locusInfo = null
         if (data.businessStatus == 2) {// 订单结束 没有还车
-            RxUtils.disposeSubscribe(switchLine5minWait)
             clearAutopilotControlParameters()
             setOrderStatus(OrderStatusEnum.NoOrderUse)
         } else {
@@ -985,7 +983,6 @@ object CharterPassengerModel {
                 d(M_BUS_P + BaseDPMsg.TAG, "到站发送数据${msg}")
             }
 
-            RxUtils.disposeSubscribe(switchLine5minWait)
             // 清理轨迹
             cleanRoutePoints()
             // 到站结束自驾
@@ -1028,10 +1025,6 @@ object CharterPassengerModel {
         broadcastList[requestSuccessSign] == null || broadcastList[requestSuccessSign] == false
 
     fun cleanbroadcastListInfo(checkSite: SiteInfoResponse.SiteInfo?) {
-        RxUtils.disposeSubscribe(switchLine5minWait)
-        switchLine5minWait = RxUtils.createSubscribe(5 * 60 * 1000) {
-            d(M_BUS_P + BaseDPMsg.TAG, "5分钟倒计时可以选择线路了")
-        }
         newCheckedSite = checkSite
         cleanRoutePoints()
         broadcastList.clear()
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt
index 945a62fe48..c21f7a0707 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt
@@ -57,8 +57,6 @@ class BusPassengerFunctionOrderPresenter(view: M1OrderLineFragment?) :
     // 向司机端临时提交的终点站点
     private var tempCheckSite: SiteInfoResponse.SiteInfo? = null
 
-
-    private var subscribeSelectLine: Disposable? = null
     private var subscribeSelectSite: Disposable? = null
 
     override fun onCreate(owner: LifecycleOwner) {
@@ -189,7 +187,6 @@ class BusPassengerFunctionOrderPresenter(view: M1OrderLineFragment?) :
     override fun onDestroy(owner: LifecycleOwner) {
         super.onDestroy(owner)
         CallerLogger.d(M_BUS_P + TAG, "onDestroy")
-        RxUtils.disposeSubscribe(subscribeSelectLine)
         RxUtils.disposeSubscribe(subscribeSelectSite)
         BizLoopManager.removeLoopFunction(TAGLINELOOP)
         CharterPassengerModel.setStatusChangeListener(TAG,null)
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
index ac4bf8becc..7475455919 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
@@ -184,7 +184,7 @@ class BusPassengerPresenter(view: MainFragment?) :
         UiThreadHandler.post {
             when (actionStatus) {
                 StopSideStatusManager.Status.NOSTART -> {
-                    ToastCharterUtils.showShort(errorInfo)
+                    ToastCharterUtils.showShort(errorInfo?:"")
                 }
 
                 StopSideStatusManager.Status.START -> {
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
index c271afd4c0..2b1aef1273 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
@@ -25,6 +25,8 @@ import com.mogo.och.bus.passenger.ui.bottom.BottomClickView
 import com.mogo.och.bus.passenger.ui.dialogfragment.M1CarUserNoOrderFragment
 import com.mogo.och.bus.passenger.ui.dialogfragment.M1ContainFragment
 import com.mogo.och.bus.passenger.ui.dialogfragment.NoviceGuidanceFragment
+import com.mogo.och.bus.passenger.utils.ToastCharterUtils
+import com.mogo.och.common.module.biz.constant.LoginStatusManager
 import kotlinx.android.synthetic.main.m1_main_fragment.*
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
@@ -94,9 +96,22 @@ class MainFragment :
         })
 
         bb_boorombar.setCheckChangeListener(object : BottomBar.ApplyClickLintener {
-            override fun onApplyClick(selectItem: BottomBar.SelectView) {
+            override fun onApplyClick(selectItem: BottomBar.SelectView): Boolean {
                 when (selectItem) {
-                    BottomBar.SelectView.ORDERINFO -> showBizView(orderinfo = true)
+                    BottomBar.SelectView.ORDERINFO -> {
+                        if (LoginStatusManager.isLogin()) {
+                            if (mPresenter?.haveOrder() == true) {
+
+                            } else {
+                                ToastCharterUtils.showShort("请确认订单")
+                                return true
+                            }
+                        } else {
+                            ToastCharterUtils.showShort(requireContext().getString(R.string.m1_please_login_driver))
+                            return true
+                        }
+                        showBizView(orderinfo = true)
+                    }
                     BottomBar.SelectView.SETTING -> showBizView(softControl = true)
                     BottomBar.SelectView.LINE -> showBizView(selectLine = true)
                     BottomBar.SelectView.VIDEO -> showBizView(showVideo = true)
@@ -104,6 +119,7 @@ class MainFragment :
                         showBizView()
                     }
                 }
+                return false
             }
         })
         bb_boorombar.setApplyClickListener(object : BottomClickView.ApplyClickLintener {
@@ -168,7 +184,12 @@ class MainFragment :
             bpFunctionGroupDialogFragment = WeakReference(M1ContainFragment.newInstance())
         }
         val bpFunctionGroup = bpFunctionGroupDialogFragment?.get()
-        M1ContainFragment.openSettingPage(childFragmentManager, parentFragmentManager, bpFunctionGroup, tab)
+        M1ContainFragment.openSettingPage(
+            childFragmentManager,
+            parentFragmentManager,
+            bpFunctionGroup,
+            tab
+        )
     }
 
     fun setCarModle(rawInfo: Int) {
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomBar.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomBar.kt
index bb0ea7fb70..e868f5fde6 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomBar.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomBar.kt
@@ -47,12 +47,17 @@ class BottomBar @JvmOverloads constructor(
     }
 
     fun setCheckIndex(index: SelectView){
-        if(checkIndex==index){
-            checkIndex = SelectView.NONE
+        val tempPreStatus = checkIndex
+        checkIndex = if(checkIndex==index){
+            SelectView.NONE
         }else{
-            checkIndex = index
+            index
+        }
+        if (overMapViewApply?.onApplyClick(checkIndex)==true) {
+            // 外层业务拦截
+            checkIndex = tempPreStatus
+            return
         }
-        overMapViewApply?.onApplyClick(checkIndex)
         if(checkIndex == SelectView.ORDERINFO){
             cl_order_time_press.visibility = VISIBLE
             cl_order_time.setCheck(true)
@@ -78,7 +83,7 @@ class BottomBar @JvmOverloads constructor(
     }
 
     interface ApplyClickLintener{
-        fun onApplyClick(selectItem:SelectView)
+        fun onApplyClick(selectItem:SelectView):Boolean
     }
 
 }
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomOrderInfoView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomOrderInfoView.kt
index b1e40752c7..7133025081 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomOrderInfoView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomOrderInfoView.kt
@@ -17,6 +17,9 @@ import com.mogo.och.common.module.utils.DateTimeUtil
 import kotlinx.android.synthetic.main.m1_bottom_orderinfo.view.*
 import java.util.UUID
 
+/**
+ * 展示订单剩余时间
+ */
 open class BottomOrderInfoView @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
@@ -40,9 +43,11 @@ open class BottomOrderInfoView @JvmOverloads constructor(
     fun setCheck(isCheck:Boolean){
         if(isCheck){
             actv_order_end_time.setTextColor(context.getColor(android.R.color.white))
+            actv_order_null.setTextColor(context.getColor(android.R.color.white))
             actv_order_end_time_title.setTextColor(context.getColor(android.R.color.white))
         }else{
             actv_order_end_time.setTextColor(context.getColor(R.color.bus_p_m1_0050E1))
+            actv_order_null.setTextColor(context.getColor(R.color.bus_p_m1_090f28))
             actv_order_end_time_title.setTextColor(context.getColor(R.color.bus_p_m1_090f28))
         }
     }
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoView.kt
index c3796ff8d6..19fa1fec2a 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoView.kt
@@ -68,8 +68,6 @@ class OrderInfoView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback
 
         actv_contain_order.setOnClickListener {
             setViewGone()
-            cl_order_info.visibility = View.VISIBLE
-            cl_order_info_endorder_comfit.visibility = View.GONE
         }
 
         actv_end_order.setOnClickListener {
@@ -89,6 +87,8 @@ class OrderInfoView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback
 
     override fun setViewGone(){
         goneViewListener?.goneAllView()
+        cl_order_info.visibility = View.VISIBLE
+        cl_order_info_endorder_comfit.visibility = View.GONE
     }
 
     override fun setLeftTime(leftTime:String){
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoViewModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoViewModel.kt
index 004e1379fe..941ef59c1e 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoViewModel.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoViewModel.kt
@@ -40,15 +40,19 @@ class OrderInfoViewModel: ViewModel(), ITimeCallback {
 
     fun getDataInfo() {
         val currentOrderInfo = CharterPassengerModel.getCurrentOrderInfo()
-        currentOrderInfo?.let {
-            viewCallback?.setPhone(it.passengerPhone?:"")
+        if(currentOrderInfo!=null){
+            viewCallback?.setPhone(currentOrderInfo.passengerPhone?:"")
             try {
                 viewCallback?.setStartTimeAndEndTime(
-                    DateTimeUtil.formatLongToString(it.startTime!!, DateTimeUtil.HH_mm),
-                    DateTimeUtil.formatLongToString(it.endTime!!, DateTimeUtil.HH_mm))
+                    DateTimeUtil.formatLongToString(currentOrderInfo.startTime!!, DateTimeUtil.HH_mm),
+                    DateTimeUtil.formatLongToString(currentOrderInfo.endTime!!, DateTimeUtil.HH_mm))
             }catch (e:Exception){
                 e.printStackTrace()
             }
+        }else{
+            viewCallback?.setPhone("----")
+            viewCallback?.setStartTimeAndEndTime("--:---", "--:--")
+            viewCallback?.setLeftTime("剩余时间 --:--")
         }
     }
 
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/M1OrderLineFragment.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/M1OrderLineFragment.kt
index db54130a35..31a90cb044 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/M1OrderLineFragment.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/M1OrderLineFragment.kt
@@ -116,12 +116,6 @@ class M1OrderLineFragment :
             mPresenter?.resetData()
         }
         tv_site_submit.onClick {
-            CharterPassengerModel.switchLine5minWait?.let {
-                if (!it.isDisposed) {
-                    ToastCharterUtils.showShort("选择线路后5分钟内不可用选")
-                    return@onClick
-                }
-            }
             mPresenter?.changeSites(siteList)
         }
 
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineView.kt
index d534322188..f3a8961230 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineView.kt
@@ -14,6 +14,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.elegant.utils.UiThreadHandler
 import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.och.bus.passenger.R
+import com.mogo.och.bus.passenger.bean.event.EventLineSites
 import com.mogo.och.bus.passenger.bean.response.LineInfoResponse
 import com.mogo.och.bus.passenger.bean.response.SiteInfoResponse
 import com.mogo.och.bus.passenger.callback.IClearViewCallback
@@ -40,6 +41,7 @@ import kotlinx.android.synthetic.main.m1_order_fragment.view.tv_site_cancle
 import kotlinx.android.synthetic.main.m1_order_fragment.view.tv_site_submit
 import kotlinx.android.synthetic.main.m1_order_loading.view.iv_loading_wait_ent
 import me.jessyan.autosize.utils.AutoSizeUtils
+import org.greenrobot.eventbus.EventBus
 
 class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallback {
 
@@ -63,7 +65,7 @@ class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallb
     ) : super(context, attributeSet, defStyleAttr, defStyleRes)
 
 
-    var goneViewListener: IClearViewCallback?=null
+    var goneViewListener: IClearViewCallback? = null
 
     private lateinit var lineAdapter: OrderLineItemAdapter
     private lateinit var siteAdapter: OrderSiteItemAdapter
@@ -74,6 +76,8 @@ class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallb
     private var subscribeDirverAgree: Disposable? = null
     private var subscribeDirverRefuse: Disposable? = null
 
+    private var viewModel: SelectLineViewModel? = null
+
     private val loadingAni =
         ObjectAnimator.ofFloat(iv_loading_wait_ent, "rotation", 0f, 90f, 180f, 270f, 360f)
             .apply {
@@ -102,7 +106,8 @@ class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallb
         )
         rlv_line_list.adapter = lineAdapter
 
-        rv_site_list.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+        rv_site_list.layoutManager =
+            LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
         rv_site_list.addItemDecoration(
             BottomDecoration(
                 AutoSizeUtils.dp2px(context, 90f)
@@ -113,7 +118,7 @@ class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallb
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
-        val viewModel = findViewTreeViewModelStoreOwner()?.let {
+        viewModel = findViewTreeViewModelStoreOwner()?.let {
             ViewModelProvider(it).get(SelectLineViewModel::class.java)
         }
 
@@ -131,7 +136,7 @@ class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallb
         }
         siteAdapter.checkChangeListener = object : OrderSiteItemAdapter.CheckListener {
             override fun canSwitchLine(): Boolean {
-                return viewModel?.canSwitchLine()?:true
+                return viewModel?.canSwitchLine() ?: true
             }
 
             override fun onCheckListener(siteInfo: SiteInfoResponse.SiteInfo?) {
@@ -144,17 +149,23 @@ class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallb
             viewModel?.resetData()
         }
         tv_site_submit.onClick {
-            CharterPassengerModel.switchLine5minWait?.let {
-                if (!it.isDisposed) {
-                    ToastCharterUtils.showShort("选择线路后5分钟内不可用选")
-                    return@onClick
-                }
-            }
             viewModel?.changeSites(siteList)
         }
 
     }
 
+    override fun onVisibilityChanged(changedView: View, visibility: Int) {
+        if (changedView != this) {
+            return
+        }
+        if (visibility == View.GONE || visibility == View.INVISIBLE) {
+            EventBus.getDefault().post(EventLineSites(null, null, true))
+            viewModel?.addMsgListener()
+        } else {
+            viewModel?.removeMsgListener()
+        }
+    }
+
     private fun showSelectData() {
         UiThreadHandler.post {
             g_lines_sites_data?.visibility = View.VISIBLE
@@ -179,7 +190,7 @@ class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallb
         showNorOrder: Boolean,
         showLoading: Boolean
     ) {
-        if(showBiz){
+        if (showBiz) {
             // 选择线路页面
             m1_order_noorder?.visibility = View.GONE
             m1_order_neterror?.visibility = View.GONE
@@ -187,21 +198,21 @@ class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallb
             m1_order_loading?.visibility = View.GONE
             return
         }
-        if(showNetError){
+        if (showNetError) {
             m1_order_noorder?.visibility = View.GONE
             m1_order_neterror?.visibility = View.VISIBLE
             lsv_line_site?.visibility = View.GONE
             m1_order_loading?.visibility = View.GONE
             return
         }
-        if(showNorOrder){
+        if (showNorOrder) {
             m1_order_noorder?.visibility = View.VISIBLE
             m1_order_neterror?.visibility = View.GONE
             lsv_line_site?.visibility = View.GONE
             m1_order_loading?.visibility = View.GONE
             return
         }
-        if(showLoading){
+        if (showLoading) {
             m1_order_noorder?.visibility = View.GONE
             m1_order_neterror?.visibility = View.GONE
             lsv_line_site?.visibility = View.GONE
@@ -252,7 +263,7 @@ class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallb
         lineInfo: List<LineInfoResponse.LineInfo>,
         checkLine: LineInfoResponse.LineInfo?
     ) {
-        lineAdapter.setDataList(lineInfo,checkLine)
+        lineAdapter.setDataList(lineInfo, checkLine)
     }
 
     override fun siteAdapterEnableIndex(index: Int) {
@@ -263,7 +274,7 @@ class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallb
         siteAdapter.setDataList(siteInfo)
     }
 
-    private fun setViewGone(){
+    private fun setViewGone() {
         goneViewListener?.goneAllView()
     }
 
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineViewModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineViewModel.kt
index bfa58d615a..3465613d7c 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineViewModel.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineViewModel.kt
@@ -64,7 +64,6 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener {
     private var tempCheckSite: SiteInfoResponse.SiteInfo? = null
 
 
-    private var subscribeSelectLine: Disposable? = null
     private var subscribeSelectSite: Disposable? = null
 
     /**
@@ -108,7 +107,7 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener {
                             viewCallback?.hideDataDriverRefuse()
                         }
                         RxUtils.disposeSubscribe(subscribeSelectSite)
-                        BizLoopManager.removeLoopFunction(BusPassengerFunctionOrderPresenter.TAGLINELOOP)
+                        BizLoopManager.removeLoopFunction(TAGLINELOOP)
                     }
                 }
             }
@@ -117,16 +116,25 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener {
 
     init {
         CharterPassengerModel.setStatusChangeListener(TAG, this)
-        CallerTelematicListenerManager.addListener(TAG, msgReceived)
+
     }
 
     override fun onCleared() {
         super.onCleared()
         this.viewCallback = null
-        RxUtils.disposeSubscribe(subscribeSelectLine)
         RxUtils.disposeSubscribe(subscribeSelectSite)
         BizLoopManager.removeLoopFunction(TAGLINELOOP)
         CharterPassengerModel.setStatusChangeListener(TAG, null)
+
+    }
+
+    fun addMsgListener() {
+        CallerTelematicListenerManager.addListener(TAG, msgReceived)
+    }
+
+    fun removeMsgListener() {
+        RxUtils.disposeSubscribe(subscribeSelectSite)
+        BizLoopManager.removeLoopFunction(TAGLINELOOP)
         CallerTelematicListenerManager.removeListener(TAG)
     }
 
@@ -240,10 +248,7 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener {
         }
         viewCallback?.hideDataWaitDriverMsg()
         // 启动查看和司机端链接
-        BizLoopManager.setLoopFunction(
-            BusPassengerFunctionOrderPresenter.TAGLINELOOP,
-            LoopInfo(3, ::checkServerStatus)
-        )
+        BizLoopManager.setLoopFunction(TAGLINELOOP, LoopInfo(3, ::checkServerStatus))
 
         RxUtils.disposeSubscribe(subscribeSelectSite)
         subscribeSelectSite = RxUtils.createSubscribe(120_000) {
@@ -310,10 +315,10 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener {
     private fun checkServerStatus() {
         if (!CallerTelematicManager.getClientConnStatus()) {
             ToastCharterUtils.showShort("断开和司机端连接、请联系安全员")
-            BizLoopManager.removeLoopFunction(BusPassengerFunctionOrderPresenter.TAGLINELOOP)
+            BizLoopManager.removeLoopFunction(TAGLINELOOP)
             viewCallback?.hideDataDriverRefuse()
             CallerLogger.d(
-                SceneConstant.M_BUS_P + BusPassengerFunctionOrderPresenter.TAG,
+                SceneConstant.M_BUS_P + TAG,
                 "endAni666"
             )
         }
@@ -325,10 +330,10 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener {
     fun resetData() {
         tempCheckLine = null
         tempCheckSite = null
-        if(checkLine==null){// 没有提交线路
+        if (checkLine == null) {// 没有提交线路
             queryLineList()
             viewCallback?.setEnableSiteStatus(true)
-        }else{
+        } else {
             checkLine?.let {
                 viewCallback?.setEnableSiteStatus(false)
                 viewCallback?.lineAdapterSubmit(it)
@@ -339,27 +344,28 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener {
 
     fun checkSiteClick(siteInfo: SiteInfoResponse.SiteInfo?) {
         tempCheckSite = siteInfo
-        if(checkSite!=null){
+        if (checkSite != null) {
             checkSite?.let {
                 if (it.siteId == siteInfo?.siteId) {// 站点相同 隐藏所有提交按钮
                     viewCallback?.setEnableSiteStatus(false)
                 } else {
-                    if(it.lineId == siteInfo?.lineId){// 线路相同显示单独提交
+                    if (it.lineId == siteInfo?.lineId) {// 线路相同显示单独提交
                         viewCallback?.setEnableSiteStatus(true)
-                    }else{
-                        if(siteInfo==null){//没有选站点隐藏所有提交
+                    } else {
+                        if (siteInfo == null) {//没有选站点隐藏所有提交
                             viewCallback?.setEnableSiteStatus(false)
-                        }else {
+                        } else {
                             viewCallback?.setEnableSiteStatus(true)
                         }
                     }
                 }
             }
-        }else{
+        } else {
             viewCallback?.setEnableSiteStatus(true)
         }
     }
-    fun canSwitchLine():Boolean {
+
+    fun canSwitchLine(): Boolean {
         val gnssSpeed =
             CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02().gnssSpeed
         if (gnssSpeed < 0.5) {
@@ -367,25 +373,30 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener {
                 IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -> {// 不可自动驾驶
                     return true
                 }
+
                 IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> {//
                     return true
                 }
+
                 IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> {
                     // 自动驾驶中
                     return when (StopSideStatusManager.stopSiteStatus) {
                         StopSideStatusManager.Status.EndingSuccess -> {
                             true
                         }
-                        else ->{
+
+                        else -> {
                             ToastCharterUtils.showShort("自动驾驶中无法切换线路")
                             false
                         }
                     }
                 }
+
                 IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING -> {
                     ToastCharterUtils.showShort("因车辆正在平行驾驶中无法切换线路")
                     return false
                 }
+
                 else -> {}
             }
         } else {
@@ -412,6 +423,7 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener {
             lineInfo: List<LineInfoResponse.LineInfo>,
             checkLine: LineInfoResponse.LineInfo?
         )
+
         fun siteAdapterEnableIndex(index: Int)
         fun siteAdapterSetData(siteInfo: List<SiteInfoResponse.SiteInfo>)
     }
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlView.kt
index 2cfcf5f3e3..bd297fb31b 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlView.kt
@@ -83,16 +83,11 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
     constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet)
 
     constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int) : super(
-        context,
-        attributeSet,
-        defStyleAttr
+        context, attributeSet, defStyleAttr
     )
 
     constructor(
-        context: Context,
-        attributeSet: AttributeSet,
-        defStyleAttr: Int,
-        defStyleRes: Int
+        context: Context, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int
     ) : super(context, attributeSet, defStyleAttr, defStyleRes)
 
     var goneViewListener: IClearViewCallback? = null
@@ -332,8 +327,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
             rv_aircondition_temperature.tag = null
             return
         } else {
-            SoundPoolHelper.getSoundPoolHelper()
-                .playSoundWithRedId(context, R.raw.bus_di)
+            SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di)
         }
         openAircondition()
     }
@@ -347,8 +341,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
             }
             tv_light_top_01.isEnabled = false
             subscribeLightTop1 = Observable.timer(2000, TimeUnit.MILLISECONDS)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe {
+                .observeOn(AndroidSchedulers.mainThread()).subscribe {
                     tv_light_top_01.isEnabled = true
                 }
             SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di)
@@ -362,8 +355,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
             }
             tv_light_top_02.isEnabled = false
             subscribeLightTop2 = Observable.timer(2000, TimeUnit.MILLISECONDS)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe {
+                .observeOn(AndroidSchedulers.mainThread()).subscribe {
                     tv_light_top_02.isEnabled = true
                 }
             SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di)
@@ -377,8 +369,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
             }
             tv_light_atmosphere.isEnabled = false
             subscribeAtmosphere = Observable.timer(2000, TimeUnit.MILLISECONDS)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe {
+                .observeOn(AndroidSchedulers.mainThread()).subscribe {
                     tv_light_atmosphere.isEnabled = true
                 }
             SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di)
@@ -636,12 +627,9 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
                 openAircondition()
             }
         }
-        val pickerLayoutManager =
-            PickerLayoutManager(
-                context,
-                PickerLayoutManager.HORIZONTAL,
-                false
-            )
+        val pickerLayoutManager = PickerLayoutManager(
+            context, PickerLayoutManager.HORIZONTAL, false
+        )
         pickerLayoutManager.isChangeAlpha = true
         pickerLayoutManager.scaleDownBy = 0.29f
         pickerLayoutManager.scaleDownDistance = 0.8f
@@ -658,8 +646,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
         val space = AutoSizeUtils.dp2px(context, 15f)
         rv_aircondition_temperature.addItemDecoration(
             HorizontalDecoration(
-                space,
-                data.size - 1
+                space, data.size - 1
             )
         )
 
@@ -671,8 +658,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
                     RxUtils.disposeSubscribe(subscribeAir)
                     if (tag.index == 0 || tag.index == adapter.data.size - 1) {
                         subscribeAir = Observable.timer(200, TimeUnit.MILLISECONDS)
-                            .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe {
+                            .observeOn(AndroidSchedulers.mainThread()).subscribe {
                                 setCheckAir(adapter, tag)
                             }
                     } else {
@@ -720,11 +706,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
      * 根据车的状态会写页面状态
      */
     override fun setAirconditionHeaterView(
-        airIsOpen: Boolean,
-        heaterIsOpen: Boolean,
-        temperatureCmd: Int,
-        pattern: Int,
-        windSpeed: Int
+        airIsOpen: Boolean, heaterIsOpen: Boolean, temperatureCmd: Int, pattern: Int, windSpeed: Int
     ) {
         tv_aircondition_switch?.let {
             if (!airIsOpen && !heaterIsOpen) {
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlViewModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlViewModel.kt
index e7eea21b46..79735a6e23 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlViewModel.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlViewModel.kt
@@ -47,16 +47,11 @@ class SoftControlViewModel : ViewModel(), LightAirconditionDoorCallback {
      * 空调状态变化
      */
     override fun onAirconditionStatusCallback(
-        heaterIsOpen: Boolean,
-        airconditionStatus: AirconditionStatus,
-        isFirst: Boolean
+        heaterIsOpen: Boolean, airconditionStatus: AirconditionStatus, isFirst: Boolean
     ) {
         CallerLogger.d(
             M_BUS_P + TAG,
-            "回写--空调开关:${LightAirconditionDoorStatusManager.airconditionStatus.isOpen}、" +
-                    "空调温度:${LightAirconditionDoorStatusManager.airconditionStatus.temperature}" +
-                    "空调模式:${LightAirconditionDoorStatusManager.airconditionStatus.pattert}" +
-                    "空调风速:${LightAirconditionDoorStatusManager.airconditionStatus.windSpeed}"
+            "回写--空调开关:${LightAirconditionDoorStatusManager.airconditionStatus.isOpen}、" + "空调温度:${LightAirconditionDoorStatusManager.airconditionStatus.temperature}" + "空调模式:${LightAirconditionDoorStatusManager.airconditionStatus.pattert}" + "空调风速:${LightAirconditionDoorStatusManager.airconditionStatus.windSpeed}"
         )
         UiThreadHandler.post {
             if (airconditionStatus.isOpen) {
@@ -69,11 +64,7 @@ class SoftControlViewModel : ViewModel(), LightAirconditionDoorCallback {
                 )
             } else {
                 viewCallback?.setAirconditionHeaterView(
-                    airconditionStatus.isOpen,
-                    heaterIsOpen,
-                    airconditionStatus.temperature,
-                    0,
-                    0
+                    airconditionStatus.isOpen, heaterIsOpen, airconditionStatus.temperature, 0, 0
                 )
             }
         }
@@ -83,31 +74,20 @@ class SoftControlViewModel : ViewModel(), LightAirconditionDoorCallback {
      * 暖风机状态变化
      */
     override fun onHeaterStatusCallback(
-        airconditionIsOpen: Boolean,
-        heaterStatue: HeaterStatue,
-        isFirst: Boolean
+        airconditionIsOpen: Boolean, heaterStatue: HeaterStatue, isFirst: Boolean
     ) {
         CallerLogger.d(
             M_BUS_P + TAG,
-            "回写--暖风机开关:${heaterStatue.isOpen}、" +
-                    "风速:${heaterStatue.windSpeed}"
+            "回写--暖风机开关:${heaterStatue.isOpen}、" + "风速:${heaterStatue.windSpeed}"
         )
         UiThreadHandler.post {
             if (heaterStatue.isOpen) {
                 viewCallback?.setAirconditionHeaterView(
-                    airconditionIsOpen,
-                    heaterStatue.isOpen,
-                    0,
-                    0,
-                    heaterStatue.windSpeed
+                    airconditionIsOpen, heaterStatue.isOpen, 0, 0, heaterStatue.windSpeed
                 )
             } else {
                 viewCallback?.setAirconditionHeaterView(
-                    airconditionIsOpen,
-                    heaterStatue.isOpen,
-                    0,
-                    0,
-                    0
+                    airconditionIsOpen, heaterStatue.isOpen, 0, 0, 0
                 )
             }
         }
@@ -119,9 +99,7 @@ class SoftControlViewModel : ViewModel(), LightAirconditionDoorCallback {
     override fun onLightTop1Callback(lightStatus: LightStatus, isFirst: Boolean) {
         CallerLogger.d(
             M_BUS_P + TAG,
-            "回写--顶灯1开关:${lightStatus.isOpenLight1}、" +
-                    "顶灯2开关:${lightStatus.isOpenLight2}、" +
-                    "氛围灯开关:${lightStatus.isOpenatmosphere}、"
+            "回写--顶灯1开关:${lightStatus.isOpenLight1}、" + "顶灯2开关:${lightStatus.isOpenLight2}、" + "氛围灯开关:${lightStatus.isOpenatmosphere}、"
         )
         UiThreadHandler.post {
             viewCallback?.setLightTop1View(lightStatus.isOpenLight1, isFirst)
@@ -134,9 +112,7 @@ class SoftControlViewModel : ViewModel(), LightAirconditionDoorCallback {
     override fun onLightTop2Callback(lightStatus: LightStatus, isFirst: Boolean) {
         CallerLogger.d(
             M_BUS_P + TAG,
-            "回写--顶灯1开关:${lightStatus.isOpenLight1}、" +
-                    "顶灯2开关:${lightStatus.isOpenLight2}、" +
-                    "氛围灯开关:${lightStatus.isOpenatmosphere}、"
+            "回写--顶灯1开关:${lightStatus.isOpenLight1}、" + "顶灯2开关:${lightStatus.isOpenLight2}、" + "氛围灯开关:${lightStatus.isOpenatmosphere}、"
         )
         UiThreadHandler.post {
             viewCallback?.setLightTop2View(lightStatus.isOpenLight2, isFirst)
@@ -150,9 +126,7 @@ class SoftControlViewModel : ViewModel(), LightAirconditionDoorCallback {
     override fun onLightAtmosphereCallback(lightStatus: LightStatus, isFirst: Boolean) {
         CallerLogger.d(
             M_BUS_P + TAG,
-            "回写--顶灯1开关:${lightStatus.isOpenLight1}、" +
-                    "顶灯2开关:${lightStatus.isOpenLight2}、" +
-                    "氛围灯开关:${lightStatus.isOpenatmosphere}、"
+            "回写--顶灯1开关:${lightStatus.isOpenLight1}、" + "顶灯2开关:${lightStatus.isOpenLight2}、" + "氛围灯开关:${lightStatus.isOpenatmosphere}、"
         )
         UiThreadHandler.post {
             viewCallback?.setLightAtmosphereView(lightStatus.isOpenatmosphere, isFirst)
@@ -164,22 +138,14 @@ class SoftControlViewModel : ViewModel(), LightAirconditionDoorCallback {
      */
     fun openAndSetAircondition(modeCmd: Int, windSpeedCmd: Int, temperatureCmd: Int) {
         CallerLogger.d(
-            M_BUS_P + TAG, "" +
-                    "打开空调，模式$modeCmd--档位${windSpeedCmd}--温度:$temperatureCmd"
+            M_BUS_P + TAG, "" + "打开空调，模式$modeCmd--档位${windSpeedCmd}--温度:$temperatureCmd"
         )
         CallerAutoPilotControlManager.sendRoboBusJinlvM1AirConditionerCmd(
-            1,
-            modeCmd,
-            windSpeedCmd,
-            temperatureCmd
+            1, modeCmd, windSpeedCmd, temperatureCmd
         )
         RxUtils.disposeSubscribe(airconditionDisposable)
         airconditionDisposable = RxUtils.createSubscribe(10000) {
-            if (!LightAirconditionDoorStatusManager.airconditionStatus.isOpen &&
-                LightAirconditionDoorStatusManager.airconditionStatus.windSpeed != windSpeedCmd &&
-                LightAirconditionDoorStatusManager.airconditionStatus.temperature != temperatureCmd &&
-                LightAirconditionDoorStatusManager.airconditionStatus.pattert != modeCmd
-            ) {
+            if (!LightAirconditionDoorStatusManager.airconditionStatus.isOpen && LightAirconditionDoorStatusManager.airconditionStatus.windSpeed != windSpeedCmd && LightAirconditionDoorStatusManager.airconditionStatus.temperature != temperatureCmd && LightAirconditionDoorStatusManager.airconditionStatus.pattert != modeCmd) {
                 ToastCharterUtils.showShort("控制系统繁忙，请稍后再试")
             }
         }
@@ -188,10 +154,7 @@ class SoftControlViewModel : ViewModel(), LightAirconditionDoorCallback {
     fun closeAircondition(modeCmd: Int, windSpeedCmd: Int, temperatureCmd: Int) {
         CallerLogger.d(M_BUS_P + TAG, "关闭空调")
         CallerAutoPilotControlManager.sendRoboBusJinlvM1AirConditionerCmd(
-            2,
-            modeCmd,
-            windSpeedCmd,
-            temperatureCmd
+            2, modeCmd, windSpeedCmd, temperatureCmd
         )
         RxUtils.disposeSubscribe(airconditionDisposable)
         airconditionDisposable = RxUtils.createSubscribe(10000) {
@@ -209,9 +172,7 @@ class SoftControlViewModel : ViewModel(), LightAirconditionDoorCallback {
         CallerAutoPilotControlManager.sendRoboBusJinlvM1HeaderCmd(1, windSpeedCmd)
         RxUtils.disposeSubscribe(heaterDisposable)
         heaterDisposable = RxUtils.createSubscribe(10000) {
-            if (!LightAirconditionDoorStatusManager.heaterStatue.isOpen &&
-                LightAirconditionDoorStatusManager.heaterStatue.windSpeed != windSpeedCmd
-            ) {
+            if (!LightAirconditionDoorStatusManager.heaterStatue.isOpen && LightAirconditionDoorStatusManager.heaterStatue.windSpeed != windSpeedCmd) {
                 ToastCharterUtils.showShort("暖风机操作未生效，请稍后重试吧～")
             }
         }
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/ToastCharterUtils.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/ToastCharterUtils.kt
index 0478c0c252..ec29464ecf 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/ToastCharterUtils.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/ToastCharterUtils.kt
@@ -7,37 +7,57 @@ import com.mogo.och.bus.passenger.ui.toast.ToastCharterView
 import me.jessyan.autosize.utils.AutoSizeUtils
 
 object ToastCharterUtils {
-    fun showTaost(toastText:String){
+    const val TAG = "ToastCharterUtils"
+    fun showTaost(toastText: String) {
         val context = ActivityUtils.getTopActivity()
         val marker = ToastCharterView(context)
         marker.setText(toastText)
         marker.measure(
-            View.MeasureSpec.makeMeasureSpec(AutoSizeUtils.dp2px(context, 145f), View.MeasureSpec.UNSPECIFIED),
-            View.MeasureSpec.makeMeasureSpec(AutoSizeUtils.dp2px(context, 34f), View.MeasureSpec.EXACTLY)
+            View.MeasureSpec.makeMeasureSpec(
+                AutoSizeUtils.dp2px(context, 145f),
+                View.MeasureSpec.UNSPECIFIED
+            ),
+            View.MeasureSpec.makeMeasureSpec(
+                AutoSizeUtils.dp2px(context, 34f),
+                View.MeasureSpec.EXACTLY
+            )
         )
         marker.layout(0, 0, marker.measuredWidth, marker.measuredHeight)
         ToastUtils.showShort(marker)
     }
-    fun showLong(toastText:String){
+
+    fun showLong(toastText: String) {
         val context = ActivityUtils.getTopActivity()
         val marker = ToastCharterView(context)
         marker.setText(toastText)
         marker.measure(
-            View.MeasureSpec.makeMeasureSpec(AutoSizeUtils.dp2px(context, 145f), View.MeasureSpec.UNSPECIFIED),
-            View.MeasureSpec.makeMeasureSpec(AutoSizeUtils.dp2px(context, 34f), View.MeasureSpec.EXACTLY)
+            View.MeasureSpec.makeMeasureSpec(
+                AutoSizeUtils.dp2px(context, 145f),
+                View.MeasureSpec.UNSPECIFIED
+            ),
+            View.MeasureSpec.makeMeasureSpec(
+                AutoSizeUtils.dp2px(context, 34f),
+                View.MeasureSpec.EXACTLY
+            )
         )
         marker.layout(0, 0, marker.measuredWidth, marker.measuredHeight)
         ToastUtils.showLong(marker)
     }
 
-    fun showShort(toastText:String?){
+    fun showShort(toastText: String?) {
         toastText?.let {
             val context = ActivityUtils.getTopActivity()
             val marker = ToastCharterView(context)
             marker.setText(toastText)
             marker.measure(
-                View.MeasureSpec.makeMeasureSpec(AutoSizeUtils.dp2px(context, 145f), View.MeasureSpec.UNSPECIFIED),
-                View.MeasureSpec.makeMeasureSpec(AutoSizeUtils.dp2px(context, 34f), View.MeasureSpec.EXACTLY)
+                View.MeasureSpec.makeMeasureSpec(
+                    AutoSizeUtils.dp2px(context, 145f),
+                    View.MeasureSpec.UNSPECIFIED
+                ),
+                View.MeasureSpec.makeMeasureSpec(
+                    AutoSizeUtils.dp2px(context, 34f),
+                    View.MeasureSpec.EXACTLY
+                )
             )
             marker.layout(0, 0, marker.measuredWidth, marker.measuredHeight)
             ToastUtils.showShort(marker)
diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/UtilsBridge.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/UtilsBridge.java
index 450879091d..9467f3c150 100644
--- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/UtilsBridge.java
+++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/UtilsBridge.java
@@ -551,7 +551,7 @@ class UtilsBridge {
     }
 
     static void runOnUiThread(final Runnable runnable) {
-        ThreadUtils.runOnUiThread(runnable);
+        ThreadUtils.runOnUiThread(runnable, ThreadUtils.MODE.QUEUE);
     }
 
     static void runOnUiThreadDelayed(final Runnable runnable, long delayMillis) {

From 3fe1eb912ad4d2f5571d7ae0c5e90417601f927a Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Tue, 15 Aug 2023 18:31:54 +0800
Subject: [PATCH 11/13] =?UTF-8?q?[5.0.0]=20[=E9=80=89=E6=8B=A9=E7=BA=BF?=
 =?UTF-8?q?=E8=B7=AF]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passenger/ui/selectline/SelectLineView.kt | 24 +++++++++++++++++--
 .../ui/selectline/SelectLineViewModel.kt      |  6 +++--
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineView.kt
index f3a8961230..dacf920327 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineView.kt
@@ -160,9 +160,10 @@ class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallb
         }
         if (visibility == View.GONE || visibility == View.INVISIBLE) {
             EventBus.getDefault().post(EventLineSites(null, null, true))
-            viewModel?.addMsgListener()
-        } else {
             viewModel?.removeMsgListener()
+        } else {
+            viewModel?.addMsgListener()
+            viewModel?.initData()
         }
     }
 
@@ -184,6 +185,12 @@ class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallb
         }
     }
 
+    /**
+     * @param showBiz  展示线路和站点
+     * @param showNetError 网络错误页面
+     * @param showNorOrder 没有网络请求
+     * @param showLoading  登录司机端回复
+     */
     override fun setVisableByTrun(
         showBiz: Boolean,
         showNetError: Boolean,
@@ -223,6 +230,9 @@ class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallb
         }
     }
 
+    /**
+     * 司机同意所选线路
+     */
     override fun hideDataDriverAgree() {
         group_driver_agrenn_line?.visibility = View.VISIBLE
         aciv_driver_refuse_group?.visibility = View.GONE
@@ -235,6 +245,9 @@ class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallb
         }
     }
 
+    /**
+     * 显示确认和取消按钮
+     */
     override fun setEnableSiteStatus(cancleAndSubmit: Boolean) {
         if (cancleAndSubmit) {
             g_side_cancle_submit_group?.visibility = View.VISIBLE
@@ -247,6 +260,12 @@ class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallb
         lineAdapter.submitLine(lineInfo)
     }
 
+    /**
+     * 司机拒绝请求展示的页面
+     * ① 司机拒绝
+     * ② 2分钟超时
+     * ③ 请求中和司机端断开链接
+     */
     override fun hideDataDriverRefuse() {
         group_driver_agrenn_line?.visibility = View.GONE
         aciv_driver_refuse_group?.visibility = View.VISIBLE
@@ -276,6 +295,7 @@ class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallb
 
     private fun setViewGone() {
         goneViewListener?.goneAllView()
+        showSelectData()
     }
 
     init {
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineViewModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineViewModel.kt
index 3465613d7c..54024fc9d1 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineViewModel.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineViewModel.kt
@@ -116,7 +116,6 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener {
 
     init {
         CharterPassengerModel.setStatusChangeListener(TAG, this)
-
     }
 
     override fun onCleared() {
@@ -125,7 +124,6 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener {
         RxUtils.disposeSubscribe(subscribeSelectSite)
         BizLoopManager.removeLoopFunction(TAGLINELOOP)
         CharterPassengerModel.setStatusChangeListener(TAG, null)
-
     }
 
     fun addMsgListener() {
@@ -147,6 +145,10 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener {
 
     fun setVIewCallback(viewCallback: SelectLineViewCallback) {
         this.viewCallback = viewCallback
+        initData()
+    }
+
+    fun initData(){
         val currentOrderStatus = CharterPassengerModel.getCurrentOrderStatus()
         needRunUI(currentOrderStatus)
         extracted()

From f1fd346e7178ebd23b30ce78314731cefc80682b Mon Sep 17 00:00:00 2001
From: renwj <renwenjie@zhidaoauto.com>
Date: Tue, 15 Aug 2023 18:58:35 +0800
Subject: [PATCH 12/13] =?UTF-8?q?[6.0.0]=20fix=E5=8C=BF=E5=90=8DRunnable?=
 =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E4=B8=AD=E5=8C=85=E5=90=ABview=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1=E5=81=B6=E7=8E=B0=E4=B8=8D=E6=89=A7=E8=A1=8Crun?=
 =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/mogo/launcher/lancet/MemoryLeakFix.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/mogo/launcher/lancet/MemoryLeakFix.kt b/app/src/main/java/com/mogo/launcher/lancet/MemoryLeakFix.kt
index 6a204380c9..40c7224eea 100644
--- a/app/src/main/java/com/mogo/launcher/lancet/MemoryLeakFix.kt
+++ b/app/src/main/java/com/mogo/launcher/lancet/MemoryLeakFix.kt
@@ -75,7 +75,7 @@ internal class AccessSyntheticUtils {
                     val ret = when (t) {
                         is View -> {
                             lifecycle = t.lifecycleOwner.lifecycle
-                            ViewCompat.isAttachedToWindow(t)
+                            t.parent == null || ViewCompat.isAttachedToWindow(t)
                         }
                         is Activity -> {
                             lifecycle = t.findViewById<View>(android.R.id.content)?.lifecycleOwner?.lifecycle

From afcae1e3d50d2fcdd759a7a8bf2b81762bfe047e Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Tue, 15 Aug 2023 19:35:07 +0800
Subject: [PATCH 13/13] =?UTF-8?q?[5.0.0]=20[=E9=AB=98=E7=B2=BE=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E7=A6=81=E6=AD=A2=E8=A7=A6=E6=91=B8]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
index 2b1aef1273..11096f4adb 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
@@ -9,6 +9,7 @@ import com.amap.api.maps.model.LatLng
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.mvp.MvpFragment
 import com.mogo.eagle.core.data.config.HdMapBuildConfig
+import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager.getMapUIController
 import com.mogo.eagle.core.function.hmi.ui.msgbox.MMsgBoxButtonView
 import com.mogo.eagle.core.function.view.SiteMarkerBean
@@ -204,6 +205,7 @@ class MainFragment :
     override fun initViews(savedInstanceState: Bundle?) {
         super.initViews(savedInstanceState)
         mapBizView.onCreate(savedInstanceState)
+        getMapUIController()?.setAllGesturesEnabled(false)
         omvOverMap.onCreateView(savedInstanceState)
     }