[6.10.0]数据落盘修改

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{

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()
         }
         //取消终止数据拷贝

core/function-impl/mogo-core-function-hmi/src/main/res/drawable/progressbar_disk_copy_progress_end.xml

@@ -0,0 +1,34 @@
+<?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_654"
+        android:height="@dimen/dp_440"
+        android:gravity="center_vertical">
+        <shape>
+            <corners android:radius="@dimen/dp_50" />
+            <solid android:color="#00FFFFFF" />
+        </shape>
+    </item>
+
+    <!--  设置进度条颜色  -->
+    <item
+        android:id="@android:id/progress">
+        <scale android:scaleWidth="100%">
+            <shape>
+                <corners
+                    android:topLeftRadius="@dimen/dp_50"
+                    android:bottomLeftRadius="@dimen/dp_50"
+                    android:topRightRadius="@dimen/dp_50"
+                    android:bottomRightRadius="@dimen/dp_50"
+                    />
+                <gradient
+                    android:angle="0"
+                    android:startColor="#0000E5FF"
+                    android:endColor="#8000FFA6"
+                    />
+            </shape>
+        </scale>
+    </item>
+</layer-list>

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">
 
-    <ImageView
-        android:id="@+id/ivCopyBagSuccess"
-        android:layout_width="@dimen/dp_140"
-        android:layout_height="@dimen/dp_140"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginTop="@dimen/dp_87"
-        android:src="@drawable/icon_ota_upgrade_success"
-        android:contentDescription="@string/copy_bag_success_icon"
-        />
-
     <TextView
         android:id="@+id/tvCopyBagSuccessTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/ivCopyBagSuccess"
-        android:layout_marginTop="@dimen/dp_30"
-        android:textColor="@color/white"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="@dimen/dp_40"
+        android:textColor="@color/color_2EACFF"
         android:textSize="@dimen/sp_45"
         android:gravity="center_horizontal"
         />
@@ -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"
         />
 
     <TextView
@@ -53,7 +41,7 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginBottom="@dimen/dp_62"
+        android:layout_marginBottom="@dimen/dp_30"
         android:gravity="center"
         android:text="@string/copy_bag_success_close"
         android:background="@drawable/bg_dialog_btn"

core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml

@@ -287,7 +287,6 @@
     <string name="disk_copy_terminate_cancel">取消</string>
     <string name="disk_copy_exception_icon">数据落盘异常图标</string>
     <string name="disk_copy_exception_close">关闭</string>
-    <string name="copy_bag_success_icon">数据落盘成功图标</string>
     <string name="copy_bag_success_close">关闭</string>
     <string name="disk_free_space">%dG可用</string>
     <string name="disk_used_percent">%d%%</string>