diff --git a/OCH/common/biz/src/main/res/layout/biz_login_view.xml b/OCH/common/biz/src/main/res/layout/biz_login_view.xml
index 5602a54da0..c5dada8359 100644
--- a/OCH/common/biz/src/main/res/layout/biz_login_view.xml
+++ b/OCH/common/biz/src/main/res/layout/biz_login_view.xml
@@ -166,9 +166,9 @@
android:layout_marginTop="@dimen/dp_24"
android:layout_marginEnd="@dimen/dp_24"
android:src="@drawable/baseline_link_off_24"
- android:padding="@dimen/dp_23"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
+ android:padding="@dimen/dp_20"
+ android:layout_width="@dimen/dp_100"
+ android:layout_height="@dimen/dp_100"/>
\ No newline at end of file
diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/adapter/SwitchLineAdapter.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/adapter/SwitchLineAdapter.kt
index c6eea35011..cdd6fa06db 100644
--- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/adapter/SwitchLineAdapter.kt
+++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/adapter/SwitchLineAdapter.kt
@@ -1,6 +1,7 @@
package com.mogo.och.offline.ui.adapter
import android.content.Context
+import android.graphics.Color
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
@@ -24,8 +25,7 @@ class SwitchLineAdapter(
}
// RecyclerView设置点击事件
private var mItemClickListener: LineItemClickListener? = null
- var checkLineId:Int = -1
- var checkTaskId:Int = -1
+ private var checkInfo:BindLineListResponse.Result? = null
override fun onCreateViewHolder(
parent: ViewGroup,
viewType: Int
@@ -39,15 +39,24 @@ class SwitchLineAdapter(
override fun onBindViewHolder(holder: SwitchLineViewHolder, position: Int) {
val currentPosition = holder.bindingAdapterPosition
val lineInfo = mData[currentPosition]
+
+ if (lineInfo==checkInfo) {
+ holder.itemView.setBackgroundResource(R.drawable.bus_shape_select_line_item_bg_normal)
+ } else {
+ holder.itemView.setBackgroundColor(Color.parseColor("#162761"))
+ }
+
lineInfo.line?.let {line->
line.lineName?.let {
if(it.length>10){
- line.lineName = it.substring(0,10)+"…"
+ holder.linelineName.text = it.substring(0,10)+"…"
+ }else{
+ holder.linelineName.text = lineInfo.line?.lineName
}
}
}
- holder.linelineName.text = lineInfo.line?.lineName
+
lineInfo.siteList?.let {
val last = it.last()
last.name?.let {siteName->
@@ -66,6 +75,10 @@ class SwitchLineAdapter(
//设置item点击事件
holder.itemView.setOnClickListener {
+ val oldPosition = mData.indexOf(checkInfo)
+ checkInfo = lineInfo
+ notifyItemChanged(oldPosition)
+ notifyItemChanged(currentPosition)
mItemClickListener?.onItemClick(lineInfo)
}
}
@@ -79,18 +92,12 @@ class SwitchLineAdapter(
}
class SwitchLineViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
- val selectIv: ImageView
val linelineName: AppCompatTextView//线路名称
val lineEndlineName: AppCompatTextView //终点
- val actvShowMore: AppCompatTextView //选择时间
- val vLineTask: View// 白色分割线
init {
- selectIv = itemView.findViewById(R.id.switch_line_item_select_iv)
linelineName = itemView.findViewById(R.id.switch_line_name)
lineEndlineName = itemView.findViewById(R.id.switch_line_end_station)
- vLineTask = itemView.findViewById(R.id.v_line_task)
- actvShowMore = itemView.findViewById(R.id.actv_show_more)
}
}
diff --git a/OCH/offline/driver/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml b/OCH/offline/driver/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml
index 272e718cce..e5faafb27b 100644
--- a/OCH/offline/driver/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml
+++ b/OCH/offline/driver/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml
@@ -2,6 +2,6 @@
\ No newline at end of file
diff --git a/OCH/offline/driver/src/main/res/layout/offline_switch_line_list_item.xml b/OCH/offline/driver/src/main/res/layout/offline_switch_line_list_item.xml
index f9b02a3244..4ca60e8d73 100644
--- a/OCH/offline/driver/src/main/res/layout/offline_switch_line_list_item.xml
+++ b/OCH/offline/driver/src/main/res/layout/offline_switch_line_list_item.xml
@@ -4,30 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/bus_shape_select_line_item_bg_normal">
-
-
-
-
+ android:background="@color/offline_color_162761">
-
+
\ No newline at end of file
diff --git a/OCH/offline/driver/src/main/res/values/colors.xml b/OCH/offline/driver/src/main/res/values/colors.xml
index 90c817402c..2f2edfe867 100644
--- a/OCH/offline/driver/src/main/res/values/colors.xml
+++ b/OCH/offline/driver/src/main/res/values/colors.xml
@@ -29,6 +29,7 @@
#FFFFFF
#DB3137
+ #162761
#3E77F6
#323C6F