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

Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.2_local' into dev_robotaxi-d_241105_6.7.4

Browse Source
This commit is contained in:
donghongyu
2024-11-05 15:35:51 +08:00
parent 5f97a6bd0b 71ee720005
commit 52a0d3b5de
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotStateModel.kt
View File

@@ -111,10 +111,10 @@ class AutopilotStateModel : ViewModel(), IOchAutopilotStatusListener, ILineCall
this.viewCallback?.autopilotDisable()
}
IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE-> {
if (!CallerAutoPilotControlManager.isCanStartAutopilot(false) && !OchAutoPilotStatusListenerManager.canStartAutopilotFromFSM) {// 不可用
this.viewCallback?.autopilotDisable()
} else {// 部分可用
if (CallerAutoPilotControlManager.isCanStartAutopilot(false) || OchAutoPilotStatusListenerManager.canStartAutopilotFromFSM) {// 不可用
this.viewCallback?.canStartAutopilot()
} else {// 部分可用
this.viewCallback?.autopilotDisable()
}
}
IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING-> {// 自驾中

15
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
View File

@@ -2519,11 +2519,16 @@ internal class DebugSettingView @JvmOverloads constructor(
private fun killApp() {
Intent(Intent.ACTION_MAIN).apply {
addCategory(Intent.CATEGORY_HOME)
flags = Intent.FLAG_ACTIVITY_NEW_TASK
ActivityUtils.startActivity(this)
Process.killProcess(Process.myPid())
exitProcess(0)
try {
addCategory(Intent.CATEGORY_HOME)
flags = Intent.FLAG_ACTIVITY_NEW_TASK
ActivityUtils.startActivity(this)
Process.killProcess(Process.myPid())
exitProcess(0)
}catch (e:Exception){
e.printStackTrace()
CallerLogger.d(TAG,"killApp :${e.message}")
}
}
}