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

Merge remote-tracking branch 'origin/dev_MogoAP_eagle-220_211207_8.0.17' into dev_MogoAP_eagle-220_211207_8.0.17

Browse Source
This commit is contained in:
donghongyu
2022-01-20 19:38:18 +08:00
parent acda37b0d8 4d4a200e38
commit 4c66101fc0
6 changed files with 42 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt
View File

@@ -110,7 +110,7 @@ class MoGoAutopilotProvider :
AdasManager.getInstance().rebootIPC()
}
override fun recordCause(key: String?, name: String?, reason: String?) {
AdasManager.getInstance().recordCause(key, name, reason)
override fun recordCause(key: String?, name: String?, id: String?, reason: String?) {
AdasManager.getInstance().recordCause(key, name, id, reason)
}
}

13
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
View File

@@ -305,7 +305,6 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
itx.onDismiss {
val record =
autoPilotBadCaseEntrance?.getTag(R.id.autopilot_badcase_record) as? AutoPilotRecordResult
CallerAutoPilotManager.recordCause(record?.key, record?.fileName, null)
dismissBadCaseFloatView()
}
itx.onSelect {
@@ -334,7 +333,12 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
Logger.i(TAG, "ok:${body}")
dismissBadCaseFloatView()
dismiss?.invoke()
CallerAutoPilotManager.recordCause(
record?.key,
record?.fileName,
it.id, it.reason)
ToastUtils.showShort("接管反馈成功~")
record?.consumed = true
return@launch
}
Logger.e(TAG, "fail:${body}")
@@ -343,13 +347,6 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
t.printStackTrace()
ToastUtils.showShort("网络请求失败，请尝试联网~")
Logger.e(TAG, "exception:${t.message}")
} finally {
record?.consumed = true
CallerAutoPilotManager.recordCause(
record?.key,
record?.fileName,
it.id
)
}
}
}