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 5f14911719..7fda12f651 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 @@ -126,7 +126,12 @@ class DiskCopyView @JvmOverloads constructor( CallerHmiManager.showTerminateCopyDataDialog() }else{ //如果处于未拷贝状态,则调用硬盘安全弹出请求 - CallerAutoPilotControlManager.sendCopyBagSafeUnmount() + val result = CallerAutoPilotControlManager.sendCopyBagSafeUnmount() + if(result){ + ToastUtils.showShort("硬盘安全弹出命令已发送") + }else{ + ToastUtils.showShort("硬盘安全弹出命令发送失败") + } } } @@ -333,13 +338,20 @@ class DiskCopyView @JvmOverloads constructor( } //拷贝中 2->{ - tvCopyStatus.text = String.format(resources.getString(R.string.disk_copy_progress),copyProgress) + //配合进度条展示,最小拷贝进度显示1% + if(copyProgress == 0){ + tvCopyStatus.text = String.format(resources.getString(R.string.disk_copy_progress),1) + }else{ + tvCopyStatus.text = String.format(resources.getString(R.string.disk_copy_progress),copyProgress) + } tvCopyStatus.setTextColor(context.getColor(R.color.color_disk_copy_progress)) } //拷贝成功 3->{ tvCopyStatus.text = resources.getString(R.string.copy_bag_success) tvCopyStatus.setTextColor(context.getColor(R.color.color_copy_bag_success)) + //隐藏拷贝进度条 + pbDiskCopyProgress.visibility = View.GONE } //剩余空间不足 4->{ @@ -476,6 +488,17 @@ class DiskCopyView @JvmOverloads constructor( //展示拷贝进度条,并且展示进度 pbDiskCopyProgress.visibility = View.VISIBLE val copyProgress = (diskCopy.copiedSize*100/diskCopy.copyTotalSize).toInt() + if(copyProgress < 95){ + pbDiskCopyProgress.progressDrawable = ContextCompat.getDrawable( + context, + R.drawable.progressbar_disk_copy_progress + ) + }else{ + pbDiskCopyProgress.progressDrawable = ContextCompat.getDrawable( + context, + R.drawable.progressbar_disk_copy_progress_end + ) + } if(copyProgress < 4){ pbDiskCopyProgress.progress = 4 }else{ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/diskcopy/TerminateCopyDataDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/diskcopy/TerminateCopyDataDialog.kt index c7c1295f03..a900e10ec4 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/diskcopy/TerminateCopyDataDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/diskcopy/TerminateCopyDataDialog.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.LifecycleObserver import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog +import com.mogo.eagle.core.utilcode.util.ToastUtils import kotlinx.android.synthetic.main.dialog_terminate_copy_data.tvCopyTerminateCancel import kotlinx.android.synthetic.main.dialog_terminate_copy_data.tvCopyTerminateConfirm @@ -27,7 +28,12 @@ class TerminateCopyDataDialog(context: Context) : private fun initView(){ //确认终止数据拷贝 tvCopyTerminateConfirm.setOnClickListener { - CallerAutoPilotControlManager.sendCopyBagAbortCopy() + val result = CallerAutoPilotControlManager.sendCopyBagAbortCopy() + if(result){ + ToastUtils.showShort("终止数据拷贝命令已发送") + }else{ + ToastUtils.showShort("终止数据拷贝命令发送失败") + } dismiss() } //取消终止数据拷贝 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/progressbar_disk_copy_progress_end.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/progressbar_disk_copy_progress_end.xml new file mode 100644 index 0000000000..f52ea1eff1 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/progressbar_disk_copy_progress_end.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 ff9103a9d0..d1136e4bb1 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 @@ -6,27 +6,15 @@ android:background="@drawable/bg_bone_dialog" app:roundLayoutRadius="@dimen/dp_50"> - - @@ -38,12 +26,12 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/tvCopyBagSuccessTitle" - android:layout_marginTop="@dimen/dp_10" + android:layout_marginTop="@dimen/dp_15" android:layout_marginStart="@dimen/dp_30" android:layout_marginEnd="@dimen/dp_30" android:textColor="@color/white" - android:textSize="@dimen/sp_36" - android:gravity="center_horizontal" + android:textSize="@dimen/sp_34" + android:gravity="start" /> 取消 数据落盘异常图标 关闭 - 数据落盘成功图标 关闭 %dG可用 %d%%