Browse Source

修复八大步骤页可能存在的背景色显示错乱

Frankensteinly 9 months ago
parent
commit
aa806e4b8a
1 changed files with 10 additions and 5 deletions
  1. 10 5
      app/src/main/java/com/grkj/iscs/view/fragment/StepFragment.kt

+ 10 - 5
app/src/main/java/com/grkj/iscs/view/fragment/StepFragment.kt

@@ -46,12 +46,17 @@ class StepFragment(val goBack: () -> Unit, val changePage: (PageChangeBO) -> Uni
         mBinding?.rvStep?.adapter = object : CommonAdapter<StepBO>(requireContext(), R.layout.item_rv_step, mStepList) {
             override fun convert(holder: ViewHolder, step: StepBO, position: Int) {
                 if (step.stepDetail?.stepStatus == "1") {
-                    holder.getView<MaterialCardView>(R.id.cv_step).setCardBackgroundColor(requireContext().getColor(R.color.item_rv_step_bg_done))
-                }
-                val first = mStepList.filter { it.stepDetail?.stepStatus == "0" }.minByOrNull { it.index }
-                if (first?.index == step.index) {
-                    holder.getView<MaterialCardView>(R.id.cv_step).setCardBackgroundColor(requireContext().getColor(R.color.item_rv_step_bg_doing))
+                    holder.getView<MaterialCardView>(R.id.cv_step)
+                        .setCardBackgroundColor(requireContext().getColor(R.color.item_rv_step_bg_done))
+                } else {
+                    holder.getView<MaterialCardView>(R.id.cv_step).setCardBackgroundColor(
+                        if (mStep + 1 == step.index)
+                            requireContext().getColor(R.color.item_rv_step_bg_doing)
+                        else
+                            requireContext().getColor(R.color.common_bg_white_10)
+                    )
                 }
+
                 holder.setVisible(R.id.iv_arrow_right, step.index !in 4..5)
                 holder.setVisible(R.id.iv_arrow_bottom, step.index == 4)
                 holder.getView<ImageView>(R.id.iv_arrow_right).rotation = if (step.index > 5) 180f else 0f