1.优化页面UI

push/src/main/java/com/yingyang/push/adapter/PushTypeAdapter.kt

@@ -1,12 +1,12 @@
 package com.yingyang.push.adapter
 
 import android.annotation.SuppressLint
-import android.graphics.Typeface
 import com.yingyang.push.R
 import com.yingyang.push.databinding.ItemPushTypeBinding
 import com.yingyang.push.entity.PushMessageTypeBean
 import com.yingyangfly.baselib.adapter.BaseDataBindingAdapter
 import com.yingyangfly.baselib.ext.setOnSingleClickListener
+import com.yingyangfly.baselib.ext.setTextColorResource
 
 /**
  * 推送类型adapter
@@ -26,12 +26,11 @@ class PushTypeAdapter(override val layoutId: Int = R.layout.item_push_type) :
     ) {
         binding.data = item
         if (currentPosition == position) {
-            binding.tvType.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
-            binding.tvType.setBackgroundResource(R.drawable.selector_push_radio_checked)
+            binding.tvType.setTextColorResource(R.color.color_FF4A76FF)
+            binding.tvType.setBackgroundResource(R.mipmap.icon_train_selected)
         } else {
-            binding.tvType.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
+            binding.tvType.setTextColorResource(R.color.color_ffffff)
             binding.tvType.setBackgroundResource(R.drawable.selector_push_radio_unchecked)
-
         }
         binding.tvType.setOnSingleClickListener {
             currentPosition = position

push/src/main/res/layout/item_push_type.xml

@@ -22,7 +22,8 @@
             android:gravity="center"
             android:text="@{data.dictLabel}"
             android:textColor="@android:color/white"
-            android:textSize="@dimen/divider_24px" />
+            android:textSize="@dimen/divider_24px"
+            android:textStyle="bold" />
 
     </LinearLayout>
 

push/src/main/res/values/colors.xml

@@ -23,4 +23,5 @@
     <color name="color_FF821EFF" tools:ignore="ResourceName">#FF821EFF</color>
     <color name="color_69B8CFFF" tools:ignore="ResourceName">#69B8CFFF</color>
     <color name="color_FFFF2B2B" tools:ignore="ResourceName">#FFFF2B2B</color>
+    <color name="color_ffffff" tools:ignore="ResourceName">#ffffff</color>
 </resources>

workbenches/src/main/java/com/yingyang/workbenches/adapter/FreeTrainTypeAdapter.kt

@@ -1,7 +1,6 @@
 package com.yingyang.workbenches.adapter
 
 import android.annotation.SuppressLint
-import android.graphics.Typeface
 import com.yingyang.workbenches.R
 import com.yingyang.workbenches.databinding.ItemFreeTrainingTypeBinding
 import com.yingyang.workbenches.entity.TrainTypeBean
@@ -27,14 +26,11 @@ class FreeTrainTypeAdapter(override val layoutId: Int = R.layout.item_free_train
     ) {
         binding.data = item
         if (currentPosition == position) {
-            binding.tvType.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
             binding.tvType.setTextColorResource(R.color.color_FF4A76FF)
             binding.tvType.setBackgroundResource(R.mipmap.icon_train_selected)
         } else {
-            binding.tvType.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
             binding.tvType.setTextColorResource(R.color.color_ffffff)
             binding.tvType.setBackgroundResource(R.drawable.selector_train_radio_unchecked)
-
         }
         binding.tvType.setOnSingleClickListener {
             currentPosition = position

workbenches/src/main/java/com/yingyang/workbenches/adapter/LeisureBrainTypeAdapter.kt

@@ -1,7 +1,6 @@
 package com.yingyang.workbenches.adapter
 
 import android.annotation.SuppressLint
-import android.graphics.Typeface
 import com.yingyang.workbenches.R
 import com.yingyang.workbenches.databinding.ItemFreeTrainingTypeBinding
 import com.yingyang.workbenches.entity.TrainTypeBean
@@ -27,11 +26,9 @@ class LeisureBrainTypeAdapter(override val layoutId: Int = R.layout.item_free_tr
     ) {
         binding.data = item
         if (currentPosition == position) {
-            binding.tvType.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
             binding.tvType.setTextColorResource(R.color.color_FF4A76FF)
             binding.tvType.setBackgroundResource(R.mipmap.icon_train_selected)
         } else {
-            binding.tvType.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
             binding.tvType.setTextColorResource(R.color.color_ffffff)
             binding.tvType.setBackgroundResource(R.drawable.selector_train_radio_unchecked)
 

workbenches/src/main/res/layout/item_free_training_type.xml

@@ -22,7 +22,8 @@
             android:gravity="center"
             android:text="@{data.dictLabel}"
             android:textColor="@android:color/white"
-            android:textSize="@dimen/divider_24px" />
+            android:textSize="@dimen/divider_24px"
+            android:textStyle="bold" />
 
     </LinearLayout>