From f6d93d98f0f0916d2769c2bce57de51448724ab8 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 26 Sep 2023 14:37:40 +0800 Subject: [PATCH] =?UTF-8?q?[6.1.0]=20[=E7=81=AF=E6=80=81debug=E3=80=81?= =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E5=B1=8F15=E5=88=86=E9=92=9F=E6=8F=90?= =?UTF-8?q?=E7=A4=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/charter/fragment/DriverM1Fragment.kt | 13 ++++++------- .../och/charter/presenter/DriverM1Presenter.kt | 4 ++-- .../driver/src/driverm1/res/values/strings.xml | 2 +- .../och/common/module/debug/DebugDataDispatch.kt | 16 +++++++++++++++- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt index 47b7067866..f965e3f3f7 100644 --- a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt +++ b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt @@ -9,7 +9,6 @@ import com.alibaba.android.arouter.launcher.ARouter import com.magic.mogo.och.charter.R import com.magic.mogo.och.charter.base.CharterBaseFragment import com.magic.mogo.och.charter.bean.QueryCurrentOrderResponse -import com.magic.mogo.och.charter.bean.QueryCurrentOrderResponse.Result.Companion.ARRIVED import com.magic.mogo.och.charter.bean.QueryCurrentOrderResponse.Result.Companion.ARRIVING import com.magic.mogo.och.charter.constant.CharterConst.Companion.LOOP_PERIOD_60S import com.magic.mogo.och.charter.net.login.LoginDriverM1Impl @@ -73,7 +72,7 @@ class DriverM1Fragment : CharterBaseFragment= 0){ startCountDownTimer(minutes,LOOP_PERIOD_60S) }else{ - isReturn5MTip = false + isReturn15MTip = false clearCountDownTimer() } } @@ -205,7 +204,7 @@ class DriverM1Fragment : CharterBaseFragment剩余%1$s分钟 包车时间：%1$s 乘客信息：%1$s - 本次行程剩余5分钟，请知晓并通知乘客合理安排游玩时间 + 本次行程剩余15分钟，请知晓并通知乘客合理安排游玩时间 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 9060d89523..cabdace8e3 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 @@ -2,6 +2,7 @@ package com.mogo.och.common.module.debug import android.content.Intent import android.os.Environment +import chassis.Chassis import chassis.Chassis.DoorNumber import chassis.VehicleStateOuterClass import com.amap.api.maps.model.LatLng @@ -11,6 +12,7 @@ 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.CallerChassisLamplightListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger @@ -35,12 +37,13 @@ object DebugDataDispatch { const val locationMock = "location" const val carDoorMock = "carDoor" const val carNeedTurnAround = "trunAroud" + const val carLightSwitch = "lightSwitch" // 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" - +// adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "lightSwitch" --ei lightPostion 0 val ROOT_PATH = Environment.getExternalStorageDirectory().absolutePath + File.separator + "MLog" + File.separator + "APPLog" + File.separator //程序外部存储跟目录 @@ -83,6 +86,17 @@ object DebugDataDispatch { newBuilder.level = "" CallerAutoPilotStatusListenerManager.invokeAutopilotGuardian(newBuilder.build()) } + carLightSwitch -> { + //0-5 + // LIGHT_NONE = 0; + // LIGHT_LEFT = 1; + // LIGHT_RIGHT = 2; + // LIGHT_FLASH = 3; + // LIGHT_MANUAL = 4; + // LIGHT_AUTO = 5; + val lightPostion = intent.getIntExtra("lightPostion",0) + CallerChassisLamplightListenerManager.invokeAutopilotLightSwitchData(Chassis.LightSwitch.forNumber(lightPostion)) + } else -> {} } }