From b1a5deec6cc367fca2e99539adb572a64d4af55c Mon Sep 17 00:00:00 2001
From: xuxinchao <13522809046@163.com>
Date: Tue, 1 Mar 2022 19:58:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E6=8E=A7=E6=9C=BA=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1、修复文字内容显示不全问题
2、修复工控机升级状态显示错误问题
---
 .../hmi/ui/widget/SystemVersionView.kt        | 19 +++++++++++--------
 .../main/res/layout/view_system_version.xml   |  4 +++-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt
index 52faf45bb8..aaf4dbac60 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt
@@ -161,15 +161,18 @@ class SystemVersionView @JvmOverloads constructor(
                     it.setProgress(AdUpgradeStateHelper.downloadProgress(currentProgress,totalProgress))
                 }
             }else if(AdUpgradeStateHelper.isDownloadFinish(downloadStatus,upgradeStatus)){
-                //下载完成，处于可升级状态，展示“可升级”角标，将AD背景变为蓝色，并隐藏下载进度条
-                ivAdStatus?.setImageResource(R.drawable.icon_upgradeable)
-                ivAdVersion?.setBackgroundResource(R.drawable.version_upgradeable_background)
-                adCircularProgressView?.visibility = View.GONE
-                if(AdUpgradeStateHelper.isQuietUpgradeMode(upgradeMode)){
-                    //如果升级模式为“静默升级”，则下载完成后，调用升级命令进行升级
-                    CallerAutoPilotManager.setIPCUpgradeAffirm()
-                    AdUpgradeStateHelper.setUpgradeStatus(true)
+                //下载完成，处于可升级状态，展示“可升级”角标，将AD背景变为蓝色，并隐藏下载进度条(当状态为“升级中”时，不进行设置（存在升级命令已下发，但工控机未立即升级现象）)
+                if(!AdUpgradeStateHelper.getUpgradeStatus()){
+                    ivAdStatus?.setImageResource(R.drawable.icon_upgradeable)
+                    ivAdVersion?.setBackgroundResource(R.drawable.version_upgradeable_background)
+                    adCircularProgressView?.visibility = View.GONE
+                    if(AdUpgradeStateHelper.isQuietUpgradeMode(upgradeMode)){
+                        //如果升级模式为“静默升级”，则下载完成后，调用升级命令进行升级
+                        CallerAutoPilotManager.setIPCUpgradeAffirm()
+                        AdUpgradeStateHelper.setUpgradeStatus(true)
+                    }
                 }
+
             }else if(AdUpgradeStateHelper.isDownloadFailed(downloadStatus)){
                 //下载失败，将状态设为“最新版”角标，并隐藏进度条
                 ivAdStatus?.setImageResource(R.drawable.icon_latest_version)
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml
index 8ed352878a..a3c3f0e935 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml
@@ -108,13 +108,15 @@
 
     <TextView
         android:id="@+id/tvAdVersionContent"
-        android:layout_width="200px"
+        android:layout_width="250px"
         android:layout_height="wrap_content"
         app:layout_constraintLeft_toLeftOf="@id/ivAdVersion"
         app:layout_constraintRight_toRightOf="@id/ivAdVersion"
         app:layout_constraintTop_toBottomOf="@id/tvAdVersionTitle"
+        app:layout_constraintBottom_toBottomOf="parent"
         android:textColor="#FFA7B6F0"
         android:layout_marginTop="2dp"
+        android:layout_marginBottom="20dp"
         android:textSize="32px"
         />