From 6df848f9ad264d8f1edc255c6cc4b73a398fae62 Mon Sep 17 00:00:00 2001
From: pangfan <pangfan@zhidao.com>
Date: Sat, 11 Mar 2023 12:13:31 +0800
Subject: [PATCH] =?UTF-8?q?[opt]1.=E4=BB=BB=E5=8A=A1=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E5=BA=A6=EF=BC=9A=E5=B7=B2=E5=AE=8C=E6=88=90=E7=9A=84=E5=AD=90?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AE=B0=E5=85=A5=E5=AE=8C=E6=88=90=E5=BA=A6?=
 =?UTF-8?q?=EF=BC=8C=E8=BF=9B=E8=A1=8C=E4=B8=AD=E7=9A=84=E4=B8=8D=E8=AE=A1?=
 =?UTF-8?q?=E5=85=A5=EF=BC=9B2.=E8=B4=B4=E8=BE=B9=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=9A=E9=BB=98=E8=AE=A4=E4=B8=BA"--cm"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/sweeper/fragment/SweeperFragment.kt   | 10 +++++-----
 .../src/main/res/layout/sweeper_welt_map_overview.xml  |  6 +++---
 .../main/res/layout/sweeper_welt_small_map_view.xml    |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt
index 59d1b92477..e1933fcce0 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt
+++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt
@@ -52,7 +52,6 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
     private var mLocation: MogoLocation? = null
     private var mSubInfo: SubInfo? = null
 
-    //当前经纬度
     override fun getTagName(): String {
         return "SweepersFragment"
     }
@@ -355,13 +354,14 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
                 for (index in it.indices) {
                     sum += it[index].mileage
                 }
-                var current: Double = 0.0
+                var completed: Double = 0.0
                 for (index in it.indices) {
-                    if (index <= mCurrentSubPosition) {
-                        current += it[index].mileage
+                    if (index < mCurrentSubPosition) {
+                        // 已完成的子任务记入完成度，进行中的不计入
+                        completed += it[index].mileage
                     }
                 }
-                val progress = "${((current / sum) * 100.0).roundToInt()}%"
+                val progress = "${((completed / sum) * 100.0).roundToInt()}%"
                 setTaskProgress(progress)
             }
 
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_welt_map_overview.xml b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_welt_map_overview.xml
index 980fd8c76f..b79d84c61b 100644
--- a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_welt_map_overview.xml
+++ b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_welt_map_overview.xml
@@ -36,7 +36,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             android:background="#3f69d9"
-            android:textColor="@color/white"
+            android:textColor="@android:color/white"
             android:paddingTop="4dp"
             android:paddingBottom="4dp"
             android:paddingLeft="6dp"
@@ -50,11 +50,11 @@
             android:id="@+id/taskWeltDistanceTv"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:text="贴边:0.0cm"
+            android:text="贴边:--cm"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             android:background="#3d98c7"
-            android:textColor="@color/white"
+            android:textColor="@android:color/white"
             app:layout_constraintStart_toEndOf="@+id/taskProgressTv"
             android:paddingTop="4dp"
             android:paddingBottom="4dp"
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_welt_small_map_view.xml b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_welt_small_map_view.xml
index 6433b172de..9d079de8bb 100644
--- a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_welt_small_map_view.xml
+++ b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_welt_small_map_view.xml
@@ -30,7 +30,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         android:background="#3f69d9"
-        android:textColor="@color/white"
+        android:textColor="@android:color/white"
         android:paddingTop="4dp"
         android:paddingBottom="4dp"
         android:paddingLeft="6dp"
@@ -41,10 +41,10 @@
         android:id="@+id/taskWeltDistanceTv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="贴边:0.0cm"
+        android:text="贴边:--cm"
         app:layout_constraintTop_toTopOf="parent"
         android:background="#3d98c7"
-        android:textColor="@color/white"
+        android:textColor="@android:color/white"
         app:layout_constraintStart_toEndOf="@+id/taskProgressTv"
         android:paddingTop="4dp"
         android:paddingBottom="4dp"