1.测评历史添加智能测评历史记录列表和详情功能

config.gradle

@@ -14,7 +14,7 @@ ext {
             minSdkVersion    : 19,
             targetSdkVersion : 30,
             versionCode      : 4,
-            versionName      : "1.0.0.10",
+            versionName      : "1.0.0.11",
     ]
     //androidx配置
     androidx = [

home/src/main/java/com/yingyangfly/home/entity/SelectAnswerRecordDetailBean.kt

@@ -1,5 +1,7 @@
 package com.yingyangfly.home.entity
 
+import android.text.TextUtils
+
 /**
  * 获取其他测评报告bean
  */
@@ -35,5 +37,27 @@ data class SelectAnswerRecordDetail(
     val recordId: String,
     val updateBy: String,
     val updateTime: String,
-    val usedTime: String
-)
+    val usedTime: String,
+    val correctOption: String,
+    val isCorrect: String
+) {
+    fun getIsCorrectInfo(): String {
+        return if (TextUtils.isEmpty(isCorrect)) {
+            ""
+        } else {
+            when (isCorrect) {
+                "1" -> {
+                    "是"
+                }
+
+                "2" -> {
+                    "否"
+                }
+
+                else -> {
+                    ""
+                }
+            }
+        }
+    }
+}

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

@@ -31,10 +31,9 @@ class EvaluationHistoryActivity :
     /**
      * 其他测评
      */
-    private var page = 0
+    private var page = 1
     private val otherEvaluationHistoryAdapter by lazy { OtherEvaluationHistoryAdapter() }
     private var selectAnswerRecord = mutableListOf<SelectAnswerRecord>()
-    private var jumpType: String = ""
 
     private var results = mutableListOf<EvaluationHistoryBean>()
     private val adapter by lazy { EvaluationHistoryAdapter() }

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

@@ -134,9 +134,9 @@
                     <androidx.appcompat.widget.AppCompatTextView
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
-                        android:layout_weight="1.5"
+                        android:layout_weight="1"
                         android:gravity="center"
-                        android:text="@string/id"
+                        android:text="@string/title_data"
                         android:textColor="@android:color/white"
                         android:textSize="@dimen/divider_24px"
                         android:textStyle="bold" />
@@ -146,7 +146,17 @@
                         android:layout_height="match_parent"
                         android:layout_weight="1"
                         android:gravity="center"
-                        android:text="@string/title_data"
+                        android:text="@string/my_options"
+                        android:textColor="@android:color/white"
+                        android:textSize="@dimen/divider_24px"
+                        android:textStyle="bold" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:text="@string/correct_options"
                         android:textColor="@android:color/white"
                         android:textSize="@dimen/divider_24px"
                         android:textStyle="bold" />
@@ -166,7 +176,7 @@
                         android:layout_height="match_parent"
                         android:layout_weight="1"
                         android:gravity="center"
-                        android:text="@string/problem_options"
+                        android:text="@string/is_correct"
                         android:textColor="@android:color/white"
                         android:textSize="@dimen/divider_24px"
                         android:textStyle="bold" />

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

@@ -20,9 +20,9 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="1.5"
+            android:layout_weight="1"
             android:gravity="center"
-            android:text="@{data.recordId}"
+            android:text="@{data.questionTitle}"
             android:textColor="@color/color_FF4A76FF"
             android:textSize="@dimen/divider_24px"
             android:textStyle="bold" />
@@ -32,7 +32,7 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:gravity="center"
-            android:text="@{data.questionTitle}"
+            android:text="@{data.questionOptionName}"
             android:textColor="@color/color_FF4A76FF"
             android:textSize="@dimen/divider_24px"
             android:textStyle="bold" />
@@ -42,7 +42,7 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:gravity="center"
-            android:text="@{data.questionOptionName}"
+            android:text="@{data.correctOption}"
             android:textColor="@color/color_FF4A76FF"
             android:textSize="@dimen/divider_24px"
             android:textStyle="bold" />
@@ -57,6 +57,15 @@
             android:textSize="@dimen/divider_24px"
             android:textStyle="bold" />
 
-
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:text="@{data.getIsCorrectInfo()}"
+            android:textColor="@color/color_FF4A76FF"
+            android:textSize="@dimen/divider_24px"
+            android:textStyle="bold" />
+        
     </LinearLayout>
 </layout>

home/src/main/res/values/strings.xml

@@ -78,4 +78,7 @@
     <string name="create_time" tools:ignore="ResourceName">创建时间</string>
     <string name="answer_details" tools:ignore="ResourceName">答题详情</string>
     <string name="problem_options" tools:ignore="ResourceName">问题选项</string>
+    <string name="my_options" tools:ignore="ResourceName">我的答案</string>
+    <string name="correct_options" tools:ignore="ResourceName">正确答案</string>
+    <string name="is_correct" tools:ignore="ResourceName">是否正确</string>
 </resources>