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

Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' into dev_MogoAP_eagle-220_211207_8.0.17_merge

Browse Source
This commit is contained in:
donghongyu
2022-02-14 21:07:41 +08:00
parent ad0ca9c89e 3b014cae97
commit acd2cac685
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1000,14 +1000,17 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
downloadVersion: String,
upgradeStatus: Int
) {
//如果工控机处于“下载中”、“可升级（下载完成）”、“升级中”、“升级失败”状态时，工具箱入口显示红色角标
if(AdUpgradeStateHelper.showUpgradeTips(downloadStatus, upgradeStatus)){
viewUpgradeTips.visibility = View.VISIBLE
}else{
viewUpgradeTips.visibility = View.GONE
ThreadUtils.runOnUiThread{
//如果工控机处于“下载中”、“可升级（下载完成）”、“升级中”、“升级失败”状态时，工具箱入口显示红色角标
if(AdUpgradeStateHelper.showUpgradeTips(downloadStatus, upgradeStatus)){
viewUpgradeTips.visibility = View.VISIBLE
}else{
viewUpgradeTips.visibility = View.GONE
}
//将状态同步到工具箱
toolsView?.showAdUpgradeStatus(upgradeMode,downloadStatus, currentProgress, totalProgress, downloadVersion, upgradeStatus)
}
//将状态同步到工具箱
toolsView?.showAdUpgradeStatus(upgradeMode,downloadStatus, currentProgress, totalProgress, downloadVersion, upgradeStatus)
}
private fun dismissBadCaseFloatView() {

6
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt
View File

@@ -62,12 +62,6 @@ class SystemVersionView @JvmOverloads constructor(
//鹰眼版本视图点击事件
ivPadVersion.setOnClickListener {
Logger.i(TAG,"pad version view clicked")
if(autopilotStatus==2){
//当前处于自动驾驶状态，不可进行升级，Toast提示
ToastUtils.showShort("升级前请先退出自动驾驶模式，autopilotStatus="+autopilotStatus)
}else{
ToastUtils.showShort("当前不是自动驾驶模式，autopilotStatus="+autopilotStatus)
}
}
//工控机版本视图点击事件
ivAdVersion.setOnClickListener {

2
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml
View File

@@ -108,7 +108,7 @@
<TextView
android:id="@+id/tvAdVersionContent"
android:layout_width="wrap_content"
android:layout_width="200px"
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="@id/ivAdVersion"
app:layout_constraintRight_toRightOf="@id/ivAdVersion"