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

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.drawable.bg_evaluation_result)
+            binding.evaluationLayout.setBackgroundResource(R.color.color_FFCFD9FF)
         } else {
-            binding.evaluationLayout.setBackgroundResource(R.color.transparent)
+            binding.evaluationLayout.setBackgroundResource(R.color.color_FFE6ECFF)
         }
         binding.tvDetails.setOnSingleClickListener {
             onClickListener?.invoke(item)

home/src/main/java/com/yingyangfly/home/evaluation/EvaluationActivity.kt

@@ -23,6 +23,7 @@ class EvaluationActivity : BaseMVVMActivity<ActivityEvaluationBinding, Evaluatio
     View.OnTouchListener {
 
     private var reviewTaskId = ""
+    private var taskId = ""
 
     override fun initViews() {
 
@@ -53,7 +54,7 @@ class EvaluationActivity : BaseMVVMActivity<ActivityEvaluationBinding, Evaluatio
                 if (it.isNullOrEmpty().not()) {
                     questionsList.addAll(it!!)
                     questionsList.forEach {
-                        it.reviewTaskId = reviewTaskId
+                        it.reviewTaskId = taskId
                     }
                     dao?.insertAll(questionsList)
                 }
@@ -70,33 +71,34 @@ class EvaluationActivity : BaseMVVMActivity<ActivityEvaluationBinding, Evaluatio
     override fun onTouch(v: View, event: MotionEvent): Boolean {
         when (event.action) {
             MotionEvent.ACTION_DOWN -> {
-                if (v.id == R.id.layoutHome || v.id == R.id.mmseLayout ||
-                    v.id == R.id.mocaLayout || v.id == R.id.tvEvaluationHistory
-                ) {
+                if (v.id == R.id.layoutHome || v.id == R.id.mmseLayout || v.id == R.id.mocaLayout || v.id == R.id.tvEvaluationHistory) {
                     v.startAnimation(getScaleAnimation())
                 }
             }
+
             MotionEvent.ACTION_UP -> {
                 v.startAnimation(getEndAnimation())
                 when (v.id) {
                     R.id.mmseLayout -> {
                         getReviewTaskList("MMSE", "0")
                     }
+
                     R.id.mocaLayout -> {
                         getReviewTaskList("MOCA", "0")
                     }
+
                     R.id.layoutHome -> {
                         finish()
                     }
+
                     R.id.tvEvaluationHistory -> {
                         JumpUtil.jumpActivity(RouterUrlCommon.evaluationHistory, mContext)
                     }
                 }
             }
+
             MotionEvent.ACTION_CANCEL -> {
-                if (v.id == R.id.layoutHome || v.id == R.id.mmseLayout ||
-                    v.id == R.id.mocaLayout || v.id == R.id.tvEvaluationHistory
-                ) {
+                if (v.id == R.id.layoutHome || v.id == R.id.mmseLayout || v.id == R.id.mocaLayout || v.id == R.id.tvEvaluationHistory) {
                     v.startAnimation(getEndAnimation())
                 }
             }
@@ -116,6 +118,7 @@ class EvaluationActivity : BaseMVVMActivity<ActivityEvaluationBinding, Evaluatio
                     val record = it.records[0]
                     if (record != null) {
                         reviewTaskId = record.reviewTaskId
+                        taskId = record.id
                     }
                     loadData(type)
                 } else {

home/src/main/java/com/yingyangfly/home/evaluation/EvaluationHistoryActivity.kt

@@ -36,7 +36,7 @@ class EvaluationHistoryActivity :
                     "请完成测评，再查看报告详情哦！".toast()
                 } else {
                     JumpUtil.jumpActivityWithUrl(
-                        RouterUrlCommon.reviewResultDetail, it.reviewTaskId, mContext
+                        RouterUrlCommon.reviewResultDetail, it.id, mContext
                     )
                 }
             }

home/src/main/res/layout/item_evaluation_history.xml

@@ -19,11 +19,21 @@
             android:textColor="@android:color/white"
             android:textSize="@dimen/divider_24px" />
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rvEvaluation"
+        <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+            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>
+
+
     </LinearLayout>
 
 </layout>