Ver Fonte

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

王鹏鹏 há 2 anos atrás
pai
commit
5c3cba6bc9

+ 9 - 1
evaluation/src/main/java/com/yingyangfly/evaluation/adapter/OtherEvaluationHistoryAdapter.kt

@@ -2,6 +2,7 @@ package com.yingyangfly.evaluation.adapter
 
 
 import android.annotation.SuppressLint
 import android.annotation.SuppressLint
 import com.yingyangfly.baselib.adapter.BaseDataBindingAdapter
 import com.yingyangfly.baselib.adapter.BaseDataBindingAdapter
+import com.yingyangfly.baselib.ext.setOnSingleClickListener
 import com.yingyangfly.evaluation.R
 import com.yingyangfly.evaluation.R
 import com.yingyangfly.evaluation.databinding.ItemOtherEvaluationHistoryBinding
 import com.yingyangfly.evaluation.databinding.ItemOtherEvaluationHistoryBinding
 import com.yingyangfly.evaluation.entity.SelectAnswerRecord
 import com.yingyangfly.evaluation.entity.SelectAnswerRecord
@@ -19,6 +20,13 @@ class OtherEvaluationHistoryAdapter(override val layoutId: Int = R.layout.item_o
         binding: ItemOtherEvaluationHistoryBinding, item: SelectAnswerRecord, position: Int
         binding: ItemOtherEvaluationHistoryBinding, item: SelectAnswerRecord, position: Int
     ) {
     ) {
         binding.data = item
         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)
+        }
+        binding.tvDetails.setOnSingleClickListener {
+            onClickListener?.invoke(item)
+        }
     }
     }
 }
 }

+ 2 - 1
evaluation/src/main/java/com/yingyangfly/evaluation/history/EvaluationHistoryActivity.kt

@@ -49,7 +49,7 @@ class EvaluationHistoryActivity :
             rvOtherResult.adapter = otherEvaluationHistoryAdapter
             rvOtherResult.adapter = otherEvaluationHistoryAdapter
             otherEvaluationHistoryAdapter.setData(selectAnswerRecord)
             otherEvaluationHistoryAdapter.setData(selectAnswerRecord)
             otherEvaluationHistoryAdapter.onClickListener = {
             otherEvaluationHistoryAdapter.onClickListener = {
-
+                "查看报告详情哦!".toast()
             }
             }
 
 
             rvResult.adapter = adapter
             rvResult.adapter = adapter
@@ -122,6 +122,7 @@ class EvaluationHistoryActivity :
             } else {
             } else {
                 binding.swipeOtherResult.finishLoadMoreWithNoMoreData()
                 binding.swipeOtherResult.finishLoadMoreWithNoMoreData()
             }
             }
+            otherEvaluationHistoryAdapter.setData(selectAnswerRecord)
         })
         })
     }
     }
 
 

+ 6 - 0
evaluation/src/main/res/drawable/bg_other_evaluation_history.xml

@@ -0,0 +1,6 @@
+<?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">
+    <solid android:color="@color/color_FFE6ECFF" />
+</shape>

+ 6 - 0
evaluation/src/main/res/drawable/bg_other_evaluation_result.xml

@@ -0,0 +1,6 @@
+<?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">
+    <solid android:color="@color/color_FFCFD9FF" />
+</shape>

+ 9 - 0
evaluation/src/main/res/drawable/bg_other_evaluation_top_results.xml

@@ -0,0 +1,9 @@
+<?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:topLeftRadius="@dimen/divider_20px"
+        android:topRightRadius="@dimen/divider_20px" />
+    <solid android:color="@color/color_FF4A76FF" />
+</shape>

+ 4 - 4
evaluation/src/main/res/layout/activity_evaluation_history.xml

@@ -251,7 +251,7 @@
                     android:layout_marginStart="@dimen/divider_34px"
                     android:layout_marginStart="@dimen/divider_34px"
                     android:layout_marginTop="@dimen/divider_23px"
                     android:layout_marginTop="@dimen/divider_23px"
                     android:layout_marginEnd="@dimen/divider_37px"
                     android:layout_marginEnd="@dimen/divider_37px"
-                    android:background="@drawable/bg_evaluation_top_results"
+                    android:background="@drawable/bg_other_evaluation_top_results"
                     android:orientation="horizontal"
                     android:orientation="horizontal"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -270,9 +270,9 @@
                     <androidx.appcompat.widget.AppCompatTextView
                     <androidx.appcompat.widget.AppCompatTextView
                         android:layout_width="0dp"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_height="match_parent"
-                        android:layout_weight="1"
+                        android:layout_weight="1.5"
                         android:gravity="center"
                         android:gravity="center"
-                        android:text="@string/score"
+                        android:text="@string/evaluation_id"
                         android:textColor="@android:color/white"
                         android:textColor="@android:color/white"
                         android:textSize="@dimen/divider_24px"
                         android:textSize="@dimen/divider_24px"
                         android:textStyle="bold" />
                         android:textStyle="bold" />
@@ -280,7 +280,7 @@
                     <androidx.appcompat.widget.AppCompatTextView
                     <androidx.appcompat.widget.AppCompatTextView
                         android:layout_width="0dp"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_height="match_parent"
-                        android:layout_weight="2"
+                        android:layout_weight="1"
                         android:gravity="center"
                         android:gravity="center"
                         android:text="@string/assessment_date"
                         android:text="@string/assessment_date"
                         android:textColor="@android:color/white"
                         android:textColor="@android:color/white"

+ 1 - 1
evaluation/src/main/res/layout/item_other_evaluation_history.xml

@@ -29,7 +29,7 @@
         <androidx.appcompat.widget.AppCompatTextView
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="0dp"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_height="match_parent"
-            android:layout_weight="1"
+            android:layout_weight="1.5"
             android:gravity="center"
             android:gravity="center"
             android:text="@{data.recordId}"
             android:text="@{data.recordId}"
             android:textColor="@color/color_FF4A76FF"
             android:textColor="@color/color_FF4A76FF"