|
|
@@ -55,15 +55,13 @@ class RechargeDailyTaskListView @JvmOverloads constructor(
|
|
|
val progressScaleValue = 100.0F / ((items.size - 1).coerceAtLeast(1))
|
|
|
var curProgress = 0F
|
|
|
for ((index, element) in items.withIndex()) {
|
|
|
- if (element.isTaskCompleted()) {
|
|
|
- if (index > 0) {
|
|
|
+ if (index > 0) {
|
|
|
+ if (element.isTaskCompleted()) {
|
|
|
curProgress += progressScaleValue
|
|
|
- }
|
|
|
- } else {
|
|
|
- if (element.taskDimensionProgress > 0) {
|
|
|
+ } else {
|
|
|
curProgress += element.taskDimensionProgress / element.taskDimensionTarget.toFloat() * progressScaleValue
|
|
|
+ break
|
|
|
}
|
|
|
- break
|
|
|
}
|
|
|
}
|
|
|
if (mAnimation) {
|