Преглед изворни кода

1.添加获取其他测评历史记录功能UI

王鹏鹏 пре 2 година
родитељ
комит
60957df729

+ 16 - 2
home/src/main/java/com/yingyangfly/home/evaluation/EvaluationHistoryActivity.kt

@@ -2,6 +2,7 @@ package com.yingyangfly.home.evaluation
 
 import android.annotation.SuppressLint
 import android.text.TextUtils
+import android.util.Log
 import android.view.MotionEvent
 import android.view.View
 import com.alibaba.android.arouter.facade.annotation.Route
@@ -47,6 +48,13 @@ class EvaluationHistoryActivity :
     override fun initListener() {
         binding {
             layoutHead.setOnTouchListener(this@EvaluationHistoryActivity)
+            radioEvaluation.setOnCheckedChangeListener { group, checkedId ->
+                if (checkedId == R.id.radioProfessionalEvaluation) {
+                    getReviewTaskHistoryList()
+                } else if (checkedId == R.id.radioOtherEvaluation) {
+                    getOtherReviewTaskHistory()
+                }
+            }
         }
     }
 
@@ -56,13 +64,19 @@ class EvaluationHistoryActivity :
 
     override fun onResume() {
         super.onResume()
-        loadData()
+        getReviewTaskHistoryList()
+    }
+
+    private fun getOtherReviewTaskHistory() {
+        Log.e("wpp", "获取其他测评历史记录")
+
     }
 
     /**
      * 加载数据
      */
-    private fun loadData() {
+    private fun getReviewTaskHistoryList() {
+        Log.e("wpp", "获取专业测评历史记录")
         results.clear()
         viewModel.getReviewTaskHistoryList(fail = {
             it.toast()

+ 5 - 0
home/src/main/res/color/selector_radio_evaluation_color.xml

@@ -0,0 +1,5 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:ignore="ResourceName">
+    <item android:color="@color/color_FF4A76FF" android:state_checked="true" />
+    <!-- not selected -->
+    <item android:color="@android:color/white" android:state_checked="false" />
+</selector>

+ 12 - 0
home/src/main/res/drawable/bg_left_selected_professional_evaluation.xml

@@ -0,0 +1,12 @@
+<?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_12px"
+        android:topLeftRadius="@dimen/divider_12px" />
+    <stroke
+        android:width="@dimen/divider_2px"
+        android:color="@android:color/white" />
+    <solid android:color="@android:color/white" />
+</shape>

+ 5 - 0
home/src/main/res/drawable/bg_left_selected_professional_evaluation_result.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingDefaultResource,ResourceName">
+    <item android:drawable="@drawable/bg_left_selected_professional_evaluation" android:state_checked="true" />
+    <item android:drawable="@drawable/bg_left_unselected_professional_evaluation" android:state_checked="false" />
+</selector>

+ 12 - 0
home/src/main/res/drawable/bg_left_unselected_professional_evaluation.xml

@@ -0,0 +1,12 @@
+<?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_12px"
+        android:topLeftRadius="@dimen/divider_12px" />
+    <stroke
+        android:width="@dimen/divider_2px"
+        android:color="@android:color/white" />
+    <solid android:color="@android:color/transparent" />
+</shape>

+ 12 - 0
home/src/main/res/drawable/bg_right_selected_professional_evaluation.xml

@@ -0,0 +1,12 @@
+<?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:bottomRightRadius="@dimen/divider_12px"
+        android:topRightRadius="@dimen/divider_12px" />
+    <stroke
+        android:width="@dimen/divider_2px"
+        android:color="@android:color/white" />
+    <solid android:color="@android:color/white" />
+</shape>

+ 5 - 0
home/src/main/res/drawable/bg_right_selected_professional_evaluation_result.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingDefaultResource,ResourceName">
+    <item android:drawable="@drawable/bg_right_selected_professional_evaluation" android:state_checked="true" />
+    <item android:drawable="@drawable/bg_right_unselected_professional_evaluation" android:state_checked="false" />
+</selector>

+ 12 - 0
home/src/main/res/drawable/bg_right_unselected_professional_evaluation.xml

@@ -0,0 +1,12 @@
+<?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:bottomRightRadius="@dimen/divider_12px"
+        android:topRightRadius="@dimen/divider_12px" />
+    <stroke
+        android:width="@dimen/divider_2px"
+        android:color="@android:color/white" />
+    <solid android:color="@android:color/transparent" />
+</shape>

+ 31 - 9
home/src/main/res/layout/activity_evaluation_history.xml

@@ -23,18 +23,40 @@
             <androidx.appcompat.widget.AppCompatTextView style="@style/back_text" />
         </LinearLayout>
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tvTitle"
+        <RadioGroup
+            android:id="@+id/radioEvaluation"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/divider_32px"
-            android:text="@string/evaluation_history_info"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/divider_34px"
-            android:textStyle="bold"
+            android:layout_marginTop="@dimen/divider_36px"
+            android:gravity="center"
+            android:orientation="horizontal"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent">
+
+            <RadioButton
+                android:id="@+id/radioProfessionalEvaluation"
+                android:layout_width="@dimen/divider_195px"
+                android:layout_height="@dimen/divider_55px"
+                android:background="@drawable/bg_left_selected_professional_evaluation_result"
+                android:button="@null"
+                android:checked="true"
+                android:gravity="center"
+                android:text="@string/professional_evaluation"
+                android:textColor="@color/selector_radio_evaluation_color"
+                android:textSize="@dimen/divider_24px" />
+
+            <RadioButton
+                android:id="@+id/radioOtherEvaluation"
+                android:layout_width="@dimen/divider_195px"
+                android:layout_height="@dimen/divider_55px"
+                android:background="@drawable/bg_right_selected_professional_evaluation_result"
+                android:button="@null"
+                android:gravity="center"
+                android:text="@string/other_evaluations"
+                android:textColor="@color/selector_radio_evaluation_color"
+                android:textSize="@dimen/divider_24px" />
+        </RadioGroup>
 
         <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
@@ -49,7 +71,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tvTitle">
+            app:layout_constraintTop_toBottomOf="@+id/radioEvaluation">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"