From 6b6e9fa8e381603f02dcae5d0df40792cca91cac Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Mon, 30 Dec 2024 15:26:44 +0800
Subject: [PATCH] =?UTF-8?q?[6.9.0]OTA=E5=8D=87=E7=BA=A7=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6UI=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/drawable/progressbar_ota_download.xml | 42 +++++++++++++++++++
 .../res/layout/item_ota_download_status.xml   | 40 ++++++++++--------
 2 files changed, 65 insertions(+), 17 deletions(-)
 create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/progressbar_ota_download.xml
 rename core/function-impl/{mogo-core-function-devatools => mogo-core-function-hmi}/src/main/res/layout/item_ota_download_status.xml (54%)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/progressbar_ota_download.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/progressbar_ota_download.xml
new file mode 100644
index 0000000000..821492651b
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/progressbar_ota_download.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:paddingLeft="@dimen/dp_0">
+    <!--  设置背景色  -->
+    <item
+        android:id="@android:id/background"
+        android:width="@dimen/dp_769"
+        android:height="@dimen/dp_20"
+        android:gravity="center_vertical">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/color_1C1C1C" />
+<!--            <stroke-->
+<!--                android:width="2dp"-->
+<!--                android:color="@color/color_161618" />-->
+        </shape>
+    </item>
+
+    <!--    <item android:id="@android:id/secondaryProgress"-->
+    <!--        android:start="1.5dp"-->
+    <!--        android:end="1.5dp"-->
+    <!--        android:top="1.5dp"-->
+    <!--        android:bottom="1.5dp"-->
+    <!--        >-->
+    <!--        <scale android:scaleWidth="100%">-->
+    <!--            <shape>-->
+    <!--                <corners android:radius="21dp" />-->
+    <!--                <solid android:color="@android:color/holo_green_light" />-->
+    <!--            </shape>-->
+    <!--        </scale>-->
+    <!--    </item>-->
+
+    <!--  设置进度条颜色  -->
+    <item
+        android:id="@android:id/progress"
+        android:width="@dimen/dp_769"
+        android:height="@dimen/dp_50"
+        android:gravity="center_vertical">
+        <scale
+            android:drawable="@drawable/icon_progress_bg_patch"
+            android:scaleWidth="100%" />
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/item_ota_download_status.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_ota_download_status.xml
similarity index 54%
rename from core/function-impl/mogo-core-function-devatools/src/main/res/layout/item_ota_download_status.xml
rename to core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_ota_download_status.xml
index e5d31d0179..d733c8ecb6 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/item_ota_download_status.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_ota_download_status.xml
@@ -3,36 +3,42 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_margin="@dimen/dp_10">
+    android:layout_marginTop="@dimen/dp_54"
+    android:layout_marginBottom="@dimen/dp_14">
+
+    <ProgressBar
+        android:id="@+id/pbDownloadProgress"
+        android:layout_width="@dimen/dp_769"
+        android:layout_height="@dimen/dp_10"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:progressDrawable="@drawable/progressbar_ota_download"
+        android:max="100"
+        android:progress="0"
+        />
 
     <TextView
         android:id="@+id/tvProductName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/pbDownloadProgress"
+        app:layout_constraintLeft_toLeftOf="@id/pbDownloadProgress"
+        android:layout_marginBottom="@dimen/dp_11"
         android:textColor="@color/white"
-        android:textSize="@dimen/sp_30"
+        android:textSize="@dimen/sp_36"
         />
 
     <TextView
         android:id="@+id/tvDownloadProgress"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/pbDownloadProgress"
+        app:layout_constraintRight_toRightOf="@id/pbDownloadProgress"
+        android:layout_marginBottom="@dimen/dp_11"
         android:textColor="@color/white"
-        android:textSize="@dimen/sp_30"
-        />
-
-    <ProgressBar
-        android:id="@+id/pbDownloadProgress"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvProductName"
-        style="?android:attr/progressBarStyleHorizontal"
+        android:textSize="@dimen/sp_36"
         />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file