From fc49e84091d695f07a1a3e77d7eeb0f927d2793b Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Sun, 14 May 2023 20:03:19 +0800
Subject: [PATCH] =?UTF-8?q?[3.2.0]=20bus=E4=B9=98=E5=AE=A2=E5=B1=8FUI?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusPassengerLineStationsAdapter.java      | 18 +++++++++------
 .../res/layout/bus_p_route_fragment.xml       |  1 -
 .../res/layout/bus_p_stations_common_item.xml | 23 +++++++++++--------
 .../module/utils/BlinkAnimationUtil.java      |  4 ++--
 .../BusPassengerLineStationsAdapter.java      | 17 +++++++++-----
 .../res/layout/bus_p_route_fragment.xml       |  1 -
 .../res/layout/bus_p_stations_common_item.xml | 21 +++++++++--------
 7 files changed, 48 insertions(+), 37 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java
index 53c6fe31f2..e383a156de 100644
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java
@@ -6,21 +6,19 @@ import static com.mogo.och.bus.passenger.constant.BusPassengerConst.STATION_STAT
 
 import android.content.Context;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.constraintlayout.widget.Group;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.mogo.och.bus.passenger.R;
 import com.mogo.och.bus.passenger.bean.BusPassengerStation;
 import com.mogo.och.common.module.utils.BlinkAnimationUtil;
 import com.mogo.och.common.module.wigets.MarqueeTextView;
-import com.mogo.och.data.bean.BusStationBean;
 
 import java.util.List;
 
@@ -54,15 +52,15 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
         BlinkAnimationUtil.clearAnimation(viewHolder.stationCircle);
         if (position == 0){ //第一个 起点
             viewHolder.curArrowBg.setVisibility(View.GONE);
+            Log.d("onBindViewHolder" , "position0 = "+position);
+            viewHolder.stationCircle.setImageResource(R.drawable.bg_bus_p_start_tag_bg);
             if (station.getDrivingStatus() == STATION_STATUS_STOPPED && !station.isLeaving()){//到达未离开
                 viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_clock_17417B));
-                viewHolder.stationCircle.setImageResource(R.drawable.bus_p_arrive_line_green);
                 BlinkAnimationUtil.setAnimation(viewHolder.stationCircle);
                 viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.MARQUEE);
             }else {
                 viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_clock_992D3E5F));
                 viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.END);
-                viewHolder.stationCircle.setImageResource(R.drawable.bg_bus_p_start_tag_bg);
             }
         }else{
             viewHolder.curArrowBg.setVisibility(View.VISIBLE);
@@ -73,18 +71,23 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
                 viewHolder.curArrowBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_A9B6CA));
                 viewHolder.stationCircle.setImageResource(R.drawable.bus_p_point_gray);
                 viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.END);
+                Log.d("onBindViewHolder" , "position 1 = "+position);
             } else if (station.getDrivingStatus() == STATION_STATUS_STOPPED && !station.isLeaving()){//刚到站未离开的
                 viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_clock_17417B));
                 viewHolder.curArrowBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_A9B6CA));
                 viewHolder.stationCircle.setImageResource(R.drawable.bus_p_arrive_line_green);
+                if (position == mStations.size() - 1){
+                    viewHolder.stationCircle.setImageResource(R.drawable.bg_bus_p_end_tag_bg);
+                }
+                Log.d("onBindViewHolder" , "position2 = "+position);
                 BlinkAnimationUtil.setAnimation(viewHolder.stationCircle);
                 viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.MARQUEE);
             }else if (station.getDrivingStatus() == STATION_STATUS_ARRIVING && preStation.isLeaving()){//即将到站
                 viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_panel_cur_station_tips_color));
                 viewHolder.curArrowBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_A9B6CA));
                 viewHolder.stationCircle.setImageResource(R.drawable.bus_p_arrive_line_blue);
-//                BlinkAnimationUtil.setAnimation(viewHolder.stationCircle);
-//                viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.MARQUEE);
+                Log.d("onBindViewHolder" , "position3 = "+position);
+
             }else if (station.getDrivingStatus() == STATION_STATUS_ARRIVING &&
                     (preStation.getDrivingStatus() == STATION_STATUS_ARRIVING
                             || preStation.getDrivingStatus() == STATION_STATUS_STOPPED)){ //未到站的并且前面也是未到站或者刚到站的
@@ -96,6 +99,7 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
                 if (position == mStations.size() - 1){
                     viewHolder.stationCircle.setImageResource(R.drawable.bg_bus_p_end_tag_bg);
                 }
+                Log.d("onBindViewHolder" , "position4 = "+position);
             }
         }
     }
diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml
index b5acaf3140..332c134dc0 100644
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml
@@ -231,7 +231,6 @@
             android:id="@+id/bus_p_line_stations_rl"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_marginTop="@dimen/dp_64"
             android:paddingBottom="@dimen/dp_20"
             android:paddingLeft="@dimen/dp_30"
             android:paddingRight="@dimen/bus_p_route_info_margin_right"
diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml
index c34213b4c8..89e375e7c0 100644
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml
@@ -15,6 +15,7 @@
         android:ellipsize="marquee"
         android:marqueeRepeatLimit="marquee_forever"
         android:layout_marginRight="@dimen/dp_60"
+        android:layout_marginTop="@dimen/dp_68"
         android:textStyle="bold"
         android:textColor="@color/bus_p_station_txt_color"
         android:layout_marginLeft="@dimen/dp_90"
@@ -22,7 +23,17 @@
         app:useCustomGap="true"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/bus_p_cur_arrow_bg"/>
+        app:layout_constraintTop_toTopOf="parent"/>
+
+    <ImageView
+        android:id="@+id/bus_p_cur_arrow_bg"
+        android:layout_width="@dimen/dp_10"
+        android:layout_height="@dimen/dp_72"
+        android:scaleType="fitXY"
+        android:background="@color/acc_default_txt_color"
+        app:layout_constraintLeft_toLeftOf="@+id/bus_p_circle"
+        app:layout_constraintRight_toRightOf="@+id/bus_p_circle"
+        app:layout_constraintTop_toTopOf="parent"/>
 
     <ImageView
         android:id="@+id/bus_p_circle"
@@ -32,14 +43,6 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="@+id/bus_p_station"
         app:layout_constraintBottom_toBottomOf="@+id/bus_p_station"/>
-    <ImageView
-        android:id="@+id/bus_p_cur_arrow_bg"
-        android:layout_width="@dimen/dp_10"
-        android:layout_height="@dimen/dp_68"
-        android:scaleType="fitXY"
-        android:background="@color/acc_default_txt_color"
-        app:layout_constraintLeft_toLeftOf="@+id/bus_p_circle"
-        app:layout_constraintRight_toRightOf="@+id/bus_p_circle"
-        app:layout_constraintTop_toTopOf="parent"/>
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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 a0ebe260e9..16323b69e3 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
@@ -22,8 +22,8 @@ public class BlinkAnimationUtil {
         AnimatorSet animationSet = new AnimatorSet();
         imageView.setTag(imageView.getId(),animationSet);
 
-        ObjectAnimator valueAnimator = ObjectAnimator.ofFloat(imageView, "alpha",1.0f, 0f);
-        ObjectAnimator valueAnimatorDisappare = ObjectAnimator.ofFloat(imageView, "alpha",0f, 1.0f);
+        ObjectAnimator valueAnimator = ObjectAnimator.ofFloat(imageView, "alpha",0.2f, 1.0f);
+        ObjectAnimator valueAnimatorDisappare = ObjectAnimator.ofFloat(imageView, "alpha",1.0f, 0.2f);
         valueAnimator.setDuration(1000);
         valueAnimatorDisappare.setDuration(800);
 
diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java
index c405fb0935..1d8c4ce7f2 100644
--- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java
+++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java
@@ -2,14 +2,13 @@ package com.mogo.och.bus.passenger.adapter;
 
 import android.content.Context;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.constraintlayout.widget.Group;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.mogo.och.bus.passenger.R;
@@ -53,15 +52,15 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
         BlinkAnimationUtil.clearAnimation(viewHolder.stationCircle);
         if (position == 0){ //第一个 起点
             viewHolder.curArrowBg.setVisibility(View.GONE);
+            Log.d("onBindViewHolder" , "position0 = "+position);
+            viewHolder.stationCircle.setImageResource(R.drawable.bg_bus_p_start_tag_bg);
             if (station.getDrivingStatus() == STATION_STATUS_STOPPED && !station.isLeaving()){//到达未离开
                 viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_clock_17417B));
-                viewHolder.stationCircle.setImageResource(R.drawable.bus_p_arrive_line_green);
                 BlinkAnimationUtil.setAnimation(viewHolder.stationCircle);
                 viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.MARQUEE);
             }else {
                 viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_clock_992D3E5F));
                 viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.END);
