diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt index 8ff7865597..741fd6480e 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt @@ -6,6 +6,7 @@ import android.view.View import android.view.ViewGroup import android.widget.ImageView import androidx.appcompat.widget.AppCompatTextView +import androidx.core.content.ContextCompat import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView import com.mogo.och.bus.R @@ -77,12 +78,14 @@ class SwitchLineAdapter( if(line.open){ if(line.taskList==null||line.taskList.isEmpty()){ holder.actvShowMore.text = mContext.getString(R.string.bus_switch_line_no_task) + holder.actvShowMore.setTextColor(ContextCompat.getColor(mContext,R.color.bus_color_4dffffff)) holder.vLineTask.visibility = View.GONE holder.rvLineTask.visibility = View.GONE holder.selectIv.visibility = View.INVISIBLE holder.itemView.setBackgroundResource(R.drawable.bus_shape_select_line_item_bg_normal) }else { holder.actvShowMore.text = mContext.getString(R.string.bus_switch_line_select_task) + holder.actvShowMore.setTextColor(ContextCompat.getColor(mContext,android.R.color.white)) holder.vLineTask.visibility = View.VISIBLE holder.rvLineTask.visibility = View.VISIBLE holder.selectIv.visibility = View.VISIBLE @@ -96,12 +99,14 @@ class SwitchLineAdapter( }else{ if(line.haveTask){ holder.actvShowMore.text = mContext.getString(R.string.bus_switch_line_no_task) + holder.actvShowMore.setTextColor(ContextCompat.getColor(mContext,R.color.bus_color_4dffffff)) holder.vLineTask.visibility = View.GONE holder.rvLineTask.visibility = View.GONE holder.selectIv.visibility = View.INVISIBLE holder.itemView.setBackgroundResource(R.drawable.bus_shape_select_line_item_bg_normal) }else { holder.actvShowMore.text = mContext.getString(R.string.bus_switch_line_select_task) + holder.actvShowMore.setTextColor(ContextCompat.getColor(mContext,android.R.color.white)) holder.vLineTask.visibility = View.GONE holder.rvLineTask.visibility = View.GONE holder.selectIv.visibility = View.VISIBLE diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_switch_line_list_item.xml b/OCH/mogo-och-bus/src/main/res/layout/bus_switch_line_list_item.xml index 51b6915fcb..e3afdcd016 100644 --- a/OCH/mogo-och-bus/src/main/res/layout/bus_switch_line_list_item.xml +++ b/OCH/mogo-och-bus/src/main/res/layout/bus_switch_line_list_item.xml @@ -12,6 +12,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/dp_13" android:text="选择时间" + android:gravity="center" android:textColor="@android:color/white" android:textSize="@dimen/dp_40" app:layout_constraintTop_toTopOf="@+id/switch_line_item_select_iv" @@ -38,7 +39,6 @@ android:maxLines="2" android:textColor="@android:color/white" android:textSize="@dimen/dp_46" - android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" tools:text="@string/bus_switch_line_name" /> @@ -50,7 +50,7 @@ android:layout_marginTop="@dimen/dp_20" android:layout_marginBottom="@dimen/dp_35" android:singleLine="true" - android:textColor="@color/bus_color_b9c3e9" + android:textColor="@color/bus_color_ccb9c3e9" android:textSize="@dimen/dp_36" app:layout_constraintBottom_toTopOf="@+id/v_line_task" app:layout_constraintStart_toStartOf="@+id/switch_line_name" @@ -64,7 +64,7 @@ android:layout_height="1px" android:layout_marginStart="@dimen/dp_80" android:layout_marginEnd="@dimen/dp_80" - android:background="#88ffffff" + android:background="#63ffffff" android:visibility="gone" app:layout_constraintBottom_toTopOf="@+id/rv_line_task_list" app:layout_constraintEnd_toEndOf="parent" diff --git a/OCH/mogo-och-bus/src/main/res/values/colors.xml b/OCH/mogo-och-bus/src/main/res/values/colors.xml index 137af8caff..38419e0daa 100644 --- a/OCH/mogo-och-bus/src/main/res/values/colors.xml +++ b/OCH/mogo-och-bus/src/main/res/values/colors.xml @@ -33,7 +33,7 @@ #323C6F #2966EC - #F0151D41 + #F7151D41 #19FFFFFF #FFFFFF @@ -46,7 +46,8 @@ #FFFF9B00 #59FFFFFF - #B9C3E9 + #CCB9C3E9 + #4Dffffff #8E9DD4 #2B6EFF