1.添加获取首页轮播图接口

evaluation/src/main/java/com/yingyangfly/evaluation/adapter/OtherReviewResultDetailAdapter.kt

@@ -15,5 +15,10 @@ class OtherReviewResultDetailAdapter(override val layoutId: Int = R.layout.item_
         binding: ItemOtherReviewResultDetailBinding, item: SelectAnswerRecordDetail, position: Int
     ) {
         binding.data = item
+        if (position % 2 == 0) {
+            binding.evaluationLayout.setBackgroundResource(R.drawable.bg_other_evaluation_result)
+        } else {
+            binding.evaluationLayout.setBackgroundResource(R.drawable.bg_other_evaluation_history)
+        }
     }
 }

evaluation/src/main/java/com/yingyangfly/evaluation/detail/OtherReviewResultDetailActivity.kt

@@ -23,7 +23,6 @@ class OtherReviewResultDetailActivity :
     BaseMVVMActivity<ActivityOtherReviewResultDetailBinding, OtherReviewResultDetailViewModel>(),
     View.OnTouchListener {
 
-    private var page = 1
     private var recordId = ""
     private val adapter by lazy { OtherReviewResultDetailAdapter() }
     private var selectAnswerRecordDetail = mutableListOf<SelectAnswerRecordDetail>()
@@ -48,11 +47,6 @@ class OtherReviewResultDetailActivity :
     }
 
     override fun initData() {
-
-    }
-
-    override fun onResume() {
-        super.onResume()
         loadData()
     }
 
