From d355d9816148b27660806a955be06a9faed8774d Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Tue, 20 Sep 2022 19:49:24 +0800
Subject: [PATCH] =?UTF-8?q?[1.6.0]=20bus=E4=B9=98=E5=AE=A2=E5=B1=8F?=
 =?UTF-8?q?=E8=B7=AF=E7=BA=BF=E9=9D=A2=E6=9D=BF=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusPassengerLineStationsAdapter.java      | 121 +++++++++---------
 .../bus_p_line_blue.png                       | Bin 0 -> 475 bytes
 .../bus_p_line_green.png                      | Bin 0 -> 494 bytes
 .../bus_p_line_grey.png                       | Bin 0 -> 505 bytes
 .../bus_p_point_blue.png                      | Bin 0 -> 996 bytes
 .../bus_p_point_gray.png                      | Bin 0 -> 632 bytes
 .../bus_p_point_green.png                     | Bin 0 -> 6180 bytes
 .../res/drawable-xhdpi/bus_p_line_blue.png    | Bin 0 -> 475 bytes
 .../res/drawable-xhdpi/bus_p_line_green.png   | Bin 0 -> 494 bytes
 .../res/drawable-xhdpi/bus_p_line_grey.png    | Bin 0 -> 505 bytes
 .../res/drawable-xhdpi/bus_p_point_blue.png   | Bin 0 -> 996 bytes
 .../res/drawable-xhdpi/bus_p_point_gray.png   | Bin 0 -> 632 bytes
 .../res/drawable-xhdpi/bus_p_point_green.png  | Bin 0 -> 6180 bytes
 .../res/layout/bus_p_stations_common_item.xml |  70 ++++++++++
 14 files changed, 128 insertions(+), 63 deletions(-)
 create mode 100644 OCH/mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/bus_p_line_blue.png
 create mode 100644 OCH/mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/bus_p_line_green.png
 create mode 100644 OCH/mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/bus_p_line_grey.png
 create mode 100644 OCH/mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/bus_p_point_blue.png
 create mode 100644 OCH/mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/bus_p_point_gray.png
 create mode 100644 OCH/mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/bus_p_point_green.png
 create mode 100644 OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_line_blue.png
 create mode 100644 OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_line_green.png
 create mode 100644 OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_line_grey.png
 create mode 100644 OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_point_blue.png
 create mode 100644 OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_point_gray.png
 create mode 100644 OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_point_green.png
 create mode 100644 OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_stations_common_item.xml

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 93e66bad7e..bdcdac6271 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
@@ -8,6 +8,7 @@ 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;
@@ -15,6 +16,8 @@ import com.mogo.och.bus.passenger.bean.BusPassengerStation;
 
 import java.util.List;
 
