yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[opt]1.任务完成度：已完成的子任务记入完成度，进行中的不计入；2.贴边显示：默认为"--cm"

Browse Source
This commit is contained in:
pangfan
2023-03-11 12:13:31 +08:00
parent ea897afab4
commit 6df848f9ad
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt
View File

@@ -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)
}

6
OCH/mogo-och-sweeper/src/main/res/layout/sweeper_welt_map_overview.xml
View File

@@ -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"

6
OCH/mogo-och-sweeper/src/main/res/layout/sweeper_welt_small_map_view.xml
View File

@@ -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"