diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningAdapter.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningAdapter.kt
index 76becb7860..cb1404fe9c 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningAdapter.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningAdapter.kt
@@ -2,7 +2,6 @@ package com.mogo.och.weaknet.ui.taskrunning
import android.animation.ArgbEvaluator
import android.content.Context
-import android.graphics.Color
import android.graphics.drawable.GradientDrawable
import android.util.TypedValue
import android.view.LayoutInflater
@@ -93,13 +92,13 @@ class TaskRunningAdapter(
holder.acivStationHeadBig.visibility = View.VISIBLE
holder.acivStationHead.visibility = View.INVISIBLE
holder.acivStationHeadBig.setImageResource(R.drawable.bus_runnint_task_start)
- holder.bgPassBg.visibility = View.GONE
- holder.bgPassBottomBg.visibility = View.VISIBLE
- holder.bgPassHeadBg.visibility = View.GONE
+ holder.middleStationBg.visibility = View.GONE
+ holder.startStationBg.visibility = View.VISIBLE
+ holder.endStationBg.visibility = View.GONE
if(startStationIndex==0){
if(line.isLeaving){
// 下端 灰色
- holder.bgPassBottomBg.setBackgroundResource(R.color.shuttle_driver_4DFFFFFF)
+ holder.startStationBg.setBackgroundResource(R.color.shuttle_driver_4DFFFFFF)
holder.itemView.background = null
}else{
// 下端 彩色
@@ -110,11 +109,11 @@ class TaskRunningAdapter(
startColor,
endColor
))
- holder.bgPassBottomBg.background = temp01
+ holder.startStationBg.background = temp01
}
}else{
// 下端 灰色
- holder.bgPassBottomBg.setBackgroundResource(R.color.shuttle_driver_4DFFFFFF)
+ holder.startStationBg.setBackgroundResource(R.color.shuttle_driver_4DFFFFFF)
holder.itemView.background = null
}
}
@@ -122,16 +121,16 @@ class TaskRunningAdapter(
holder.acivStationHeadBig.visibility = View.VISIBLE
holder.acivStationHead.visibility = View.INVISIBLE
holder.acivStationHeadBig.setImageResource(R.drawable.bus_runnint_task_end)
- holder.bgPassBg.visibility = View.GONE
- holder.bgPassBottomBg.visibility = View.GONE
- holder.bgPassHeadBg.visibility = View.VISIBLE
+ holder.middleStationBg.visibility = View.GONE
+ holder.startStationBg.visibility = View.GONE
+ holder.endStationBg.visibility = View.VISIBLE
if(startStationIndex==itemCount-1){
if(line.isLeaving){
- holder.bgPassHeadBg.setBackgroundResource(R.color.shuttle_driver_4DFFFFFF)
+ holder.endStationBg.setBackgroundResource(R.color.shuttle_driver_4DFFFFFF)
holder.itemView.setBackgroundResource(R.drawable.bus_task_current_station_bg)
}else{
holder.itemView.setBackgroundResource(R.drawable.bus_task_current_station_bg)
- holder.bgPassHeadBg.setBackgroundResource(R.color.shuttle_driver_4DFFFFFF)
+ holder.endStationBg.setBackgroundResource(R.color.shuttle_driver_4DFFFFFF)
}
}else{
// 上端 彩色
@@ -143,19 +142,19 @@ class TaskRunningAdapter(
startColorTemp,
endColorTemp
))
- holder.bgPassHeadBg.background = temp01
+ holder.endStationBg.background = temp01
}
}
else -> {
holder.acivStationHeadBig.visibility = View.GONE
holder.acivStationHead.visibility = View.VISIBLE
- holder.bgPassBg.visibility = View.VISIBLE
- holder.bgPassBottomBg.visibility = View.GONE
- holder.bgPassHeadBg.visibility = View.GONE
+ holder.middleStationBg.visibility = View.VISIBLE
+ holder.startStationBg.visibility = View.GONE
+ holder.endStationBg.visibility = View.GONE
if(currentPosition==startStationIndex){
if(line.isLeaving){
// 灰色
- holder.bgPassBg.setBackgroundResource(R.color.shuttle_driver_4DFFFFFF)
+ holder.middleStationBg.setBackgroundResource(R.color.shuttle_driver_4DFFFFFF)
holder.itemView.background = null
}else{
// 彩色
@@ -167,11 +166,11 @@ class TaskRunningAdapter(
startColorTemp,
endColorTemp
))
- holder.bgPassBg.background = temp01
+ holder.middleStationBg.background = temp01
}
}else if(currentPosition
diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_task_running.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_task_running.xml
index 3b40d13e46..c76e2eecf8 100644
--- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_task_running.xml
+++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_task_running.xml
@@ -20,7 +20,7 @@
android:layout_marginEnd="@dimen/dp_140"
android:layout_marginTop="@dimen/dp_37"
android:textColor="@color/white"
- android:text="@string/bus_switch_line_title"/>
+ tools:text="@string/bus_switch_line_title"/>