@@ -60,7 +54,7 @@ class OtherReviewResultDetailActivity :
      * 获取测评报告详情
      */
     private fun loadData() {
-        viewModel.selectAnswerRecordDetail(recordId, page, fail = {
+        viewModel.selectAnswerRecordDetail(recordId, fail = {
             it.toast()
         }, success = {
             selectAnswerRecordDetail.clear()

evaluation/src/main/java/com/yingyangfly/evaluation/detail/OtherReviewResultDetailViewModel.kt

@@ -15,13 +15,12 @@ class OtherReviewResultDetailViewModel : BaseViewModel() {
      */
     fun selectAnswerRecordDetail(
         id: String,
-        index: Int,
         fail: ((msg: String) -> Unit)? = null,
         success: ((success: SelectAnswerRecordDetailBean?) -> Unit)? = null,
     ) = launchFlow(true) {
         val requestBean = GetSelectAnswerRecordDetailBean().apply {
             recordId = id
-            page = index
+            page = 0
             limit = 99999
         }
         Log.e("wpp", GsonUtil.GsonString(requestBean))

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

@@ -30,7 +30,7 @@ data class SelectAnswerRecordDetail(
     val questionId: String,
     val questionOptionId: String,
     val questionOptionName: String,
-    val questionScore: Int,
+    val questionScore: String,
     val questionTitle: String,
     val recordId: String,
     val updateBy: String,

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

@@ -31,7 +31,7 @@ class EvaluationHistoryActivity :
     /**
      * 其他测评
      */
-    private var page = 1
+    private var page = 0
     private val otherEvaluationHistoryAdapter by lazy { OtherEvaluationHistoryAdapter() }
     private var selectAnswerRecord = mutableListOf<SelectAnswerRecord>()
 
@@ -105,7 +105,7 @@ class EvaluationHistoryActivity :
      */
     private fun getOtherReviewTaskHistory(isRefresh: Boolean, isShowLoading: Boolean) {
         if (isRefresh) {
-            page = 1
+            page = 0
             binding.swipeOtherResult.resetNoMoreData()
         } else {
             page++

evaluation/src/main/java/com/yingyangfly/evaluation/otherevaluation/OtherEvaluationActivity.kt

@@ -37,7 +37,7 @@ class OtherEvaluationActivity :
     private var evaluationTypeList = mutableListOf<EvaluationTypeBean>()
     private val evaluationAdapter by lazy { EvaluationTypeAdapter() }
 
-    private var page = 1
+    private var page = 0
     private var evaluationList = mutableListOf<ExaminationRecord>()
     private val examinationAdapter by lazy { ExaminationAdapter() }
 
@@ -121,7 +121,7 @@ class OtherEvaluationActivity :
         isRefresh: Boolean, showLoading: Boolean
     ) {
         if (isRefresh) {
-            page = 1
+            page = 0
             binding.swipeEvaluation.resetNoMoreData()
         } else {
             page++

evaluation/src/main/java/com/yingyangfly/evaluation/otherevaluation/OtherEvaluationViewModel.kt

@@ -59,7 +59,7 @@ class OtherEvaluationViewModel : BaseViewModel() {
     ) = launchFlow(true) {
         val requestBean = GetQuestionListBean().apply {
             limit = "99999"
-            page = 1
+            page = 0
             examinationId = id
         }
         val body = XUtils.createJson(GsonUtil.GsonString(requestBean))

evaluation/src/main/res/layout/activity_evaluation_history.xml

@@ -253,6 +253,7 @@
                     android:layout_marginEnd="@dimen/divider_37px"
                     android:background="@drawable/bg_other_evaluation_top_results"
                     android:orientation="horizontal"
+                    android:visibility="gone"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/tvName">
@@ -316,6 +317,7 @@
                     android:layout_marginEnd="@dimen/divider_37px"
                     android:layout_marginBottom="@dimen/divider_36px"
                     android:orientation="vertical"
+                    android:visibility="gone"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"

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

@@ -132,10 +132,11 @@
                     app:layout_constraintTop_toBottomOf="@+id/tvName">
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        android:layout_width="@dimen/divider_160px"
+                        android:layout_width="wrap_content"
                         android:layout_height="match_parent"
+                        android:layout_weight="1.5"
                         android:gravity="center"
-                        android:text="@string/evaluation_name"
+                        android:text="@string/id"
                         android:textColor="@android:color/white"
                         android:textSize="@dimen/divider_24px"
                         android:textStyle="bold" />
@@ -145,7 +146,7 @@
                         android:layout_height="match_parent"
                         android:layout_weight="1"
                         android:gravity="center"
-                        android:text="@string/evaluation_data_id"
+                        android:text="@string/title_data"
                         android:textColor="@android:color/white"
                         android:textSize="@dimen/divider_24px"
                         android:textStyle="bold" />
@@ -155,7 +156,7 @@
                         android:layout_height="match_parent"
                         android:layout_weight="1"
                         android:gravity="center"
-                        android:text="@string/score_range"
+                        android:text="@string/score"
                         android:textColor="@android:color/white"
                         android:textSize="@dimen/divider_24px"
                         android:textStyle="bold" />
@@ -165,7 +166,7 @@
                         android:layout_height="match_parent"
                         android:layout_weight="1"
                         android:gravity="center"
-                        android:text="@string/score"
+                        android:text="@string/problem_options"
                         android:textColor="@android:color/white"
                         android:textSize="@dimen/divider_24px"
                         android:textStyle="bold" />

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

@@ -12,18 +12,18 @@
     </data>
 
     <LinearLayout
-        android:id="@+id/detailLayout"
+        android:id="@+id/evaluationLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/divider_98px"
         android:orientation="horizontal">
 
-
         <androidx.appcompat.widget.AppCompatTextView
-            android:layout_width="@dimen/divider_160px"
+            android:layout_width="0dp"
             android:layout_height="match_parent"
+            android:layout_weight="1.5"
             android:gravity="center"
-            android:text="@{data.questionTitle}"
-            android:textColor="@android:color/white"
+            android:text="@{data.recordId}"
+            android:textColor="@color/color_FF4A76FF"
             android:textSize="@dimen/divider_24px"
             android:textStyle="bold" />
 
@@ -32,8 +32,8 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:gravity="center"
-            android:text="@{data.recordId}"
-            android:textColor="@android:color/white"
+            android:text="@{data.questionTitle}"
+            android:textColor="@color/color_FF4A76FF"
             android:textSize="@dimen/divider_24px"
             android:textStyle="bold" />
 
@@ -43,7 +43,7 @@
             android:layout_weight="1"
             android:gravity="center"
             android:text="@{data.questionOptionName}"
-            android:textColor="@android:color/white"
+            android:textColor="@color/color_FF4A76FF"
             android:textSize="@dimen/divider_24px"
             android:textStyle="bold" />
 
@@ -53,7 +53,7 @@
             android:layout_weight="1"
             android:gravity="center"
             android:text="@{data.questionScore}"
-            android:textColor="@android:color/white"
+            android:textColor="@color/color_FF4A76FF"
             android:textSize="@dimen/divider_24px"
             android:textStyle="bold" />
 

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

@@ -80,4 +80,5 @@
     <string name="title_data" tools:ignore="ResourceName">标题</string>
     <string name="create_time" tools:ignore="ResourceName">创建时间</string>
     <string name="answer_details" tools:ignore="ResourceName">答题详情</string>
+    <string name="problem_options" tools:ignore="ResourceName">问题选项</string>
 </resources>