diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java
index 4be5a8c3c9..734edccdd6 100644
--- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java
+++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java
@@ -48,6 +48,7 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter
+ app:layout_constraintTop_toTopOf="@+id/bus_p_circle"
+ app:layout_constraintBottom_toBottomOf="@+id/bus_p_circle"
+ app:layout_constraintLeft_toLeftOf="@+id/bus_p_circle"
+ app:layout_constraintRight_toRightOf="@+id/bus_p_circle"/>
BusOrderModel.getInstance().setPassengerCallback(null);
}
- public void queryBusRoutes() {
- BusOrderModel.getInstance().queryBusRoutes();
- }
-
public void abortTask() {
BusOrderModel.getInstance().abortTask();
}
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusStationCommonItem.kt b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusStationCommonItem.kt
index 5f87a25d7a..ed9f463413 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusStationCommonItem.kt
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusStationCommonItem.kt
@@ -6,7 +6,6 @@ import android.view.LayoutInflater
import android.widget.ImageView
import android.widget.LinearLayout
import androidx.core.content.ContextCompat
-import com.mogo.eagle.core.utilcode.util.UiThreadHandler
import com.mogo.och.bus.R
import com.mogo.och.common.module.utils.BlinkAnimationUtil
import kotlinx.android.synthetic.main.bus_stations_common_item.view.*
@@ -33,31 +32,43 @@ class BusStationCommonItem @JvmOverloads constructor(
busStationNameTv.setTextColor(color)
}
- fun setStationPointBg(type: Int){ // 0:灰色 过站 1：绿色 到站或者即将到站 2：蓝色：未到站
-
- UiThreadHandler.post(Runnable {
- BlinkAnimationUtil.clearAnimation(busCircleIv)
-
- when(type){
- 0 -> {
- busCircleIv.setImageDrawable(null)
- busCircleIv.setImageDrawable(ContextCompat.getDrawable(context,R.drawable.icon_point_grey_bus))
- }
- 1 -> {
- busCircleIv.setImageDrawable(null)
- busCircleIv.setImageDrawable(ContextCompat.getDrawable(context,R.drawable.icon_point_green_bus))
- BlinkAnimationUtil.setAnimation(busCircleIv)
- }
- 2 -> {
- busCircleIv.setImageDrawable(null)
- busCircleIv.setImageDrawable(ContextCompat.getDrawable(context,R.drawable.icon_point_blue_bus))
- }
+ fun setStationPointBg(type: Int) { // 0:灰色 过站 1：绿色 到站或者即将到站 2：蓝色：未到站
+ BlinkAnimationUtil.clearAnimation(busCircleIv)
+ when (type) {
+ 0 -> {
+ busCircleIvBg.visibility = GONE
+ busCircleIv.setImageDrawable(
+ ContextCompat.getDrawable(
+ context,
+ R.drawable.icon_point_grey_bus
+ )
+ )
}
- })
+ 1 -> {
+ busCircleIvBg.visibility = VISIBLE
+ busCircleIv.setImageDrawable(
+ ContextCompat.getDrawable(
+ context,
+ R.drawable.icon_point_green_bus
+ )
+ )
+ BlinkAnimationUtil.setAnimation(busCircleIv)
+ }
+ 2 -> {
+ busCircleIvBg.visibility = GONE
+ busCircleIv.setImageDrawable(
+ ContextCompat.getDrawable(
+ context,
+ R.drawable.icon_point_blue_bus
+ )
+ )
+ }
+
+ }
}
fun getCircleImageView() : ImageView{
- return busCircleIv;
+ return busCircleIv
}
fun setStationArrowBg(type: Int){// 0:灰色 过站 1：绿色 前往下一站 2：蓝色 未到站
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/BlinkAnimationUtil.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/BlinkAnimationUtil.java
index 478bfde04c..02c67cf910 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/BlinkAnimationUtil.java
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/BlinkAnimationUtil.java
@@ -12,6 +12,13 @@ public class BlinkAnimationUtil {
//实现图片闪烁效果
public static void setAnimation(ImageView imageView) {
+ Object animObject = imageView.getTag(imageView.getId());
+ if (animObject instanceof AnimatorSet){
+ AnimatorSet animatorSet = (AnimatorSet)animObject;
+ animatorSet.start();
+ return;
+ }
+
AnimatorSet animationSet = new AnimatorSet();
imageView.setTag(imageView.getId(),animationSet);
@@ -32,7 +39,7 @@ public class BlinkAnimationUtil {
Object animObject = imageView.getTag(imageView.getId());
if (animObject instanceof AnimatorSet){
AnimatorSet animatorSet = (AnimatorSet)animObject;
- animatorSet.cancel();
+ animatorSet.end();
}
}
}