From f73b17ae1a884d3fdb369720793d40da0ead6da1 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Sat, 15 Feb 2025 22:06:06 +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 | 59 +++++++++++-------- 1 file changed, 35 insertions(+), 24 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 5afaf408ae..5f14911719 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 @@ -96,9 +96,9 @@ class DiskCopyView @JvmOverloads constructor( //开始拷贝数据 val result = CallerAutoPilotControlManager.sendCopyBagCopyDate(currentCopyDate) if(result){ - //将当前拷贝状态置为拷贝中 - copyStatus = 2 - notifyCopyStatusDisplay(copyStatus) + ToastUtils.showShort("已发起拷贝") + }else{ + ToastUtils.showShort("拷贝命令发送失败") } } 2 -> { @@ -324,7 +324,7 @@ class DiskCopyView @JvmOverloads constructor( when(copyStatus){ //默认状态 0->{ - + tvCopyStatus.text = "" } //开始拷贝数据 1->{ @@ -430,24 +430,6 @@ class DiskCopyView @JvmOverloads constructor( } } //挂载成功的信息集合 - Logger.i(TAG,"磁盘空间不足提示: 移动硬盘剩余空间不足，建议更换硬盘="+diskCopy.mountSuccess.tips) - if(diskCopy.mountSuccess.tips.isNotEmpty()){ - //如果磁盘空间不足字段不为空（默认设置的不足100G会提示空间不足，如果收到拷贝开始时会再检查本次拷贝总大小和剩余空间，如果剩余空间不满足本次拷贝也会提示不足） - //则更换磁盘空间进度条展示样式，并且进行弹窗提示 - pbDiskUsedSpaces.progressDrawable = ContextCompat.getDrawable( - context, - R.drawable.progressbar_disk_not_enough_space - ) - //数据拷贝工具异常 - CallerHmiManager.showDiskCopyExceptionDialog("数据拷贝工具异常",diskCopy.mountSuccess.tips) - copyStatus = 4 - notifyCopyStatusDisplay(copyStatus) - }else{ - pbDiskUsedSpaces.progressDrawable = ContextCompat.getDrawable( - context, - R.drawable.progressbar_disk_used_space - ) - } Logger.i(TAG,"磁盘总空间="+diskCopy.mountSuccess.totalSize) Logger.i(TAG,"磁盘剩余空间="+diskCopy.mountSuccess.diskFree) //磁盘剩余空间显示 @@ -480,14 +462,25 @@ class DiskCopyView @JvmOverloads constructor( Logger.i(TAG,"需要拷贝的文件总大小="+diskCopy.copyTotalSize) //已拷贝大小 Logger.i(TAG,"已拷贝大小="+diskCopy.copiedSize) - if(diskCopy.copiedSize == 0L){ + if(diskCopy.copyTotalSize == 0L){ //隐藏拷贝进度条 pbDiskCopyProgress.visibility = View.GONE + //判断当前日期是否有可拷贝数据，有可拷贝数据显示“开始拷贝数据”否则显示“所选日期无法拷贝” + copyStatus = if(diskCopy.mountSuccess.datesList.contains(currentCopyDate.toString())){ + 1 + }else{ + 5 + } + notifyCopyStatusDisplay(copyStatus) }else{ //展示拷贝进度条，并且展示进度 pbDiskCopyProgress.visibility = View.VISIBLE val copyProgress = (diskCopy.copiedSize*100/diskCopy.copyTotalSize).toInt() - pbDiskCopyProgress.progress = copyProgress + if(copyProgress < 4){ + pbDiskCopyProgress.progress = 4 + }else{ + pbDiskCopyProgress.progress = copyProgress + } //拷贝状态控件显示当前拷贝进度 copyStatus = 2 notifyCopyStatusDisplay(copyStatus,copyProgress) @@ -496,6 +489,24 @@ class DiskCopyView @JvmOverloads constructor( Logger.i(TAG,"拷贝剩余时间="+diskCopy.freeTime) //拷贝是否成功,是-True,否-False Logger.i(TAG,"拷贝是否成功,是-True,否-False="+diskCopy.copyStatus) + Logger.i(TAG,"磁盘空间不足提示: 移动硬盘剩余空间不足，建议更换硬盘="+diskCopy.mountSuccess.tips) + if(diskCopy.mountSuccess.tips.isNotEmpty()){ + //如果磁盘空间不足字段不为空（默认设置的不足100G会提示空间不足，如果收到拷贝开始时会再检查本次拷贝总大小和剩余空间，如果剩余空间不满足本次拷贝也会提示不足） + //则更换磁盘空间进度条展示样式，并且进行弹窗提示 + pbDiskUsedSpaces.progressDrawable = ContextCompat.getDrawable( + context, + R.drawable.progressbar_disk_not_enough_space + ) + //数据拷贝工具异常 + CallerHmiManager.showDiskCopyExceptionDialog("数据拷贝工具异常",diskCopy.mountSuccess.tips) + copyStatus = 4 + notifyCopyStatusDisplay(copyStatus) + }else{ + pbDiskUsedSpaces.progressDrawable = ContextCompat.getDrawable( + context, + R.drawable.progressbar_disk_used_space + ) + } if(diskCopy.copyStatus){ //将当前拷贝状态置为拷贝成功 copyStatus = 3