yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_robotaxi-d_240227_6.3.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robotaxi-d_240227_6.3.0

Browse Source
This commit is contained in:
aibingbing
2024-03-25 15:33:04 +08:00
parent 74061a7228 c5407d3a2b
commit cb7d52e9c5
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt
View File

@@ -147,6 +147,7 @@ internal object V2NIdentifyDrawer {
object : IMoGoWarningStatusListener {
override fun onShow() {
super.onShow()
runCatching { CallerHmiManager.notifyXiaoZhiStatusChanged(V2N(EventTypeEnumNew.valueOf(poiType)), State.START) }
CallerVisualAngleManager.changeAngle(
RoadEvent(
itx.longitude,
@@ -158,6 +159,7 @@ internal object V2NIdentifyDrawer {
override fun onDismiss() {
super.onDismiss()
runCatching { CallerHmiManager.notifyXiaoZhiStatusChanged(V2N(EventTypeEnumNew.valueOf(poiType)), State.STOP) }
CallerVisualAngleManager.changeAngle(Default())
}
},

30
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/mofang/MoFangStatusView.kt
View File

@@ -93,17 +93,15 @@ class MoFangStatusView : LinearLayout, OnMoFangStatusListener, IMoGoAutopilotSta
override fun onMoFangBatteryChanged(battery: Int) {}
override fun onMoFangClicked(keyCode: Int) {
if (!CallerAutoPilotStatusListenerManager.isConnect()) {
ToastUtils.showShort("工控机连接异常，无法执行魔方命令")
return
}
val enabled = CallerDevaToolsManager.mofang()?.isEnabled(1, keyCode) ?: true
if (!enabled) {
Log.d(TAG, "单击 -> 按键:${keyCode}被禁用...")
return
}
if (!CallerAutoPilotStatusListenerManager.isConnect()) {
ToastUtils.showShort("工控机连接异常，无法执行魔方命令")
return
}
if (keyCode == KeyEvent.KEYCODE_A) {
if (tv_icon_2?.tag != 2 && tv_icon_2?.isSelected == true) {
tv_icon_2?.isSelected = false
@@ -174,17 +172,15 @@ class MoFangStatusView : LinearLayout, OnMoFangStatusListener, IMoGoAutopilotSta
}
override fun onMoFangLongClicked(keyCode: Int) {
if (!CallerAutoPilotStatusListenerManager.isConnect()) {
ToastUtils.showShort("工控机连接异常，无法执行魔方命令")
return
}
val isEnabled = CallerDevaToolsManager.mofang()?.isEnabled(2, keyCode) ?: true
if (!isEnabled) {
Log.d(TAG, "长按 -> 按键:${keyCode}被禁用...")
return
}
if (!CallerAutoPilotStatusListenerManager.isConnect()) {
ToastUtils.showShort("工控机连接异常，无法执行魔方命令")
return
}
if (keyCode == KeyEvent.KEYCODE_A) {
if (tv_icon_2?.tag != 2 && tv_icon_2?.isSelected == true) {
tv_icon_2?.isSelected = false
@@ -228,6 +224,11 @@ class MoFangStatusView : LinearLayout, OnMoFangStatusListener, IMoGoAutopilotSta
}
override fun onMoFangCombineClicked(vararg keyCodes: Int) {
val isEnabled = CallerDevaToolsManager.mofang()?.isEnabled(3, *keyCodes) ?: true
if (!isEnabled) {
Log.d(TAG, "组合 -> 按键:${keyCodes.joinToString(",")}被禁用...")
return
}
if (!CallerAutoPilotStatusListenerManager.isConnect()) {
ToastUtils.showShort("工控机连接异常，无法执行魔方命令")
return
@@ -235,11 +236,6 @@ class MoFangStatusView : LinearLayout, OnMoFangStatusListener, IMoGoAutopilotSta
if (keyCodes.size != 2) {
return
}
val isEnabled = CallerDevaToolsManager.mofang()?.isEnabled(3, *keyCodes) ?: true
if (!isEnabled) {
Log.d(TAG, "组合 -> 按键:${keyCodes.joinToString(",")}被禁用...")
return
}
val key1 = keyCodes[0]
val key2 = keyCodes[1]
if (key1 == KeyEvent.KEYCODE_A && key2 == KeyEvent.KEYCODE_B || (key1 == KeyEvent.KEYCODE_B && key2 == KeyEvent.KEYCODE_A)) {