From 5c2d622d800bd13ffcbb0b1f6f6ebc1e20146374 Mon Sep 17 00:00:00 2001
From: tongchenfei <tonghenfei@zhidaoauto.com>
Date: Wed, 3 Feb 2021 19:50:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BD=91=E7=BA=A6=E8=BD=A6?=
 =?UTF-8?q?=E7=AB=99=E7=82=B9=E5=8D=A1=E7=89=87=E8=B7=9D=E7=A6=BB=E4=B8=8A?=
 =?UTF-8?q?=E7=AB=AF=E8=B7=9D=E7=A6=BB=E4=BB=A5=E5=8F=8A=E5=B0=8F=E5=B7=B4?=
 =?UTF-8?q?=E8=BD=A6=E7=AB=99=E7=82=B9=E4=BF=A1=E6=81=AF=E8=B7=B3=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/bus/adapter/OchBusStationAdapter.java   | 17 ++++++++---------
 .../mogo/och/bus/fragment/OchBusFragment.java   |  4 ++++
 .../mogo/och/bus/presenter/OchBusPresenter.java |  4 ++++
 OCH/mogo-och/src/main/res/values/dimens.xml     |  2 +-
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/adapter/OchBusStationAdapter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/adapter/OchBusStationAdapter.java
index fa13136735..2657c8cf4c 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/adapter/OchBusStationAdapter.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/adapter/OchBusStationAdapter.java
@@ -1,7 +1,6 @@
 package com.mogo.och.bus.adapter;
 
 import android.content.Context;
-import android.graphics.Color;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -15,7 +14,6 @@ import com.mogo.och.bus.R;
 import com.mogo.och.bus.bean.OchBusStation;
 import com.mogo.och.bus.constant.OchBusConst;
 import com.mogo.och.bus.view.VerticalDashLineView;
-import com.mogo.utils.logger.Logger;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -58,12 +56,12 @@ public class OchBusStationAdapter extends RecyclerView.Adapter<OchBusStationAdap
 //        Logger.d("OchBusStationAdapter", "position: " + position + " currPos: " + currentStation + "  station: " + stationList.get(position));
         holder.tvStationName.setText(stationList.get(position).getSiteName());
         if (position == currentStation) {
-            if(currentStation == 0){
+            if (currentStation == 0) {
                 // 在起始点
                 holder.tvStationName.setTextColor(context.getResources().getColor(R.color.module_mogo_och_bus_arrived_station_name_text_color));
                 holder.ivIcon.setImageResource(R.drawable.module_mogo_och_bus_icon_arrived_station);
                 holder.vDashBottom.setColor(context.getResources().getColor(R.color.module_mogo_och_bus_not_arrive_dash_color));
-            }else {
+            } else {
                 holder.tvStationName.setTextColor(context.getResources().getColor(R.color.module_mogo_och_bus_current_station_name_text_color));
                 holder.ivIcon.setImageResource(R.drawable.module_mogo_och_bus_icon_arriving_station);
                 holder.vDashTop.setGradient(context.getResources().getColor(R.color.module_mogo_och_bus_arriving_start_dash_color), context.getResources().getColor(R.color.module_mogo_och_bus_arriving_end_dash_color));
@@ -76,11 +74,11 @@ public class OchBusStationAdapter extends RecyclerView.Adapter<OchBusStationAdap
             if (position == currentStation - 1) {
                 holder.vDashBottom.setGradient(context.getResources().getColor(R.color.module_mogo_och_bus_leaving_start_dash_color), context.getResources().getColor(R.color.module_mogo_och_bus_leaving_end_dash_color));
                 holder.vDashTop.setColor(context.getResources().getColor(R.color.module_mogo_och_bus_arrived_dash_color));
-            }else{
+            } else {
                 holder.vDashTop.setColor(context.getResources().getColor(R.color.module_mogo_och_bus_arrived_dash_color));
                 holder.vDashBottom.setColor(context.getResources().getColor(R.color.module_mogo_och_bus_arrived_dash_color));
             }
-        }else {
+        } else {
             holder.tvStationName.setTextColor(context.getResources().getColor(R.color.module_mogo_och_bus_not_arrive_station_name_text_color));
             holder.ivIcon.setImageResource(R.drawable.module_mogo_och_bus_icon_not_arrive_station);
             holder.vDashTop.setColor(context.getResources().getColor(R.color.module_mogo_och_bus_not_arrive_dash_color));
@@ -97,7 +95,7 @@ public class OchBusStationAdapter extends RecyclerView.Adapter<OchBusStationAdap
             holder.tvStationNotice.setVisibility(View.VISIBLE);
             holder.vDashTop.setVisibility(View.VISIBLE);
             holder.vDashBottom.setVisibility(View.GONE);
-        }else{
+        } else {
             holder.tvStationNotice.setVisibility(View.GONE);
             holder.vDashTop.setVisibility(View.VISIBLE);
             holder.vDashBottom.setVisibility(View.VISIBLE);
@@ -111,11 +109,12 @@ public class OchBusStationAdapter extends RecyclerView.Adapter<OchBusStationAdap
         return stationList.size();
     }
 
-    static class ViewHolder extends RecyclerView.ViewHolder{
+    static class ViewHolder extends RecyclerView.ViewHolder {
         ImageView ivIcon;
         TextView tvStationName;
         TextView tvStationNotice;
-        VerticalDashLineView vDashBottom,vDashTop;
+        VerticalDashLineView vDashBottom, vDashTop;
+
         public ViewHolder(@NonNull View itemView) {
             super(itemView);
             ivIcon = itemView.findViewById(R.id.module_mogo_och_bus_station_icon);
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java
index 6006bee3e0..bda0787c98 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java
@@ -236,6 +236,10 @@ public class OchBusFragment extends BaseOchFragment<OchBusFragment, OchBusPresen
             }
 
             // smoothMove
+            if (stationList.size() < 5) {
+                //数量太少，不进行smooth move
+                return;
+            }
             int moveTo = currPos + 1;
             if (currPos < 3) {
                 moveTo = 0;
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java
index 382c7fac65..3859fc1fbf 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java
@@ -204,6 +204,10 @@ public class OchBusPresenter extends Presenter<OchBusFragment> implements IMogoA
 
     @Override
     public void onArriveAt(AdasOCHData data) {
+        if (currentStationIndex >= stationList.size() - 1) {
+            Logger.e(TAG,"到站异常，取消后续操作");
+            return;
+        }
         Logger.d(TAG, "到站====");
         // 当前站改为IDLE，下一站改为STATION_STATUS_STOPED，currentStationIndex增加1
         isGoingToNextStation = false;
diff --git a/OCH/mogo-och/src/main/res/values/dimens.xml b/OCH/mogo-och/src/main/res/values/dimens.xml
index a26a6dba19..74ef46126c 100644
--- a/OCH/mogo-och/src/main/res/values/dimens.xml
+++ b/OCH/mogo-och/src/main/res/values/dimens.xml
@@ -6,7 +6,7 @@
     <dimen name="module_mogo_och_margin_bottom">40px</dimen>
     <dimen name="module_mogo_och_margin_top">24px</dimen>
 
-    <dimen name="module_mogo_och_station_panel_container_margin_top_no_call">362px</dimen>
+    <dimen name="module_mogo_och_station_panel_container_margin_top_no_call">346px</dimen>
     <dimen name="module_mogo_och_station_panel_container_margin_top_with_call">492px</dimen>
 
     <dimen name="module_mogo_och_autopilot_status_bg_corner">24px</dimen>