From d0e0f5009fda60260d4f61f63931f455e10485da Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Fri, 14 Feb 2025 20:19:34 +0800 Subject: [PATCH] =?UTF-8?q?[6.10.0]=E6=95=B0=E6=8D=AE=E8=90=BD=E7=9B=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/hmi/ui/diskcopy/DiskCopyView.kt | 19 +++++++++++++------ .../res/layout/dialog_copy_bag_success.xml | 2 ++ .../res/layout/dialog_disk_copy_exception.xml | 2 ++ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/diskcopy/DiskCopyView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/diskcopy/DiskCopyView.kt index 7289f3f02b..5afaf408ae 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/diskcopy/DiskCopyView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/diskcopy/DiskCopyView.kt @@ -395,6 +395,8 @@ class DiskCopyView @JvmOverloads constructor( override fun onAttachedToWindow() { super.onAttachedToWindow() CallerDiskCopyManager.addListener(TAG, this) + //硬盘挂载状态查询 + CallerAutoPilotControlManager.sendCopyBagDiskStatus() } override fun onDetachedFromWindow() { @@ -418,7 +420,8 @@ class DiskCopyView @JvmOverloads constructor( } //挂载异常 1->{ - //TODO + //隐藏数据落盘辅助工具视图 + this@DiskCopyView.visibility = View.GONE } //未挂载 2->{ @@ -449,11 +452,13 @@ class DiskCopyView @JvmOverloads constructor( Logger.i(TAG,"磁盘剩余空间="+diskCopy.mountSuccess.diskFree) //磁盘剩余空间显示 tvDiskFreeSpace.text = String.format(resources.getString(R.string.disk_free_space),diskCopy.mountSuccess.diskFree) - val diskUsedPercent = ((diskCopy.mountSuccess.totalSize-diskCopy.mountSuccess.diskFree)*100/diskCopy.mountSuccess.totalSize).toInt() - //磁盘已用空间百分比文字显示 - tvDiskUsedPercent.text = String.format(resources.getString(R.string.disk_used_percent),diskUsedPercent) - //磁盘已用空间百分比进度条 - pbDiskUsedSpaces.progress = diskUsedPercent + if(diskCopy.mountSuccess.totalSize > 0){ + val diskUsedPercent = ((diskCopy.mountSuccess.totalSize-diskCopy.mountSuccess.diskFree)*100/diskCopy.mountSuccess.totalSize).toInt() + //磁盘已用空间百分比文字显示 + tvDiskUsedPercent.text = String.format(resources.getString(R.string.disk_used_percent),diskUsedPercent) + //磁盘已用空间百分比进度条 + pbDiskUsedSpaces.progress = diskUsedPercent + } Logger.i(TAG,"可拷贝日期数量="+diskCopy.mountSuccess.datesCount) diskCopy.mountSuccess.datesList.forEach { Logger.i(TAG, "可拷贝日期=$it") @@ -509,6 +514,8 @@ class DiskCopyView @JvmOverloads constructor( Logger.i(TAG,"硬盘是否已安全弹出,是-True,否-False="+diskCopy.diskUnmount) if(diskCopy.diskUnmount){ ToastUtils.showShort("硬盘已安全弹出") + //隐藏数据落盘辅助工具视图 + this@DiskCopyView.visibility = View.GONE } //硬盘弹出失败提示:安全弹出失败，建议车辆下电后拔走硬盘 Logger.i(TAG,"硬盘弹出失败提示="+diskCopy.unmountErr) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_copy_bag_success.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_copy_bag_success.xml index 4c98667b05..ff9103a9d0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_copy_bag_success.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_copy_bag_success.xml @@ -28,6 +28,7 @@ android:layout_marginTop="@dimen/dp_30" android:textColor="@color/white" android:textSize="@dimen/sp_45" + android:gravity="center_horizontal" />