From 6dfe7b26c0dcaa9fed081f620f13968701a3e371 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Wed, 21 Dec 2022 17:16:31 +0800 Subject: [PATCH] =?UTF-8?q?[2.13.0]=20=E5=AE=8C=E5=96=84=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/MoGoHandAdasMsgManager.java | 5 +++++ .../mofang/MoFangManager.kt | 2 +- .../core/function/hmi/ui/MoGoHmiFragment.kt | 19 +++++++++++-------- .../java/com/mogo/map/AMapViewWrapper.java | 4 ++-- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java index ba7a417fd5..aa40c4e56c 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java @@ -1,5 +1,7 @@ package com.mogo.eagle.core.function.autopilot.adapter; +import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_DEVA; + import android.content.Context; import android.text.TextUtils; import android.util.Log; @@ -20,6 +22,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotVehicleStateLi import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager; import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils; +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; import org.jetbrains.annotations.NotNull; @@ -99,6 +102,7 @@ public class MoGoHandAdasMsgManager implements // if (!AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { //小巴不展示 if (lightSwitch != null) { int state = setTurnLightState(lightSwitch.getNumber()); + CallerLogger.INSTANCE.d(M_DEVA + "TurnLight", "---onAutopilotLightSwitchData ---state = " + state + "---lightSwitch.getNumber() = " + lightSwitch.getNumber()); if (state == 1 || state == 2) { isShowTurnLight = true; CallerHmiManager.INSTANCE.showBrakeLight(0); @@ -134,6 +138,7 @@ public class MoGoHandAdasMsgManager implements } else { brakeLight = 0; } + CallerLogger.INSTANCE.d(M_DEVA + "BrakeLight", "---onAutopilotLightSwitchData ---Acceleration = " + gnssInfo.getAcceleration() + "-- brakeLight = " + brakeLight); if (!isShowTurnLight) { CallerHmiManager.INSTANCE.showBrakeLight(brakeLight); } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangManager.kt index e32531ee91..a49e19364f 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangManager.kt @@ -89,7 +89,7 @@ class MoFangManager private constructor() { private val bluetoothMonitorReceiver: BroadcastReceiver = object : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { when (intent.action) { - BluetoothAdapter.ACTION_STATE_CHANGED -> { //中间状态 + BluetoothAdapter.ACTION_STATE_CHANGED -> { //中间状态 TODO CallerLogger.d("$M_F${TAG}","bluetoothMonitorReceiver ACTION_STATE_CHANGED action = ${intent.action}") } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index 1313c9a343..ccf6614c2a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -65,7 +65,6 @@ import com.mogo.eagle.core.function.call.map.* import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager.Scene.Turning import com.mogo.eagle.core.function.call.monitor.CallerMonitorManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager -import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.notification.WarningFloat import com.mogo.eagle.core.function.hmi.notification.anim.DefaultAnimator @@ -74,7 +73,6 @@ import com.mogo.eagle.core.function.hmi.ui.bindingcar.ToBindingCarDialog import com.mogo.eagle.core.function.hmi.ui.bindingcar.UpgradeAppDialog import com.mogo.eagle.core.function.hmi.ui.camera.CameraListView import com.mogo.eagle.core.function.hmi.ui.camera.RoadVideoDialog -import com.mogo.eagle.core.function.hmi.ui.msgbox.PassengerMsgBoxBubbleView import com.mogo.eagle.core.function.hmi.ui.notice.NoticeCheckDialog import com.mogo.eagle.core.function.hmi.ui.notice.NoticeTrafficDialog import com.mogo.eagle.core.function.hmi.ui.setting.DebugSettingView @@ -91,6 +89,7 @@ import com.mogo.eagle.core.function.main.utils.DisplayEffectsHelper import com.mogo.eagle.core.utilcode.kotlin.* import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.* +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr import com.mogo.eagle.core.utilcode.mogo.toast.TipToast @@ -101,7 +100,6 @@ import com.mogo.eagle.core.utilcode.reminder.api.impl.* import com.mogo.eagle.core.utilcode.util.* import com.mogo.eagle.core.utilcode.util.TimeUtils import com.mogo.eagle.core.utilcode.util.TimeUtils.millis2String -import com.mogo.map.MogoMap import com.zhidao.support.adas.high.common.MogoReport.Code.Error.EMAP.* import com.zhjt.mogo_core_function_devatools.badcase.consts.BadCaseConfig import com.zhjt.service_biz.BizConfig @@ -1381,6 +1379,7 @@ class MoGoHmiFragment : MvpFragment(), * 显示转向灯效果 if (HmiBuildConfig.isShowBadCaseView) { */ override fun showTurnLight(light: Int) { + CallerLogger.d("${SceneConstant.M_DEVA}${"TurnLight"}", "---showTurnLight = $light ---isLeftLight = $isLeftLight ---isRightLight = $isRightLight") if (HmiBuildConfig.isShowTurnLightView) { ThreadUtils.runOnUiThread { if (light == 1 || light == 2) { @@ -1394,26 +1393,28 @@ class MoGoHmiFragment : MvpFragment(), CallerVisualAngleManager.changeVisualAngle(Turning(false)) } } - if (light == 1) { + if (light == 1) { //左转灯 if (!isLeftLight) { isLeftLight = true isRightLight = false isDisappare = false - //TODO + CallerLogger.d("${SceneConstant.M_DEVA}${"TurnLight"}", "---showTurnLight ---light = 1") CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(4, 500) } - } else if (light == 2) { + } else if (light == 2) { //右转灯 if (!isRightLight) { isRightLight = true isLeftLight = false isDisappare = false + CallerLogger.d("${SceneConstant.M_DEVA}${"TurnLight"}", "---showTurnLight ---light = 2") CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(2, 500) } } else { - if (!isDisappare) { + if (!isDisappare) { //默认 不亮灯 isDisappare = true isLeftLight = false isRightLight = false + CallerLogger.d("${SceneConstant.M_DEVA}${"TurnLight"}", "---showTurnLight ---light other") CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(3, 500) } } @@ -1436,11 +1437,13 @@ class MoGoHmiFragment : MvpFragment(), if (light == 1) { //刹车灯亮 if (!isBrake) { isBrake = true + CallerLogger.d("${SceneConstant.M_DEVA}${"BrakeLight"}", " showBrakeLight light = 1 ") CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(0, 500) } } else { - if (isBrake) { + if (isBrake) {//默认 不亮灯 isBrake = false + CallerLogger.d("${SceneConstant.M_DEVA}${"BrakeLight"}", " showBrakeLight light != 1 ") CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(3, 500) } } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java index a9866d4f6e..b063d1edee 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java @@ -649,8 +649,8 @@ public class AMapViewWrapper implements IMogoMapView, /** * 设置转向灯和刹车灯 * - * @param type :车尾灯类型 time: 闪烁时间 最小500ms 小于500ms 默认为500ms - * @param time + * @param type :车尾灯类型 + * @param time 闪烁时间 最小500ms 小于500ms 默认为500ms */ @Override public void setCarLightsType(int type, int time) {