From 500ee49449230a6da311b42840fb97b4404c2e62 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 28 Sep 2022 17:52:57 +0800 Subject: [PATCH] =?UTF-8?q?[2.11.0/1.6.0]=20bus=E5=8F=B8=E6=9C=BA=E7=AB=AF?= =?UTF-8?q?/=E4=B9=98=E5=AE=A2=E7=AB=AF=E8=B7=AF=E7=BA=BF=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E7=BB=BF=E7=82=B9=E9=97=AA=E7=83=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusPassengerLineStationsAdapter.java | 4 +- .../main/res/layout/bus_p_route_fragment.xml | 2 +- .../res/layout/bus_p_stations_common_item.xml | 11 ++-- .../mogo/och/bus/presenter/BusPresenter.java | 4 -- .../mogo/och/bus/ui/BusStationCommonItem.kt | 55 +++++++++++-------- .../module/utils/BlinkAnimationUtil.java | 9 ++- 6 files changed, 49 insertions(+), 36 deletions(-) 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(); } } }