From b113afe827dd69d8321e129f74b974644bcfbc40 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Mon, 26 Sep 2022 17:43:22 +0800 Subject: [PATCH] Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_2110_220915_2.11.0 # Conflicts: # OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java --- .../BusPassengerLineStationsAdapter.java | 17 +++++++++++++++-- .../passenger/ui/BusPassengerRouteFragment.java | 5 ----- .../och/bus/fragment/BaseBusTabFragment.java | 10 ---------- .../com/mogo/och/bus/fragment/BusFragment.java | 7 ++++--- .../com/mogo/och/bus/ui/BusStationCommonItem.kt | 10 ++++++++-- .../common/module/utils/BlinkAnimationUtil.java | 7 +++++-- 6 files changed, 32 insertions(+), 24 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 9aab6be4d5..c31988dfeb 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 @@ -58,6 +58,7 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter private ImageView ctvAutopilotStatusIv; private TextView ctvAutopilotStatusTv; protected TextView tvArrived; -// protected TextView tvOperationStatus; protected RelativeLayout mSettingBtn; protected RelativeLayout mBadcaseBtn; protected RelativeLayout mAICollectBtn; - public boolean isOperationStatus;//false-收车，true-出车 private FrameLayout flStationPanelContainer; private Group groupTestPanel; - private FrameLayout flSpeed; -// private BusArcView mouduleArc; private TrafficDataView mTrafficDataView; - private ImageView mUpgradeTipIv; // private BusTrafficLightView mTrafficLightView; public static final String TYPE_ENTRANCE = "entrance"; @@ -127,7 +122,6 @@ public abstract class BaseBusTabFragment // tvOperationStatus = findViewById(R.id.module_mogo_och_operation_status); tvArrived = findViewById(R.id.module_mogo_och_arrived_tv); - flSpeed = (FrameLayout) findViewById(R.id.fl_speed); mTrafficDataView = (TrafficDataView) findViewById(R.id.bus_arc); LayoutInflater.from(getContext()).inflate(getStationPanelViewId(), flStationPanelContainer); @@ -200,10 +194,6 @@ public abstract class BaseBusTabFragment ); findViewById(R.id.btnAutopilotRoute).setOnClickListener(view -> debugArrivedRoute()); - -// tvOperationStatus.setOnClickListener(view -> { -// onChangeOperationStatus(); -// }); tvArrived.setOnClickListener(view -> { onArriveStation(); diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java index 8addea4abd..1ecb1d6cbe 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java @@ -154,9 +154,9 @@ public class BusFragment extends BaseBusTabFragment } private void resetStationBlinkAnim() { - firstStationItem.setStationPointBg(2); - secondStationItem.setStationPointBg(2); - thirdStationItem.setStationPointBg(2); + BlinkAnimationUtil.clearAnimation(firstStationItem.getCircleImageView()); + BlinkAnimationUtil.clearAnimation(secondStationItem.getCircleImageView()); + BlinkAnimationUtil.clearAnimation(thirdStationItem.getCircleImageView()); } public void updateBusTaskStatus(String lineName, String lineTime, @@ -303,6 +303,7 @@ public class BusFragment extends BaseBusTabFragment firstStationItem.setStationPointBg(0); secondStationItem.setStationPointBg(1); thirdStationItem.setStationPointBg(2); + secondStationItem.setStationArrowBg(2); if (isArrived){ firstStationItem.setStationArrowBg(0); 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 4d2805dc88..e60ee74e97 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 @@ -3,6 +3,7 @@ package com.mogo.och.bus.ui import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater +import android.widget.ImageView import android.widget.LinearLayout import com.mogo.och.bus.R import com.mogo.och.common.module.utils.BlinkAnimationUtil @@ -33,20 +34,25 @@ class BusStationCommonItem @JvmOverloads constructor( fun setStationPointBg(type: Int){ // 0:灰色 过站 1：绿色 到站或者即将到站 2：蓝色：未到站 when(type){ 0 -> { - busCircleIv.setImageResource(R.drawable.icon_point_grey_bus) BlinkAnimationUtil.clearAnimation(busCircleIv) + busCircleIv.setImageResource(R.drawable.icon_point_grey_bus) + } 1 -> { busCircleIv.setImageResource(R.drawable.icon_point_green_bus) BlinkAnimationUtil.setAnimation(busCircleIv) } 2 -> { - busCircleIv.setImageResource(R.drawable.icon_point_blue_bus) BlinkAnimationUtil.clearAnimation(busCircleIv) + busCircleIv.setImageResource(R.drawable.icon_point_blue_bus) } } } + fun getCircleImageView() : ImageView{ + return busCircleIv; + } + fun setStationArrowBg(type: Int){// 0:灰色 过站 1：绿色 前往下一站 2：蓝色 未到站 when(type){ 0 -> busArrowBg.setImageResource(R.drawable.icon_arrow_grey_bus) 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 f1363e62d5..3e86aacb1f 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 @@ -2,6 +2,7 @@ package com.mogo.och.common.module.utils; import android.animation.AnimatorSet; import android.animation.ObjectAnimator; +import android.view.animation.Animation; import android.widget.ImageView; /** @@ -29,9 +30,11 @@ public class BlinkAnimationUtil { //消除动画 public static void clearAnimation(ImageView imageView){ - if (imageView.getAnimation() != null){ - imageView.getAnimation().cancel(); + Animation animation = imageView.getAnimation(); + if (animation != null){ + animation.cancel(); } imageView.clearAnimation(); + imageView.setAnimation(null); } }