瀏覽代碼

1.修改测评历史功能逻辑

王鹏鹏 2 年之前
父節點
當前提交
d095cd9d65

+ 5 - 3
home/src/main/java/com/yingyangfly/home/adapter/EvaluationHistoryAdapter.kt

@@ -1,5 +1,6 @@
 package com.yingyangfly.home.adapter
 
+import android.annotation.SuppressLint
 import android.text.TextUtils
 import com.yingyang.home.R
 import com.yingyang.home.databinding.ItemEvaluationHistoryBinding
@@ -14,13 +15,14 @@ class EvaluationHistoryAdapter(override val layoutId: Int = R.layout.item_evalua
     BaseDataBindingAdapter<EvaluationHistoryBean, ItemEvaluationHistoryBinding>() {
 
     var onClickListener: ((bean: EvaluationHistoryBeanSubListItem) -> Unit)? = null
+    @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(
         binding: ItemEvaluationHistoryBinding, item: EvaluationHistoryBean, position: Int
     ) {
-        binding.tvDate.text = if (item.isNullOrEmpty().not()) {
+        binding.tvDate.text = "测评任务编号:" + if (item.isNullOrEmpty().not()) {
             val data = item[0]
-            if (data != null && TextUtils.isEmpty(data.createTime).not()) {
-                data.createTime.substring(0, 11)
+            if (data != null && TextUtils.isEmpty(data.reviewTaskId).not()) {
+                data.reviewTaskId
             } else {
                 ""
             }

+ 2 - 2
home/src/main/java/com/yingyangfly/home/adapter/EvaluationHistoryItemAdapter.kt

@@ -41,9 +41,9 @@ class EvaluationHistoryItemAdapter(override val layoutId: Int = R.layout.item_ev
                 ""
             }
         if (position % 2 == 0) {
-            binding.evaluationLayout.setBackgroundResource(R.color.color_FFCFD9FF)
+            binding.evaluationLayout.setBackgroundResource(R.drawable.bg_evaluation_result)
         } else {
-            binding.evaluationLayout.setBackgroundResource(R.color.color_FFE6ECFF)
+            binding.evaluationLayout.setBackgroundResource(R.drawable.bg_evaluation_history)
         }
         binding.tvDetails.setOnSingleClickListener {
             onClickListener?.invoke(item)

+ 2 - 2
home/src/main/res/drawable/bg_evaluation_date.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="ResourceName">
     <corners
-        android:topLeftRadius="@dimen/divider_19px"
-        android:topRightRadius="@dimen/divider_19px" />
+        android:topLeftRadius="@dimen/divider_28px"
+        android:topRightRadius="@dimen/divider_28px" />
     <solid android:color="@color/color_FF4A76FF" />
 </shape>

+ 10 - 0
home/src/main/res/drawable/bg_evaluation_history.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+    <corners
+        android:bottomLeftRadius="@dimen/divider_28px"
+        android:bottomRightRadius="@dimen/divider_28px" />
+
+    <solid android:color="@color/color_FFE6ECFF" />
+</shape>

+ 1 - 1
home/src/main/res/drawable/bg_evaluation_result.xml

@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="ResourceName">
-    <corners android:radius="@dimen/divider_12px" />
+    <corners android:topRightRadius="@dimen/divider_28px" />
     <solid android:color="@color/color_FFCFD9FF" />
 </shape>

+ 6 - 13
home/src/main/res/layout/item_evaluation_history.xml

@@ -12,27 +12,20 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tvDate"
-            android:layout_width="@dimen/divider_226px"
+            android:layout_width="wrap_content"
             android:layout_height="@dimen/divider_37px"
             android:background="@drawable/bg_evaluation_date"
             android:gravity="center"
+            android:paddingStart="@dimen/divider_45px"
+            android:paddingEnd="@dimen/divider_45px"
             android:textColor="@android:color/white"
             android:textSize="@dimen/divider_24px" />
 
-        <com.google.android.material.card.MaterialCardView
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rvEvaluation"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:theme="@style/Theme.MaterialComponents.NoActionBar"
-            app:cardCornerRadius="@dimen/divider_28px">
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/rvEvaluation"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        </com.google.android.material.card.MaterialCardView>
-
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
     </LinearLayout>