+import static com.mogo.och.bus.passenger.constant.BusPassengerConst.STATION_STATUS_ARRIVING;
+import static com.mogo.och.bus.passenger.constant.BusPassengerConst.STATION_STATUS_LEAVING;
 import static com.mogo.och.bus.passenger.constant.BusPassengerConst.STATION_STATUS_STOPPED;
 
 /**
@@ -28,7 +31,6 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
     private static final int LINE_START_STATION_ITEM = 0;
     private static final int LINE_END_STATION_ITEM = 1;
     private static final int LINE_MIDDLE_STATION_ITEM = 2;
-//    private String preArrivingStation = "";
 
     public BusPassengerLineStationsAdapter(Context context, List<BusPassengerStation> stations){
          this.mContext = context;
@@ -38,78 +40,54 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
     @NonNull
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        if (viewType == LINE_START_STATION_ITEM){
-            View view = LayoutInflater.from(mContext).inflate(R.layout.bus_p_stations_start_item,parent,false);
-            StartStationViewHolder viewHolder = new StartStationViewHolder(view);
-            return viewHolder;
-        }else if (viewType == LINE_END_STATION_ITEM) {
-            View view = LayoutInflater.from(mContext).inflate(R.layout.bus_p_stations_end_item,parent,false);
-            EndStationViewHolder viewHolder = new EndStationViewHolder(view);
-            return viewHolder;
-        }else {
-            View view = LayoutInflater.from(mContext).inflate(R.layout.bus_p_stations_middle_item,parent,false);
-            MiddleStationViewHolder viewHolder = new MiddleStationViewHolder(view);
-            return viewHolder;
-        }
+        View view = LayoutInflater.from(mContext).inflate(R.layout.bus_p_stations_common_item,parent,false);
+        StationViewHolder viewHolder = new StationViewHolder(view);
+        return viewHolder;
     }
 
     @Override
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
         BusPassengerStation station = mStations.get(position);
-        if (holder instanceof StartStationViewHolder){
-            StartStationViewHolder viewHolder = (StartStationViewHolder)holder;
-//            if (!preArrivingStation.equals(station.getName())){
-                viewHolder.startStationName.setText(station.getName());
-//            }
-            if (station.getDrivingStatus() == STATION_STATUS_STOPPED && !station.isLeaving()){//到站
-                viewHolder.curStationBg.setVisibility(View.VISIBLE);
-                viewHolder.stationCircle.setVisibility(View.GONE);
-                viewHolder.startStationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_current_station_txt_color));
-                viewHolder.startStationName.setSelected(true);
-//                preArrivingStation = station.getName();
+        StationViewHolder viewHolder = (StationViewHolder)holder;
+        viewHolder.stationName.setText(station.getName());
+        if (position == 0){ //第一个 起点
+            viewHolder.stationTagTxt.setText("起");
+            viewHolder.stationStationTag.setBackground(mContext.getDrawable(R.drawable.bg_bus_p_start_tag_bg));
+            viewHolder.groupStationTagPanel.setVisibility(View.VISIBLE);
+            viewHolder.curArrowBg.setVisibility(View.GONE);
+            if (station.getDrivingStatus() == STATION_STATUS_STOPPED && station.isLeaving()){//到达未离开
+                viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_current_station_txt_color));
             }else {
-                viewHolder.curStationBg.setVisibility(View.GONE);
-                viewHolder.stationCircle.setVisibility(View.VISIBLE);
-                viewHolder.startStationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_station_txt_color));
-                viewHolder.startStationName.setSelected(false);
+                viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_station_txt_color));
             }
-        }else if (holder instanceof EndStationViewHolder){
-            EndStationViewHolder viewHolder = (EndStationViewHolder)holder;
-//            if (!preArrivingStation.equals(station.getName())){
-                viewHolder.endStationName.setText(station.getName());
-//            }
-            BusPassengerStation preStation = mStations.get(position -1);
-            if ((preStation.getDrivingStatus() == STATION_STATUS_STOPPED && preStation.isLeaving())
-                    || (station.getDrivingStatus() == STATION_STATUS_STOPPED && !station.isLeaving())){//到站
-                viewHolder.curStationBg.setVisibility(View.VISIBLE);
-                viewHolder.stationCircle.setVisibility(View.GONE);
-                viewHolder.endStationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_current_station_txt_color));
-                viewHolder.endStationName.setSelected(true);
-//                preArrivingStation = station.getName();
+        }else{
+            if (position == mStations.size() - 1){
+                viewHolder.stationTagTxt.setText("终");
+                viewHolder.stationStationTag.setBackground(mContext.getDrawable(R.drawable.bg_bus_p_end_tag_bg));
+                viewHolder.groupStationTagPanel.setVisibility(View.VISIBLE);
             }else {
-                viewHolder.curStationBg.setVisibility(View.GONE);
-                viewHolder.stationCircle.setVisibility(View.VISIBLE);
-                viewHolder.endStationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_station_txt_color));
-                viewHolder.endStationName.setSelected(false);
+                viewHolder.groupStationTagPanel.setVisibility(View.GONE);
             }
-        }else {
-            MiddleStationViewHolder viewHolder = (MiddleStationViewHolder)holder;
-//            if (!preArrivingStation.equals(station.getName())){
-                viewHolder.middleStationName.setText(station.getName());
-//            }
+            viewHolder.curArrowBg.setVisibility(View.VISIBLE);
             BusPassengerStation preStation = mStations.get(position -1);
-            if ((preStation.getDrivingStatus() == STATION_STATUS_STOPPED && preStation.isLeaving())
-                 || (station.getDrivingStatus() == STATION_STATUS_STOPPED && !station.isLeaving())) {//到站
-                viewHolder.curStationBg.setVisibility(View.VISIBLE);
-                viewHolder.middleStationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_current_station_txt_color));
-                viewHolder.stationCircle.setVisibility(View.GONE);
-                viewHolder.middleStationName.setSelected(true);
-//                preArrivingStation = station.getName();
-            }else {
-                viewHolder.curStationBg.setVisibility(View.GONE);
-                viewHolder.middleStationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_station_txt_color));
-                viewHolder.stationCircle.setVisibility(View.VISIBLE);
-                viewHolder.middleStationName.setSelected(false);
+            if (station.getDrivingStatus() == STATION_STATUS_LEAVING){ //过站
+                viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_station_txt_color));
+                viewHolder.curArrowBg.setImageResource(R.drawable.bus_p_line_grey);
+                viewHolder.stationStationTag.setImageResource(R.drawable.bus_p_point_gray);
+            } else if (station.getDrivingStatus() == STATION_STATUS_STOPPED && !station.isLeaving()){//刚到站未离开的
+                viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_current_station_txt_color));
+                viewHolder.curArrowBg.setImageResource(R.drawable.bus_p_line_grey);
+                viewHolder.stationStationTag.setImageResource(R.drawable.bus_p_point_green);
+            }else if (station.getDrivingStatus() == STATION_STATUS_ARRIVING && preStation.isLeaving()){//即将到站
+                viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_current_station_txt_color));
+                viewHolder.curArrowBg.setImageResource(R.drawable.bus_p_line_green);
+                viewHolder.stationStationTag.setImageResource(R.drawable.bus_p_point_green);
+            }else if (station.getDrivingStatus() == STATION_STATUS_ARRIVING &&
+                    (preStation.getDrivingStatus() == STATION_STATUS_ARRIVING
+                            || preStation.getDrivingStatus() == STATION_STATUS_STOPPED)){ //未到站的并且前面也是未到站或者刚到站的
+                viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_station_txt_color));
+                viewHolder.curArrowBg.setImageResource(R.drawable.bus_p_line_blue);
+                viewHolder.stationStationTag.setImageResource(R.drawable.bus_p_point_blue);
             }
         }
     }
@@ -132,6 +110,23 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
     }
 
 }
+class StationViewHolder extends RecyclerView.ViewHolder{
+    public TextView stationName;
+    public ImageView stationCircle;
+    public ImageView curArrowBg;
+    public ImageView stationStationTag;
+    public TextView stationTagTxt;
+    public Group groupStationTagPanel;
+    public StationViewHolder(@NonNull View itemView) {
+        super(itemView);
+        stationName = itemView.findViewById(R.id.bus_p_station);
+        stationCircle = itemView.findViewById(R.id.bus_p_circle);
+        curArrowBg = itemView.findViewById(R.id.bus_p_cur_arrow_bg);
+        stationStationTag = itemView.findViewById(R.id.bus_p_tag);
+        stationTagTxt = itemView.findViewById(R.id.bus_p_tag_txt);
+        groupStationTagPanel = itemView.findViewById(R.id.group_station_tag_panel);
+    }
+}
 
 class StartStationViewHolder extends RecyclerView.ViewHolder{
     public TextView startStationName;
diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/bus_p_line_blue.png b/OCH/mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/bus_p_line_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..5614459c692d8f7eb89b0c39dd145078b5a7a882
GIT binary patch
literal 475
zcmeAS@N?(olHy`uVBq!ia0vp^JV0#A!3HE}26wy%QjEnx?oJHr&dIz4a$Hg)JkxxA
z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvP%d>zP&b9?9?Dx&i1}by)ba4#v
z;C&lr>&@&aP`kNvnUHY6iSsA*Kjd>{C8oPvS$*Zyp_mODE?<gz{kmm~W^T)rB)^TE
z9J}ACzAL)vt(Lr>{rI`#)t{fqv6o-5F_2|A`gYwL<E3X*A4YC(?Yn4E&Kq=Dqqwr-
z+^xi^CzTrwk8fY(eUD46L(lNpkFb)H(Fa*BsveWM-=$ZnJ>$WBJ<<7hcb=AbWA^>b
zxtNdofh~Wz7};`}w`j8*O1QIJ{G*qPg;rY!2aC<l`<<`69_q2=E|=f^$&1zcubqFU
zhN@2pb2?wloHb2bH=6HTHgU>?*Ss;)4(@3>bo9FDQ>CWb3xV0(nH+KJ94u<RGnAAf
z&bPPUu83fXTaj@6r5b0Z;6cChpX_Y)nZrf0vc5H)<Y+nGFUM<95cx2DZ`<V12SyLy
w{cVd=ZLu=hC!M`xYQypwXV+zR9u)h*U3bK0>DPU}#-M=pboFyt=akR{0MgO32LJ#7

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/bus_p_line_green.png b/OCH/mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/bus_p_line_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..dab0bedbfad45823e710dccff347919e28058ef5
GIT binary patch
literal 494
zcmeAS@N?(olHy`uVBq!ia0vp^JV0#A!3HE}26wy%QjEnx?oJHr&dIz4a$Hg)JkxxA
z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvP%d>zP&b9?9?Dx&i1}cm2ba4#v
z;C&lr>wnllq~?5C!&KG@4i_fbUy47_pWrC^ra?ee_>IX@X6c?Y2I<bPZcSX@R`&it
z(8@`@lP7UVTYo&1<~_0Y`@27nCbK6$e!SwSW&XkQ3N0#&)8>do%#T!i))YU5b>8|(
zLfPDl9!9<3-74tW=znr~isylNUT*`gx4}V=HZaVeq$<(+@Bfq;m;9L+A0@orx_9|!
z$z?q<|4cbHDrVnY&f_Anr1#$D&ypI6$8YlGu^l=7$TBeBVM;$|Rn(vOwTzB;d=FK;
zNSVMsS9k3MKgDy;PVsfzsJ*>M(pqv!1((RWy6)B13UPJszAW!!lL?OLF5S4b+2+R2
z6_RJ?@EFZ}Shu4tUr5?oV1c@zTle(&2bUh7wIuQV$pzY)R~?%EG))aXyvXFl9eK6g
zcN-lS2kc~Ie8$L<?sb$&OjaQ8{^8f+-EIqKI{Z7Duyg%}&;;w;^<h`P-ZIa);2wCQ
RlT!l})}F3@F6*2UngAm(yuknf

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/bus_p_line_grey.png b/OCH/mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/bus_p_line_grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..22a4227c74eb3a9c9d1446f4380187a87ae0c5ab
GIT binary patch
literal 505
zcmeAS@N?(olHy`uVBq!ia0vp^JV0#A!3HE}26wy%QjEnx?oJHr&dIz4a$Hg)JkxxA
z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvP%d>zP&b9?9?Dx&i1}aPTba4#v
z;7y*h?bViF|NsBLDzTtp;>3?(VKZL(O32SmW7PcjfBr#s#gFye6MBQ0g`E@&*97t&
zX}O%C(c31}Cm`V~Wx>SeT46FJpoy71-DFAu3s0B9Tjx&Jqjns}^G=-#{uOaV^55U|
zsJ?}a5$T^9MVk${5|UCXCI}}MO|P&wFj~hv(_spmo7%C{8=kQ^@*dcByk3p%+E;_`
zf>#*6yzD$<(7fCwGa)76$Ki8-(uI8tJC0>D3oAd~H^pFexl1Mk+vDx}_BYEEw2x&U
z{{P?Sw)f*N`xj*&=&;zp<aX@4&MBVX7e$+YM3`<cFv|BaH~iJ>%iOkn<_w8>`*v)5
zsbY3i!H|cyUUJ4Ya}$$4hnF%Q_3Y{4*<N(WNAGb^PvT+wWB(tpwD~jNVN+8(wmC8}
z?fXZ~w%ZI}Ufhqb|Cgt-L}FcI<HP?Gn>4zoAIV5aOiTH5@bKsN3Wi+=vv!HcK2eJ@
a3{Yf9776ZI7}5obTn0~9KbLh*2~7Y;(7e9@

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/bus_p_point_blue.png b/OCH/mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/bus_p_point_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..6947f4538da2a8c1d52c2339f72174f579ab5b0f
GIT binary patch
literal 996
zcmeAS@N?(olHy`uVBq!ia0vp^E+EXo1|%(nCvO5$jKx9jP7LeL$-D%~q(*qA`T8<w
z0ofc3jP02WEFdL7ECs|249p7{8JK}IBS>rk6I|A10W*RPQh4Cz;r&46ex5FlAr*{o
zXKc(DHWWEFznE7zRw8(t#{xc4=g;;Vmc`yoOmN_7H%jZ7(%IOU*Rl8Pxl=d%ctoAe
zZZ$Ht88yB;^L_6R+3Rn%xqQ{Jto#1v^WE>CH_OiNP*;DzGN(bffXVLwrv)QUPNNWu
zQ)hdQ{o@a{GXM5X%9K!GpUI;o$@@VqRQ39X^AF=??@YgXvin2&?|XNyA8mYd{?SC1
zNTwqak60h2Ht<MfecpBJ$F-{gug<SO6q(2I_g^>T%=3>QJnq$5uvLx2=>_x7(z&k~
zdnZiuk3XFw=XAUNW6U?db$#1^|NRgwCJ^D?kl`!Edc0mYb5Ygg0>^|)UVmS%-F0ut
ztTnC^IVyh`$vM7Q>BntzQR&FC(`&P5TkS3DnKyT#%=8&{HydT_`VYT%)HD3@I4??N
z;~XL8BO2l%t;xZx40&rczpzKjzd2R+u60}Yg_y#Mt0%T(rk=?>bjL))P&R6c;nXj)
zWivPH-rm@IGw@h^-AR+{)lvIzHac9ma%AQKkBuU;Hg&3ru)5jje9pGM!@S{UV@iAo
zW8$LAjF+7jGbBY8?d|!%xtN93-OXF#%jIR0ea-Bv&bLgr4CYi&7G)J>Yih7~<+DX|
zMybingfg@DscA<RB(>aMqiHSBW-I#g#o?5j;{F^_?1z<_?Y0Up5&QmnzrduEb2c#_
zJQ3IKCbzPn&*;*&b^l8L*K?LH<rB(j*nRKIg!j|m&ooVBwB7DH@#3Y_0~=k7Z!fRg
za`kRU>Zy)3pV#PjpWDowxoFKVrc!awXsz64$BTFQCjZ%Hee<tI_<!38$N5E0?9xA{
zFe89@VV#SgxZvLx8L74T@A(*ZS{xL#d&J|s(Cm}QtVJ!4*7`X{%nn(9Az^cWH`9FP
zP5zQ?Kh9=aG;dICeSH3E+FJtww&l;?FAM4tI}j14cdCX>gQ+FpmAX-|hJc@j7_XEj
z+u=n@jR6L|I`iM2>ZzUL@mF^Jk<TgLEov3K+V>u~tb6Z}-<~oCmz~pOSMJ}dEi9?F
z&qBa%hWdl`_9;=Ub9}XCKH$Eo;rP-{@m=VqOJ9%QyW)*A^`fNfMr+px`nwcXa5!yf
QYX;>oPgg&ebxsLQ0NE?2SpWb4

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/bus_p_point_gray.png b/OCH/mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/bus_p_point_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b9da6fb76f3de78391d72506d0196be41ce320e
GIT binary patch
literal 632
zcmeAS@N?(olHy`uVBq!ia0vp^E+EXo1|%(nCvO5$jKx9jP7LeL$-D%~q(*qA`T8<w
z0ofc3jP02WEFdL7ECs|249p7{8JK}IBS>rk6I|A10W*RPQh4Cz;r&2mk33x*Ln;{G
z-Z1n#Y#?&1aQA@&yaLP$g{^rV%m+etcni8ayoy~QEW@zzE0@QCh8>K|i`3$;dS$jc
z&-oF_^Pf+pbpHL#^@}p&<~(j?VB%0{z(oW&9hk1MDKgoN+gg5pzViFSCt3}7&b`+@
zw)?}oJ@Z>1EU(_pe)-{r`rLC{>*8geJpA}H>D^tGmV!H5EZ_hAtgz$b&6gKrgJa&E
z?`jNTX#TzY`s`O0em7lMjV<jh_pIytJf$)=dHZfZpSjmrolRLH&R%^v^<TvPu0QQB
zvOm2&lso@yj%9u1qu0hSHlHvnE@ixGy4W`-xTi=XJlLo2{29kD*`KbnZaM2V#d+tg
zBi}j=*(3jK`4*X&n|Cf|>z3^0&lGl@k63-<x$n7{iKR1|*W~R|`Z~F-_*s{z8GEPb
zzx9uwDRkfd=(GF$Ozmwd#R6Z|Ha<G}*s|EQYj*RB!0s!4a_44hhux8JiCrzV^#;?e
zKJE6Rt-bH1()kvN#l>b{XI=M9)4lUJ<1>X@6RHGC*RDRhRL*p}i~QnJQO3Z9soe8>
zlz7gD_6e<5x|>(4Y@@I$Tj%`$&&o&Qr=1qS7w8QQjR*J{geTqf(B}RNigiy{KbLh*
G2~7ar)c6+w

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/bus_p_point_green.png b/OCH/mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/bus_p_point_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..f02d893f648de9a42a4fd12f72033e2c4c3f061e
GIT binary patch
literal 6180
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
CAe~D9

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_line_blue.png b/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_line_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..5614459c692d8f7eb89b0c39dd145078b5a7a882
GIT binary patch
literal 475
zcmeAS@N?(olHy`uVBq!ia0vp^JV0#A!3HE}26wy%QjEnx?oJHr&dIz4a$Hg)JkxxA
z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvP%d>zP&b9?9?Dx&i1}by)ba4#v
z;C&lr>&@&aP`kNvnUHY6iSsA*Kjd>{C8oPvS$*Zyp_mODE?<gz{kmm~W^T)rB)^TE
z9J}ACzAL)vt(Lr>{rI`#)t{fqv6o-5F_2|A`gYwL<E3X*A4YC(?Yn4E&Kq=Dqqwr-
z+^xi^CzTrwk8fY(eUD46L(lNpkFb)H(Fa*BsveWM-=$ZnJ>$WBJ<<7hcb=AbWA^>b
zxtNdofh~Wz7};`}w`j8*O1QIJ{G*qPg;rY!2aC<l`<<`69_q2=E|=f^$&1zcubqFU
zhN@2pb2?wloHb2bH=6HTHgU>?*Ss;)4(@3>bo9FDQ>CWb3xV0(nH+KJ94u<RGnAAf
z&bPPUu83fXTaj@6r5b0Z;6cChpX_Y)nZrf0vc5H)<Y+nGFUM<95cx2DZ`<V12SyLy
w{cVd=ZLu=hC!M`xYQypwXV+zR9u)h*U3bK0>DPU}#-M=pboFyt=akR{0MgO32LJ#7

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_line_green.png b/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_line_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..dab0bedbfad45823e710dccff347919e28058ef5
GIT binary patch
literal 494
zcmeAS@N?(olHy`uVBq!ia0vp^JV0#A!3HE}26wy%QjEnx?oJHr&dIz4a$Hg)JkxxA
z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvP%d>zP&b9?9?Dx&i1}cm2ba4#v
z;C&lr>wnllq~?5C!&KG@4i_fbUy47_pWrC^ra?ee_>IX@X6c?Y2I<bPZcSX@R`&it
z(8@`@lP7UVTYo&1<~_0Y`@27nCbK6$e!SwSW&XkQ3N0#&)8>do%#T!i))YU5b>8|(
zLfPDl9!9<3-74tW=znr~isylNUT*`gx4}V=HZaVeq$<(+@Bfq;m;9L+A0@orx_9|!
z$z?q<|4cbHDrVnY&f_Anr1#$D&ypI6$8YlGu^l=7$TBeBVM;$|Rn(vOwTzB;d=FK;
zNSVMsS9k3MKgDy;PVsfzsJ*>M(pqv!1((RWy6)B13UPJszAW!!lL?OLF5S4b+2+R2
z6_RJ?@EFZ}Shu4tUr5?oV1c@zTle(&2bUh7wIuQV$pzY)R~?%EG))aXyvXFl9eK6g
zcN-lS2kc~Ie8$L<?sb$&OjaQ8{^8f+-EIqKI{Z7Duyg%}&;;w;^<h`P-ZIa);2wCQ
RlT!l})}F3@F6*2UngAm(yuknf

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_line_grey.png b/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_line_grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..22a4227c74eb3a9c9d1446f4380187a87ae0c5ab
GIT binary patch
literal 505
zcmeAS@N?(olHy`uVBq!ia0vp^JV0#A!3HE}26wy%QjEnx?oJHr&dIz4a$Hg)JkxxA
z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvP%d>zP&b9?9?Dx&i1}aPTba4#v
z;7y*h?bViF|NsBLDzTtp;>3?(VKZL(O32SmW7PcjfBr#s#gFye6MBQ0g`E@&*97t&
zX}O%C(c31}Cm`V~Wx>SeT46FJpoy71-DFAu3s0B9Tjx&Jqjns}^G=-#{uOaV^55U|
zsJ?}a5$T^9MVk${5|UCXCI}}MO|P&wFj~hv(_spmo7%C{8=kQ^@*dcByk3p%+E;_`
zf>#*6yzD$<(7fCwGa)76$Ki8-(uI8tJC0>D3oAd~H^pFexl1Mk+vDx}_BYEEw2x&U
z{{P?Sw)f*N`xj*&=&;zp<aX@4&MBVX7e$+YM3`<cFv|BaH~iJ>%iOkn<_w8>`*v)5
zsbY3i!H|cyUUJ4Ya}$$4hnF%Q_3Y{4*<N(WNAGb^PvT+wWB(tpwD~jNVN+8(wmC8}
z?fXZ~w%ZI}Ufhqb|Cgt-L}FcI<HP?Gn>4zoAIV5aOiTH5@bKsN3Wi+=vv!HcK2eJ@
a3{Yf9776ZI7}5obTn0~9KbLh*2~7Y;(7e9@

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_point_blue.png b/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_point_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..6947f4538da2a8c1d52c2339f72174f579ab5b0f
GIT binary patch
literal 996
zcmeAS@N?(olHy`uVBq!ia0vp^E+EXo1|%(nCvO5$jKx9jP7LeL$-D%~q(*qA`T8<w
z0ofc3jP02WEFdL7ECs|249p7{8JK}IBS>rk6I|A10W*RPQh4Cz;r&46ex5FlAr*{o
zXKc(DHWWEFznE7zRw8(t#{xc4=g;;Vmc`yoOmN_7H%jZ7(%IOU*Rl8Pxl=d%ctoAe
zZZ$Ht88yB;^L_6R+3Rn%xqQ{Jto#1v^WE>CH_OiNP*;DzGN(bffXVLwrv)QUPNNWu
zQ)hdQ{o@a{GXM5X%9K!GpUI;o$@@VqRQ39X^AF=??@YgXvin2&?|XNyA8mYd{?SC1
zNTwqak60h2Ht<MfecpBJ$F-{gug<SO6q(2I_g^>T%=3>QJnq$5uvLx2=>_x7(z&k~
zdnZiuk3XFw=XAUNW6U?db$#1^|NRgwCJ^D?kl`!Edc0mYb5Ygg0>^|)UVmS%-F0ut
ztTnC^IVyh`$vM7Q>BntzQR&FC(`&P5TkS3DnKyT#%=8&{HydT_`VYT%)HD3@I4??N
z;~XL8BO2l%t;xZx40&rczpzKjzd2R+u60}Yg_y#Mt0%T(rk=?>bjL))P&R6c;nXj)
zWivPH-rm@IGw@h^-AR+{)lvIzHac9ma%AQKkBuU;Hg&3ru)5jje9pGM!@S{UV@iAo
zW8$LAjF+7jGbBY8?d|!%xtN93-OXF#%jIR0ea-Bv&bLgr4CYi&7G)J>Yih7~<+DX|
zMybingfg@DscA<RB(>aMqiHSBW-I#g#o?5j;{F^_?1z<_?Y0Up5&QmnzrduEb2c#_
zJQ3IKCbzPn&*;*&b^l8L*K?LH<rB(j*nRKIg!j|m&ooVBwB7DH@#3Y_0~=k7Z!fRg
za`kRU>Zy)3pV#PjpWDowxoFKVrc!awXsz64$BTFQCjZ%Hee<tI_<!38$N5E0?9xA{
zFe89@VV#SgxZvLx8L74T@A(*ZS{xL#d&J|s(Cm}QtVJ!4*7`X{%nn(9Az^cWH`9FP
zP5zQ?Kh9=aG;dICeSH3E+FJtww&l;?FAM4tI}j14cdCX>gQ+FpmAX-|hJc@j7_XEj
z+u=n@jR6L|I`iM2>ZzUL@mF^Jk<TgLEov3K+V>u~tb6Z}-<~oCmz~pOSMJ}dEi9?F
z&qBa%hWdl`_9;=Ub9}XCKH$Eo;rP-{@m=VqOJ9%QyW)*A^`fNfMr+px`nwcXa5!yf
QYX;>oPgg&ebxsLQ0NE?2SpWb4

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_point_gray.png b/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_point_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b9da6fb76f3de78391d72506d0196be41ce320e
GIT binary patch
literal 632
zcmeAS@N?(olHy`uVBq!ia0vp^E+EXo1|%(nCvO5$jKx9jP7LeL$-D%~q(*qA`T8<w
z0ofc3jP02WEFdL7ECs|249p7{8JK}IBS>rk6I|A10W*RPQh4Cz;r&2mk33x*Ln;{G
z-Z1n#Y#?&1aQA@&yaLP$g{^rV%m+etcni8ayoy~QEW@zzE0@QCh8>K|i`3$;dS$jc
z&-oF_^Pf+pbpHL#^@}p&<~(j?VB%0{z(oW&9hk1MDKgoN+gg5pzViFSCt3}7&b`+@
zw)?}oJ@Z>1EU(_pe)-{r`rLC{>*8geJpA}H>D^tGmV!H5EZ_hAtgz$b&6gKrgJa&E
z?`jNTX#TzY`s`O0em7lMjV<jh_pIytJf$)=dHZfZpSjmrolRLH&R%^v^<TvPu0QQB
zvOm2&lso@yj%9u1qu0hSHlHvnE@ixGy4W`-xTi=XJlLo2{29kD*`KbnZaM2V#d+tg
zBi}j=*(3jK`4*X&n|Cf|>z3^0&lGl@k63-<x$n7{iKR1|*W~R|`Z~F-_*s{z8GEPb
zzx9uwDRkfd=(GF$Ozmwd#R6Z|Ha<G}*s|EQYj*RB!0s!4a_44hhux8JiCrzV^#;?e
zKJE6Rt-bH1()kvN#l>b{XI=M9)4lUJ<1>X@6RHGC*RDRhRL*p}i~QnJQO3Z9soe8>
zlz7gD_6e<5x|>(4Y@@I$Tj%`$&&o&Qr=1qS7w8QQjR*J{geTqf(B}RNigiy{KbLh*
G2~7ar)c6+w

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_point_green.png b/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_point_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..f02d893f648de9a42a4fd12f72033e2c4c3f061e
GIT binary patch
literal 6180
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
CAe~D9

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_stations_common_item.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_stations_common_item.xml
new file mode 100644
index 0000000000..b550a71eeb
--- /dev/null
+++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_stations_common_item.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <TextView
+        android:id="@+id/bus_p_station"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="--"
+        android:textSize="@dimen/bus_p_station_txt_size"
+        android:textStyle="bold"
+        android:includeFontPadding = "false"
+        android:singleLine="true"
+        android:ellipsize="marquee"
+        android:marqueeRepeatLimit="marquee_forever"
+        android:layout_marginRight="@dimen/dp_60"
+        android:textColor="@color/bus_p_station_txt_color"
+        android:layout_marginLeft="@dimen/dp_90"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/bus_p_tag"
+        app:layout_constraintTop_toBottomOf="@+id/bus_p_cur_arrow_bg"/>
+
+    <ImageView
+        android:id="@+id/bus_p_circle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/bus_p_point_blue"
+        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="wrap_content"
+        android:layout_height="wrap_content"
+        android:scaleType="fitXY"
+        android:src="@drawable/bus_p_line_blue"
+        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_tag"
+        android:layout_width="@dimen/bus_p_station_tag_width_height"
+        android:layout_height="@dimen/bus_p_station_tag_width_height"
+        android:background="@drawable/bg_bus_p_end_tag_bg"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+    <TextView
+        android:id="@+id/bus_p_tag_txt"
+        android:layout_width="@dimen/bus_p_station_tag_width_height"
+        android:layout_height="@dimen/bus_p_station_tag_width_height"
+        android:textSize="@dimen/bus_p_station_tag_txt_size"
+        android:textColor="@color/bus_p_end_tag_txt_color"
+        android:text="@string/bus_p_end_station_txt_tag"
+        android:includeFontPadding="false"
+        android:gravity="center"
+        app:layout_constraintLeft_toLeftOf="@+id/bus_p_tag"
+        app:layout_constraintRight_toRightOf="@+id/bus_p_tag"
+        app:layout_constraintTop_toTopOf="@+id/bus_p_tag"
+        app:layout_constraintBottom_toBottomOf="@+id/bus_p_tag"/>
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/group_station_tag_panel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:constraint_referenced_ids="bus_p_tag,bus_p_tag_txt"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file