Browse Source

1.修改测评内容Ui

王鹏鹏 2 years ago
parent
commit
ce2c1a2af9

+ 8 - 0
baselib/src/main/java/com/yingyangfly/baselib/db/QuestionOptionBean.java

@@ -96,6 +96,14 @@ public class QuestionOptionBean {
         return optionVal;
     }
 
+    public String getOptionInfo() {
+        if (TextUtils.isEmpty(getOptionKey())) {
+            return getOptionVal();
+        }
+
+        return getOptionKey() + ":" + getOptionVal();
+    }
+
     public void setOptionVal(String optionVal) {
         this.optionVal = optionVal;
     }

+ 3 - 5
evaluation/src/main/java/com/yingyangfly/evaluation/adapter/QuestionListAdapter.kt

@@ -28,13 +28,11 @@ class QuestionListAdapter(override val layoutId: Int = R.layout.item_question_li
     ) {
         binding.data = item
         if (selectedItemId == item.id) {
-            binding.tvTitle.setBackgroundResource(R.drawable.bg_selected_choice_item)
-            binding.tvTitle.setTextColorResource(R.color.color_FFFFFFFF)
+            binding.selectedImage.setBackgroundResource(R.mipmap.icon_selected)
         } else {
-            binding.tvTitle.setBackgroundResource(R.drawable.bg_unselected_choice_item)
-            binding.tvTitle.setTextColorResource(R.color.color_FF222222)
+            binding.selectedImage.setBackgroundResource(R.mipmap.icon_unselected)
         }
-        binding.tvTitle.setOnSingleClickListener {
+        binding.titleLayout.setOnSingleClickListener {
             selectedItemId = item.id
             notifyDataSetChanged()
             onClickListener?.invoke(item)

+ 6 - 7
evaluation/src/main/res/layout/activity_question_list.xml

@@ -66,11 +66,13 @@
 
                 <TextView
                     android:id="@+id/tvTopic"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/divider_27px"
+                    android:layout_marginStart="@dimen/divider_63px"
+                    android:layout_marginTop="@dimen/divider_53px"
+                    android:layout_marginEnd="@dimen/divider_63px"
                     android:text="@{data.getQuestionInfo()}"
-                    android:textColor="@color/color_FF222222"
+                    android:textColor="@color/color_FF4A76FF"
                     android:textSize="@dimen/divider_34px"
                     android:textStyle="bold"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -79,11 +81,8 @@
 
                 <LinearLayout
                     android:id="@+id/contentLayout"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/divider_32px"
-                    android:minWidth="@dimen/divider_834px"
-                    android:minHeight="@dimen/divider_264px"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/tvTopic">

+ 17 - 10
evaluation/src/main/res/layout/item_question_list.xml

@@ -11,24 +11,31 @@
     </data>
 
     <LinearLayout
+        android:id="@+id/titleLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/divider_24px"
-        android:layout_marginTop="@dimen/divider_15px"
-        android:layout_marginEnd="@dimen/divider_24px"
-        android:orientation="vertical">
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingTop="@dimen/divider_19px"
+        android:paddingBottom="@dimen/divider_5px">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/selectedImage"
+            android:layout_width="@dimen/divider_26px"
+            android:layout_height="@dimen/divider_26px"
+            android:layout_marginStart="@dimen/divider_63px"
+            android:scaleType="centerInside" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tvTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_unselected_choice_item"
+            android:layout_marginStart="@dimen/divider_8px"
+            android:layout_marginEnd="@dimen/divider_63px"
             android:gravity="center_vertical"
-            android:minWidth="@dimen/divider_120px"
-            android:text="@{data.getOptionVal()}"
-            android:textColor="@color/color_FF222222"
-            android:textSize="@dimen/divider_34px"
-            android:textStyle="bold" />
+            android:text="@{data.getOptionInfo()}"
+            android:textColor="@color/color_FF333333"
+            android:textSize="@dimen/divider_28px" />
 
     </LinearLayout>
 

BIN
evaluation/src/main/res/mipmap-xxhdpi/icon_selected.png


BIN
evaluation/src/main/res/mipmap-xxhdpi/icon_unselected.png