From ae3fd7f8f222f8121e8a96ad7ec76072c9bebff3 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Tue, 22 Aug 2023 10:56:15 +0800
Subject: [PATCH] =?UTF-8?q?[5.0.0]=20[=E6=A8=A1=E6=8B=9F=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E6=8E=89=E5=A4=B4=E7=9A=84=20IMAP=5FTRA=5FLOADED]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passenger/ui/lockview/LockAndUnlockView.kt    |  4 ++++
 .../och/bus/passenger/ui/lockview/UnlockView.kt   |  2 +-
 .../src/main/res/layout/m1_devices_unlock.xml     |  2 +-
 .../och/common/module/debug/DebugDataDispatch.kt  | 15 +++++++++++++++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/LockAndUnlockView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/LockAndUnlockView.kt
index dd259ae25e..67a2b90900 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/LockAndUnlockView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/LockAndUnlockView.kt
@@ -128,6 +128,10 @@ class LockAndUnlockView : ConstraintLayout, LockManager.LockStatusCallback {
         setImageStatus(statusView,LockManager.getLockStatus())
     }
 
+    /**
+     * @param statusView UnlockView的显示和隐藏
+     * @param lockStatus 锁屏状态
+     */
     private fun setImageStatus(statusView: Int,lockStatus: LockManager.LockStatus){
         when (statusView) {
             View.GONE -> {
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/UnlockView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/UnlockView.kt
index 81bc154694..aa7d0cbe6a 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/UnlockView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/UnlockView.kt
@@ -128,7 +128,7 @@ class UnlockView : ConstraintLayout, LockManager.LockStatusCallback {
             when (isLock) {
                 LockManager.LockStatus.LOCKED -> {
                     // 锁定
-                    actv_lock_status.text = "长按开锁键1秒，快速解锁"
+                    actv_lock_status.text = "长按开锁键2秒，快速解锁"
                     aciv_only_unlock.setImageResource(R.drawable.charter_p_only_lock)
                 }
                 LockManager.LockStatus.UNLOCKING -> {
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_devices_unlock.xml b/OCH/charter/passenger/src/main/res/layout/m1_devices_unlock.xml
index 0797cda389..2ce8e3177d 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_devices_unlock.xml
+++ b/OCH/charter/passenger/src/main/res/layout/m1_devices_unlock.xml
@@ -29,7 +29,7 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/actv_lock_status"
-            android:text="长按开锁键1秒杀，快速解锁"
+            android:text="长按开锁键2秒杀，快速解锁"
             app:layout_constraintStart_toStartOf="@+id/aciv_only_unlock"
             app:layout_constraintEnd_toEndOf="@+id/aciv_only_unlock"
             app:layout_constraintTop_toBottomOf="@+id/aciv_only_unlock"
diff --git a/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt b/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt
index ce12c6827a..0a8713c2d0 100644
--- a/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt
+++ b/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt
@@ -8,6 +8,7 @@ import com.amap.api.maps.model.LatLng
 import com.google.gson.reflect.TypeToken
 import com.mogo.eagle.core.data.enums.DataSourceType
 import com.mogo.eagle.core.data.map.MogoLocation
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisDoorStateListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisGnssListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
@@ -19,6 +20,7 @@ import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.och.common.module.debug.location.MogoLocationExit
 import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil
 import mogo.telematics.pad.MessagePad
+import mogo_msg.MogoReportMsg
 import java.io.BufferedReader
 import java.io.File
 import java.io.FileInputStream
@@ -32,10 +34,12 @@ object DebugDataDispatch {
     const val globalPathMock = "globalPath"
     const val locationMock = "location"
     const val carDoorMock = "carDoor"
+    const val carNeedTurnAround = "trunAroud"
 
 //    adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "location" --es path "sy73_log.json"
 //    adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "globalPath" --es path "sy73.json"
 //    adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "carDoor" --ei doorPostion 1 --ei doorStatus 1
+//    adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "trunAroud" --es code "IMAP_TRA_LOADED"
 
 
     val ROOT_PATH =
@@ -68,6 +72,17 @@ object DebugDataDispatch {
 
                 CallerChassisDoorStateListenerManager.invokeAutopilotDoorState(multiList)
             }
+            carNeedTurnAround -> {
+                // 1--5
+                val intArrayExtra = intent.getStringExtra("code")
+                val newBuilder = MogoReportMsg.MogoReportMessage.newBuilder()
+                newBuilder.code = intArrayExtra
+                newBuilder.timestampBuilder.sec = 0
+                newBuilder.timestampBuilder.nsec = 0
+                newBuilder.src = "2"
+                newBuilder.level = ""
+                CallerAutoPilotStatusListenerManager.invokeAutopilotGuardian(newBuilder.build())
+            }
             else -> {}
         }
     }