-                viewHolder.stationCircle.setImageResource(R.drawable.bg_bus_p_start_tag_bg);
             }
         }else{
             viewHolder.curArrowBg.setVisibility(View.VISIBLE);
@@ -72,18 +71,23 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
                 viewHolder.curArrowBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_A9B6CA));
                 viewHolder.stationCircle.setImageResource(R.drawable.bus_p_point_gray);
                 viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.END);
+                Log.d("onBindViewHolder" , "position 1 = "+position);
             } else if (station.getDrivingStatus() == STATION_STATUS_STOPPED && !station.isLeaving()){//刚到站未离开的
                 viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_clock_17417B));
                 viewHolder.curArrowBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_A9B6CA));
                 viewHolder.stationCircle.setImageResource(R.drawable.bus_p_arrive_line_green);
+                if (position == mStations.size() - 1){
+                    viewHolder.stationCircle.setImageResource(R.drawable.bg_bus_p_end_tag_bg);
+                }
+                Log.d("onBindViewHolder" , "position2 = "+position);
                 BlinkAnimationUtil.setAnimation(viewHolder.stationCircle);
                 viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.MARQUEE);
             }else if (station.getDrivingStatus() == STATION_STATUS_ARRIVING && preStation.isLeaving()){//即将到站
                 viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_panel_cur_station_tips_color));
                 viewHolder.curArrowBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_A9B6CA));
                 viewHolder.stationCircle.setImageResource(R.drawable.bus_p_arrive_line_blue);
-//                BlinkAnimationUtil.setAnimation(viewHolder.stationCircle);
-//                viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.MARQUEE);
+                Log.d("onBindViewHolder" , "position3 = "+position);
+
             }else if (station.getDrivingStatus() == STATION_STATUS_ARRIVING &&
                     (preStation.getDrivingStatus() == STATION_STATUS_ARRIVING
                             || preStation.getDrivingStatus() == STATION_STATUS_STOPPED)){ //未到站的并且前面也是未到站或者刚到站的
@@ -95,6 +99,7 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
                 if (position == mStations.size() - 1){
                     viewHolder.stationCircle.setImageResource(R.drawable.bg_bus_p_end_tag_bg);
                 }
+                Log.d("onBindViewHolder" , "position4 = "+position);
             }
         }
     }
diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml
index 42580f9fdf..e9902a095d 100644
--- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml
+++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml
@@ -224,7 +224,6 @@
             android:id="@+id/bus_p_line_stations_rl"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_marginTop="@dimen/dp_64"
             android:paddingBottom="@dimen/dp_20"
             android:paddingLeft="@dimen/dp_30"
             android:paddingRight="@dimen/bus_p_route_info_margin_right"
diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml
index c34213b4c8..1047f488b5 100644
--- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml
+++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml
@@ -20,9 +20,19 @@
         android:layout_marginLeft="@dimen/dp_90"
         app:customGap="0.5"
         app:useCustomGap="true"
+        android:layout_marginTop="@dimen/dp_68"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/bus_p_cur_arrow_bg"/>
+        app:layout_constraintTop_toTopOf="parent"/>
+
+    <ImageView
+        android:id="@+id/bus_p_cur_arrow_bg"
+        android:layout_width="@dimen/dp_10"
+        android:layout_height="@dimen/dp_72"
+        android:background="@color/acc_default_txt_color"
+        app:layout_constraintLeft_toLeftOf="@+id/bus_p_circle"
+        app:layout_constraintRight_toRightOf="@+id/bus_p_circle"
+        app:layout_constraintTop_toTopOf="parent"/>
 
     <ImageView
         android:id="@+id/bus_p_circle"
@@ -32,14 +42,5 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="@+id/bus_p_station"
         app:layout_constraintBottom_toBottomOf="@+id/bus_p_station"/>
-    <ImageView
-        android:id="@+id/bus_p_cur_arrow_bg"
-        android:layout_width="@dimen/dp_10"
-        android:layout_height="@dimen/dp_68"
-        android:scaleType="fitXY"
-        android:background="@color/acc_default_txt_color"
-        app:layout_constraintLeft_toLeftOf="@+id/bus_p_circle"
-        app:layout_constraintRight_toRightOf="@+id/bus_p_circle"
-        app:layout_constraintTop_toTopOf="parent"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file