From 6ba6d7233fc0f1da6173b8f2b6cf5287132692e2 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Tue, 4 Apr 2023 16:14:45 +0800
Subject: [PATCH] =?UTF-8?q?[m2]=20[3.0.0]=20[=E9=A1=B5=E9=9D=A2=E6=94=B9?=
 =?UTF-8?q?=E7=89=88]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presenter/PM2DrivingPresenter.kt          |  24 +++++++-
 .../passenger/ui/PM2DrivingInfoFragment.kt    |  52 +++++++++++++-----
 .../m2/res/drawable-nodpi/m2_map_car_icon.png | Bin 4704 -> 1859 bytes
 .../m2/res/drawable-nodpi/m2_map_end_icon.png | Bin 1892 -> 3558 bytes
 .../res/drawable-nodpi/m2_map_start_icon.png  | Bin 1853 -> 3440 bytes
 .../m2_map_staton_arrived_icon.png            | Bin 0 -> 973 bytes
 .../res/drawable-nodpi/m2_map_staton_icon.png | Bin 1126 -> 1018 bytes
 .../res/layout/p_m2_driving_info_fragment.xml |  31 ++++++-----
 .../src/m2/res/values/colors.xml              |   2 +
 9 files changed, 81 insertions(+), 28 deletions(-)
 create mode 100644 OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_staton_arrived_icon.png

diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2DrivingPresenter.kt b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2DrivingPresenter.kt
index b1cba39ddd..6b1893ecc6 100644
--- a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2DrivingPresenter.kt
+++ b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2DrivingPresenter.kt
@@ -1,6 +1,7 @@
 package com.mogo.och.bus.passenger.presenter
 
 import androidx.lifecycle.LifecycleOwner
+import com.amap.api.maps.model.LatLng
 import com.mogo.commons.mvp.Presenter
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
@@ -81,8 +82,29 @@ class PM2DrivingPresenter(view: PM2DrivingInfoFragment?) :
     }
 
     override fun updateLineStations(stations: MutableList<PM2Station>) {
+
+        val stationsList = mutableListOf<LatLng>()
+        val stationsListPass = mutableListOf<LatLng>()
+
+        for (i in stations.indices){
+            val station = stations[i]
+            val latLng = LatLng(station.gcjLat,station.gcjLon)
+            if(station.drivingStatus==1){//行驶信息，0初始值；1已经过；2当前站；3未到站
+                stationsListPass.add(latLng)
+            }else if(station.drivingStatus==2){
+                if(station.isLeaving){
+                    stationsListPass.add(latLng)
+                }else{
+                    stationsList.add(latLng)
+                }
+            }else{
+                stationsList.add(latLng)
+            }
+
+        }
+
         ThreadUtils.runOnUiThread {
-            mView?.updateLineStations(stations)
+            mView?.updateLineStations(stationsList,stationsListPass)
         }
         PM2ADASModel.INSTANCE.updateHDMapStations(stations)
     }
diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
index 78d9568c90..2f5665618b 100644
--- a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
+++ b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
@@ -55,6 +55,12 @@ class PM2DrivingInfoFragment :
 
         line_name_tv.setTextColor(resources.getColor(R.color.m2_line_name_tv_color))
         station_name_tv.setTextColor(resources.getColor(R.color.m2_line_name_tv_color))
+        speed_tv.setVertrial(true)
+        val intArrayOf = intArrayOf(
+            requireContext().resources.getColor(R.color.shuttle_color_43cefe),
+            requireContext().resources.getColor(R.color.shuttle_color_1466fb)
+        )
+        speed_tv.setmColorList(intArrayOf)
 
 //        current_time_tv.onClick {
 
@@ -163,6 +169,7 @@ class PM2DrivingInfoFragment :
         station_name_tv.text = resources.getString(R.string.m2_p_empty_tv)
         tv_distance.text = resources.getString(R.string.m2_p_empty_remain_km)
         tv_left_time.text = resources.getString(R.string.m2_p_empty_remain_minute)
+        noLineShow()
     }
 
     override fun createPresenter(): PM2DrivingPresenter {
@@ -179,16 +186,12 @@ class PM2DrivingInfoFragment :
         }
     }
 
-    fun updateLineStations(stations: MutableList<PM2Station>){
-        var stationsList = mutableListOf<LatLng>()
-        for (i in stations.indices){
-            val station = stations[i]
-            var latLng = LatLng(station.gcjLat,station.gcjLon)
-            stationsList.add(latLng)
-        }
+    fun updateLineStations(stations: MutableList<LatLng>,stationsPass: MutableList<LatLng>){
         overMapView?.let {
-            it.drawSiteMarkers(stationsList,
-                BitmapFactory.decodeResource(resources,R.drawable.m2_map_staton_icon),0.5f,0.9f)
+            it.drawSiteMarkers(stations,
+                BitmapFactory.decodeResource(resources,R.drawable.m2_map_staton_icon),0.5f,0.5f)
+            it.drawSiteMarkers(stationsPass,
+                BitmapFactory.decodeResource(resources,R.drawable.m2_map_staton_arrived_icon),0.5f,0.5f)
         }
     }
 
@@ -202,12 +205,10 @@ class PM2DrivingInfoFragment :
             tv_distance.text = resources.getString(R.string.m2_p_empty_remain_km)
             tv_left_time.text = resources.getString(R.string.m2_p_empty_remain_minute)
             tv_next_station_title.text = resources.getString(R.string.m2_p_station_title_arrived_tv)
-            tv_arrived_notice.visibility = View.VISIBLE
-            clg_distance_left_time.visibility = View.GONE
+            haveLineAndArrivedStation()
         }else{ //前往目的地中
             tv_next_station_title.text = resources.getString(R.string.shuttle_p_next_station_title)
-            tv_arrived_notice.visibility = View.GONE
-            clg_distance_left_time.visibility = View.VISIBLE
+            haveLineAndArriveingStation()
         }
     }
 
@@ -234,6 +235,31 @@ class PM2DrivingInfoFragment :
         "$time 分钟".also { tv_left_time.text = it }
     }
 
+    fun noLineShow(){
+        // 没有线路展示
+        group_not_select_line.visibility = View.VISIBLE
+        // 下一个站点
+        group_stationinfo.visibility = View.GONE
+        // 距离和剩余大概时间
+        clg_distance_left_time.visibility = View.GONE
+        // 到达站点
+        tv_arrived_notice.visibility = View.GONE
+    }
+    // 有线路正在到站点
+    fun haveLineAndArriveingStation(){
+        group_not_select_line.visibility = View.GONE
+        group_stationinfo.visibility = View.VISIBLE
+        clg_distance_left_time.visibility = View.VISIBLE
+        tv_arrived_notice.visibility = View.GONE
+    }
+    // 有线路到达站点
+    fun haveLineAndArrivedStation(){
+        group_not_select_line.visibility = View.GONE
+        group_stationinfo.visibility = View.VISIBLE
+        clg_distance_left_time.visibility = View.GONE
+        tv_arrived_notice.visibility = View.VISIBLE
+    }
+
     companion object {
         private val TAG = PM2DrivingInfoFragment::class.java.simpleName
         const val LOOP_TIME_TEXT = 10 * 1000L
diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_car_icon.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_car_icon.png
index 2520ae1c9e77acf65aef38a2e9dc559313a5b32d..b3a0641e346a3dc38b239ad456518be3af370ca2 100644
GIT binary patch
literal 1859
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

literal 4704
zcmV-m5})mfP)<h;3K|Lk000e1NJLTq001cf003491^@s6QWU@9000svNkl<ZcwW_8
z3wTpynnv7ll-Y4+#~sI+b+NR$)g&h;4YW<$BqvFmHoc{#q|iIGp_M|R1so8lP^5)H
z?iWYVQ7YgK7zYIka?#b99Z{V1vdTpP5ibaGS<2ngZ~yN<mz<<&no8W~+4DT#^Z)1M
zB<IchUC;TyGho2YZMXD8{!cdf1qTwjb-(~GFC6zzy^44aJ)eFr>Y#&w@fS9kOh3_T
zwYMo0?w`iQaJQq}Yc}6;uh}aT^Bv-6cpjdQ-{XO!1c2_>CId8Q-~g}pR*w9rR_mpJ
z%;e$><NBE*De2BwQ~EDhmiwhvYyOo+<Gf2{;{G*Q@Hl>s=b6a)>eSSqn@o9w@OSX{
zOs3kO;O`HZGl#!k1T6aj%D}~N-0c*YBI!=NAYOck&iNaa!SQc#I_tj=F*@$kuw0Bv
zpB}5wIpT0cQ8TU~c%1y1!3u`ES8dGr9ez)f=)6m>Px}|OI`!xHyZHME*6T%+pg_a2
zD*;5c@c%S#P^`)H3ymi6t{CmGdk_=?h&4D>3ZwIWa#2QMuo@MNB|&ZEhN@WSFakai
zN8HEbN|s||_33(LLVA2Go1s)Q)*%Rbh%V_j_@_}TBD0iL-hO)pDgnfQhyPTo&HR;C
z%iR;hCdX(DX)3kO!l-rJ&^Xqfs?c$qQfJGEW4J68YtL3Nwmb!6&-aThj~+MJGgW#n
zU7@$z;&hG_joxn3=&kxVEvJaprVWl`Tz4b0ytYK3lIjDtTkr!sK?I0u!G9dfT9qoJ
z-9YBa^kU@VgryPWLZwR9GFru2d`g40PQ}{lH3{5=`%U(VIO0B$TD8$yqhhU9O2$^A
zG}woe@8l3R9msY(<I<st#K&8HD+el5eIQ8ufcHY~pGAN}m{fHvVNPwZ*%gd6U!k*<
zEA`wg72|AIGxoRCjN=%YpVk=CFRBgBE;Zu>HIok71Q)nHqr1{`Dmpn=$*B~3(PxRN
z`Fofo_ZpRvn}UD|@N5-hvnaJ3i>xBh80uhogV07%t2}xBZ6K<dh7EF}+L-#gSfbuo
zZOX7AM5USp*KGZ;-1qgv@-8un`M`@u7=!mcFf^?QJjLT7r>G9HJU&Rz84X-k1*AGl
z!E7H1CQH#dCMkcH!CG7$r?uIY+7woyONm3r!U%xc<kjv6iIZE=lTpnIh4I(umFN($
z`n2@IWpA!AXN>6{YAJzX))K%`J`Z&)%{3Z|E2ctWNfYE3HxRJn!IfVJ&Kw`uGOG#L
zN=UYsL&2OE&nB168apK3Y9+R<L&rovAcPH~F_m{9KS-WM_Luh&+DVwvs0>^hn_1)Y
z?drOoUOEd>Gkip9_|b)PnFQ@;c*a9%^(+`!H3N#ue-EBfQz6&e1n%Jz$!8P5o;wb#
zS#?mp`fo6z{rI~oJyAWeQB-?eT*}?N(|T_U0!g#TAPfoUaVle)LCM-OxN$3=s@((N
zX;=l0yh&8-xf26NVQ$a!AI~2(9mdqRL0RowD5+@yZ&foCRm=oW$wQFieGsyWrb4=>
z5qujCLB+PN>k6H{SgE&K6<W*vND_uUR5_9-f*d%2P)j|_X!$jIo7P}SRI_%EYjXQG
z1X<d$5wb=+#EW-E&rz7Wh0#0a5vXlk3e^pZp|XA<l+`VOQ8leFV)R@XUfBZqrOl8t
zY8KSLdI~B#0CdR(4H|<blg3m+5_&q4Cd5o?mjf}cqQRo!VxT4fQ`M}^n>Bge&f47o
z)yrOo{PKC=q0%bN`BB{WA1@!b1jhgVk5D&dHTW7=!kC8TP*J~>fL#Qme2>D2F$-XL
zRU0(yy#^KA3CJYRRHcE-#RNbcHwM!wdO2!X0*NlKNOIp9Z_4~FW(JMXZc`c^CGH0|
z>_#T**M0!SzNO$rso}?B-?G3t8AsMFhfxo#fSO5<LsRp!&@kf}sGs&HsGIsEjBR=X
z#!P$+D#x#evT-Y*tl@EJ{3}o<8T0UmR0dn2l1WRVsg<N&)GS|&NKATf!vcWjW8!5b
z{y9k8E6;xLxxEN->T9Q9%I1H-jMqPdmiNAa`3KL!qR%eC(qo;l;`2-J*q2w}iLb7}
zlV4wjr%zsk=TBXO9cR9W?PssU)-%`O)$gvsmeW^Z(}|0){*!OviU0f*7H<0pCcOoe
zNxgY^Gl|P2LD<abJZN@7AiXsFAV`{FNS?*aqGGwK@=YIpQ1cGJjQw3O_tOi|N`Ngm
zdJ!Hyb`h2kaLd2A3@eH7Ag@x8&k&HCPhW=}XTOJzbKk>`b6wDJz6-Vy+5SH_pyNU}
zbaZyZOQ!%P>;oA6HUL*LalV3>ms)E{jg7Y|<Cv7YF{$(d(tWRnfQ%;rJh7;D!mO_W
z8V><HwEqS?LP2)If+L;q=usZzvg4Ov<p~6N86GE0K7~wva}{1D%<VkKgX}nuLI9p8
z013$L0?73z$#3rmnEoXJ+p+&m5|@kBECET9NZ%k$1SIRsP_mBEGyZ=3=#=-!553bZ
zfV{wiJa#DvB(LtLzTwsV7sBMuv&f<dw2KEQfZTBrp#3X=roRC+6B3H1&RecBSVyW1
zX=(iiS+a81>u8hHiOLaV+Yy0DqVC0?UzF6n`h>tFf+X_F86G56Hv*)BAiJq_bOJnm
z0(i$EHfhZ*pWP3T9ItL-lX8&L_VFO8x@9&gXHo)5nB01Xw@EpZqD_kGe)4l3Bsz{Y
zyL@&()E($JrK@)D#W+csJlyFA8Elh8c<;VKncPM^n=(nfTMiOcE;`QR$AEe_hM)*Q
z_6$KP#_l9FWM%1!-82MICJzZ91$9dxCGYl!AOt5l4w3D0n?#^Q-H#pVmYC!aWO(o9
zLE?>707ymvNtkTdbrz<*eFEA9CKm=XDSEeHlRFTkV3VSE^GtS2Og{Y9S5Uv}GH;XF
zrLz@!n^&W=rbG-9gSiN@y5kB|Z~PQm4_yjiaxuoq<Cp#3O;{8|&}(Rqf~v(h$vci{
zlK@K&+<?*z2cdjx7ua&j9+rc|VBRZ8yrU!cBwAYD8ypn~vUuGQ!r~2>cj$6JoTMNF
zf;q2l4Cb#1Op1<!>K1L1S9dooK0x9l$=!wR$3ub)nHEEV9KPU{JyoxE!gOMjZHF%h
zgrJ@_$!DB)5hP{NuWn=#)h#l)@Dtu~Mm%>4EH?wPc<IhPqT{qtCdFXR$4LaaN*00;
z<hql*x+R+wm_!D*2`Wb>|M0Ot1l<&qr7QPPkQjnm4_yiC-J;{H|JJW=e=rx=l-Z;R
z5<}3<gTy$wj|Ul?aYXONj3e6Qa{@@Qz>s@4%{YR0&;N*5cNCc1D>2z7G8ro42q2Nk
z=e|XC%WP5tDyUjuvhBa4$s~fLHhGnglZ45DI2q*KSW5<bH?4vYpp3~@8I$&?fjoRQ
zqI&WL3KHX_V3WPnlk+}|rsD{?yX_!??7N<PL8flGO$OJK2vW@5(E%x_JCb_xMZ9$g
zq3+;%a_$GwRySdCKH6ji_2i3`Nq?N|t)6Uo-(OGOJd;u|7t|ffyJd0mCBbp}swYK|
zKaNfIQBS^fO2%ZEdJ;iK&nAPJ>?PxfA!y@if9{s2#o&7Kkq`V#-n>nUOp0-`k9u;G
zEKUYz9C<w{I!@GVl6tp11cj+5d60eAlhL(FDJ=%Z$=>S8O`^K{s3#@wj)qN+72;%Y
z2<mB*e8!PLQWpK{4z4Ff$B7z~=r{;6l6rEZ+`DB=2G^56in?2aY%-WhDNf4N?GNSx
zn=+e3$BCM{rF!yU&x{kQp4=!4=E2@AuP39ZZh1W!CgaHJNj@$1T~E%9rsMeQ$!ihS
zlUQH`dv~aMQqJVf2Xk4`8%aIMgY3JW6q$^Ix<lmdKI+Nm|3B1|^igyObqCjzk3{cA
zEHL8)dv~aMlD`q_yPgzpAEK7KF_=sD-J!f&7ANJmwBhQ>wvT=Un`}KO0~u_SvU+lZ
z{0T;wdQ!aazG<5*S+QGIPlkVjA%>uJ;u8#!#dD$S$pz7R%u={u%N}3HHQpu<Ux}!m
ze3mlVcRjh_6Q0RYn=XLGUGl?0mMq(~w|M<g;W3Ns(O;N)a&3gqC+SnQ|F{93r;qfH
zNmYo4sFhpJ!2?^r3IrLZp2Ww|!5Jr1J-P4zQS}Q)pmfWXkRW?~h$@1VKaR$FvUbZC
zF!Q~W5!I6jlEz8OqF>#?_2kUAPJ-{%@2E{i{5ZO=2m37_pO2`X#K+Mc5!925KE5tF
z4qbiFhkdZ`Un1c_x^w|cBtkHsclcsh@0PFQZ11tyB(N#7$yJ~Es~~BKBodIluH)>(
zb)1VmGES&^5}%oii%r4aEw3k6AMvNf2-b1JE!*vumhI+!DqCy{&N#AqQd+hXZBhan
zSWn_&lf-2ImhA#THf(wS{Yii4nM9D0)RU<0E#LJlFoNqzT(+A;K;i;xM)|nb9|SVV
zQ$2p}N$8$>hzHr9_3oFy>wCTX=`R2#6M)UQT;1{R8~p<*tal@mW8e7V*jRGIH2qz1
zDY@@@64kvqg7xn9F9F7rKVM67c>c6StNH=b?>GoDw|V0m)N$Va9-8-k2`wL<B02ng
z2$24IlD0RH{2i=r1h|#3`pW6+@bcFeVa<U~$#Iyp5q&uh-(3|dPG(J6PaS9S&eJe*
z><V6LMOg_Y53GQ)iECi=w6)-y^E`~3zX>KR{tJw2+X$2Yuo)({kYh93!8dsg_?iU4
zIgtrVc1ZQ4A+;zV<Aeg)Gj|(ob~VeDWi_p%RnUY@N1>o{J`@tcQ9duMToB^ee5kBn
z4wd7VK@}04SJdOU3@XMgrQ&;dgA~m5DFw5XjJ+sKqX^$jhs~DQ-K5l6<Ky)XtIFsc
zmD$w33)Nk>_P-!|WHY#nXF)a!nbT36i~GWe=XpoZgHbhYP+Z*#BZ(AOw}E#I8Bxf*
ztYMi{PwLHu(@9(|P#G+V*jT4hg=o1!kl4J04VUufrHsaBb|RBi%l3fNGa1r}IP;qV
zM^6)-(@}OjcjR;^D4Pj|W!U~T13aZOp`cWp6CuYN|JqHN6q}bc33gLp^OC>A>J~(d
z$dP8L4NPzGq&NO)D>6B<<t0eVtOZMEU4ZmBmgS#2a_hlegiUmfRI-Lo;>W^Cl8oQk
zNo`V>nAe~PY6CNy&36QXBs+L8prMY0AxrJjCy~j###NALD}zL?9FmA6+REv?=U7JP
zc#hdw1@>$ok+HnEaV`j%b3`8a^9fw<zNXMwX+s^Fn%GdMaJzqsPK^KskOOXw;keuJ
zL$Ngx`*xYE>YA~;yRJJbnt@F&1OrM^A)V8G*<3DoUP4L{q&P|;RVHRf2_$nRV7Buz
zX6=Vi{Os{}VrgrlZ5V2?x7I}5Xc$7bmzq59w;E#^i?eXan`;u?HQn*73*wC^nLy{E
zB<M3!iia0-K9vM>9uYDo=TY%4+HuC;<e3t-$rHD*?Xs!_*K8Hz{0FJnJNdrdU~%-A
ztMm?FhPi=F%8^Mn7!tF|@vJjClWV8JQ8GqsmsRQ0V#Bq|;?`^9ah%?6Qm`C{UD3pD
zN;O9NWc{$rRmMd3E5_uU{R!sW1B9VtL(Tc$m{Ri24o%JP9Gc=eV@k>YdT6TWXtK57
z<0MPL+vJ?h#^mh9@vOa`ra-;Tjoq&OX*?!7b3(Up$MY@RB-kd=8#L@{HrNXBLTZDh
z9NW0n25U8mb3S5MV>PU;7DwFYk6WwMthJ2Hi)kz*;52L+hrN<CyAcK>ZQ;f(pcx(+
zMf-@+a`(iV(gq_~+QhC;Gtr)N#%75lpfL)NES0Iorg*)>t<u}Gal|Hhg~8#%Iv|c@
zFv=SFqu9_KPwWqaHrgP@=D`s*!{derL%vpkp$T6DKxXe_tV7}wI0d=5hNe)RlcCM>
zhIFI&iUE#FHiO0ESXJ@2$#yk<4}&#dBVc~^zgB>b%L5GmS^*xEfZ`YMi^wYeOEdvg
z37P@^dsGo#41ve#T=Yeac;RIY97!!O7>|oDXW;pmEHInkTP65==*1Wh`}2YZZhoM$
zS6yg3Eq&F+d<U|N9*7KJ<%AbR@cercne??6agN8u*Ie*?#^w4M|Eh~wc-6(!?^j(y
zZ8Fdp{W<BSArxd<{^C%u;Aecqz*3O^4qr4#D(#cCAF|0o3&3TsVWG-I5syjd1b~V<
iut+xX!lC4*xBmqwoMoqnUOlw{0000<MNUMnLSTZS85*Gg

diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_end_icon.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_end_icon.png
index 2efd3a52ebc29ca6f57873ee337b4ecf27a5b5c1..39ffc9052ff43d5fc8b1024c9562aa146df58375 100644
GIT binary patch
delta 3522
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

delta 1843
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

diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_start_icon.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_start_icon.png
index d7ab9231d998cc3e81eecd818e9a5dab3d30f2ba..c970699aacbc2c9fcad76c3d8b5d920a1c6469e9 100644
GIT binary patch
delta 3403
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

delta 1803
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

diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_staton_arrived_icon.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_staton_arrived_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..39be18953c759b81159ad7e79158a4a3cbec2b48
GIT binary patch
literal 973
zcmV;;12X)HP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR917N7$F1ONa40RR91761SM030DRS^xk8H%UZ6R5%fRl)GzGQ4q$@z5B?n
zuA68ug$6-L9|(x0Z9=LP!7_?}fSt9qos~^MA%%)%Adpg2QV40a2$*O@*bsI%$-eL2
z>-Rf*=eownz_&B!oSARt%$d7^`?mz?5!!6?PGkVY^k|j-o)2K#h|u8}%on0~43^}t
z3FPO+$O>AOcXoDeH=E68gTdf)9LHw>n?26(5%8q|ODywu;UFgzS65fBG#ZWdp(Ki;
z1jx)Zwvr6-!Izjc_78Haw79aeGTmym-l?)=9Q}UZuhHW;Jw1I#OiG?rZW-91+ET4n
zdpbEed0)1dvwrAm?VM}(N3ItNiJQ4Nbd@4)9*J7>d}e0mp;ldCD8!b5sQl*U=6tnU
zUDGuk_}&cNr&`_}p9QYdcOJ*B!0&OEB#HMUhFCZRxB`d~ba8%u{+<X!0-Bw`eQo63
zAaWj&>cB<=&YIo8$U|b`NV&4tgt$<tRPJQep5$F5qM>dKAT{k1X#K68^A!_AEF39u
zV5LKx3&ZdlPDrC2x`8Sibyi=2rZmt3jbJzBWB$2Z?wYoFC%8PZw2${Kpbf}Sq~L!7
z!!LjD>`95i$fVcn{jgS)^F!YX>+yL_pYbt&jo^=rNQMzpW_)yX^nnV%^=ijIl2v|Q
zlL#LpCKe9CU)kR#-573fZ@-dbtS`$|C;INjR6Cmj|6r=pD!+NT<1Q6@){2-|@z4)X
z?q^O59`S-Oxx2gjWOjD;u52&$PSJfiF1wQsE^;VG?&fsIO_ep+sT>|2zFt^Zc%)@h
zXbX`MQ#mtOnVXxty0x|SLPLKm(9_%Fn2ko*$JYPF$K~badwY9(N7_CU$mqX3dIHon
z*OfzkadGj%!NI{B1=AVdN7{pp29kJxfB((W($WKBh!x=Qe9WDRB}nS^dbGa2{=QHs
zyw!g|QYw`$YECDVXwdC;b@RjRjg5`RYinyS<=YTJOXvw?geRMSvuO#*CWMl}|1Ea*
zsmkVYxGqE;fl7@un~G7xbdrko9CBU@LNu_^B$z7$5}>V8U#-@^Rm>VOax`QHD}rFi
v4Ot7dmx(!N8)Jr@q0P2qBV(OaX@}^ae6}KScN}WJ00000NkvXXu0mjf`c}B<

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_staton_icon.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_staton_icon.png
index 13140284340435aa9b665a933aeb23013b4f6c67..d90c5a2b71e4d73392eb177fa55f1526cc9c256e 100644
GIT binary patch
delta 962
zcmV;z13moa2>J&hiBL{Q4GJ0x0000DNk~Le0000M0000M2nGNE0K~LxJCPwse-@wv
z00aO40096102TlM000~zGg<%u17t}=K~y*qbyQ7D8&MQ}NlZ*NBvfq{;zCNQr5^~E
z(xodwt5QO-F17dry6d{@?z-wG(1MG8NGVmY1Xp5<i&9s`uZC73AS9tl&}fpGyy-bF
zx#QT63n%x!dH0@s-<db@ssEd=f3-y~v1B_42%7ljs`dM40Urwyz25`LC6V?(n*6f?
z@{9>t5UUFt8yk1Z<??gOvUarA#{^?O;~sMW=5hdOjPSg1BLIY^r>DD0rBbQ^vu)cU
z5W1c*nlzZhT-LN||00)3L&;>ayHcsFV=~8!dcAJe^j;ht9j&vbMea^6e;xRM(}r`o
z+_P9L_7JhLy`okhe_HBCNh=?+`=fq!_i|7TTx3bpAkB+-JpKr)D$oEli3w(fmY0`r
zjgF44IgVqhmNGT<Znyr|YiGgz!H~LlC9IH(hCaQzx;ip7HT4x+bwEp7Lp(GzGzabc
zOx`Zk)!VHTW!aXp0f_DKf414%E?9<`HLL|8wKkmmk%@zmNMr;_idfnOsnsMrPugt6
zy$?IbCYSlF1($n6+C0Pozu(`>B-;1FDW+`3T;mW%V|p6(-pe;Y+-cT<K%f@^-;)`Z
z#56NCB_L>=(o1X}dVY|pbX(vozrlBQcAt$Nl3%OU4n+#SeQImtf5=VLJ-%)l_eXuM
z6u5$i!Xq8%Ii}9%^Pgqv$$<`~&D7KxXz&Crk65GO<UprO%vy4^xXkE=6b~Bdbow<W
z*7&m2)t-=ga6O_l2?0*+dc-p~qiV1_C{k$Fl0(R;EkUh2fY|2d=F`5uz8S>EwsKYV
z{@X8=De&$qmFNkpf8>oWbuAt?YyM=j**C+(!;cY`ffK+MVrtDh7)c}&msVC*UPhzQ
z+qn2L5kCSG)6*y!WBgxynV6WE%VaWnJU#~84}?+>Hc&-EacpdC{@~zX5ye!-=ty}O
z(-SbgzrVjYK0ZFr8rA~jFnqjsV$#4V7K?T&mHHG62G{T(f8d0};ZEGsb~Li8)hbS&
zO)o4gJei%HeTCc-2r57gU`O&8ed%dDBPC(8c7P)C|CX`)sUqf^=W$7N3UE>(b#Fye
zFzmEUG$%P<C<*Bax$`XMkqI`Smr2dESf87iYnqVD2}nrD5G*FSz?BfsT$5z?fhUkX
kdWmIQ$hdZ=7?e%=-^WBka=89mO8@`>07*qoM6N<$f`&Z3pa1{>

delta 1071
zcmV+~1kn5X2j&PNiBL{Q4GJ0x0000DNk~Le0000S0000b2nGNE08w~}@sS}&e;l9#
z00aO40096103`qb00790E>!>k1JFrCK~z`?y;n_W6G0Syvp>xyZLQk0HV74M5rv}A
zBIrSAQK*Us5fl#|#8dSocq$c%KTr`ph#(aa1W^h_@S>mxt%!I~ih?5bprFMnwXL>>
zW}9TkH?x_^WH;MpYwJQbZ{E-Mf6X_u^RgkUFCW{Q19}H2T?b2dO%npWqbINTl7>rN
zPXTEA(sAXH3DBr+B@7_64k$otVl7<Ta}?GruUj<kDSHNbpWlaDZ=aziAUP)+*93ac
z_I-;=#&DNKqHwn3AXtVeXuuFwZM2%3V}pb6wZ9){gt9#sF->Ud>Vjo0e=TmVoq{p@
zk0;9=#v_$bAE^RU*Ew-Io8bXTD5^#V24He%NDO`7vBpMDIGwfO*w8)5I*u=gIdr1I
z%`FFDxfv~r%Ow?F8UP^TLU}|pxB}_-7)+t16_!$jeF{ZjzV8Z6hik3-=S%a&eF}XU
zi|qLCgbQBM96rUT-#>!Uf0?P0Yfx`h!MT=BFo|9iUohbxd`dq|{Q#%L@nH;;nHl(<
zu_0a&o14%|B#IKe1FNBdyJ}1eE^gWj-_z6H6h2;s3cX}3;8VD<rw1Aj9fDHFL&Jk#
z+0-NnnyYGoeZpKmLV}&4YW?~!7@=|{;f~wqgA4JuMI87-61IQVf04NZ@66!cP;H5B
zl+r>sl7zXU4kN22K7--qCCO!)Yp@)4DMYRVAmALTvt+3xuY`d}YIHN;JUB}eHs(+@
zkH_3w0HKn>P45KqV-AY8P{eZcwmU^{U7$jRPz6%}r5fhr#N1F;AW!D0_b4pAJPb+_
zsNm9{uan>&)jZF=e|ZSiB~Wda>=~=zJcgv|z6o1SP!Liw=9(ez9-zX6)QKrJo+4c{
zerh@)-MG=8LehmzpGN&XpHE!*p>A4PAk7c1PT<n5&~;<O@b2ToWfdt&^584JxlI~+
zjzxIk3Hjk(IO)O&m1m)7`eh8l6XKG(UBv%JRt8^CFAXl$f3U=NB7)O>k<bdAf84{e
zcYj;=qYXKOwobH-+`uLitNgU`RAk(GRg>0VJigSK@<|DB%uC3Kvbu8yyBB}A_|^7p
zGw5JczpsC%rwkkYvxLyQF*DjXnC!>~@JP3(mr6f3+LKSMEXnl=GUg<+W`;VNqs?kA
zIDrcM-9M6=e@!1Qt}Z>Aa}RB>V?@&|_s7%)s2;BU=$JW!WVBo{BrWT0YEFeOle;ER
z(*?F{0-Px`Qf69=**6}`H-uK)Qhh=8ynDzBw|76Rvo*34m9}A{kK=<H1&55|zvnOb
p7y3!3+4(w|B!xGnAU5>>1>Wft2zkTze*gdg07*qo1w^hwV1gJz=Sctn

diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml
index dfd6973a86..791644deff 100644
--- a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml
+++ b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml
@@ -62,7 +62,7 @@
         android:maxWidth="@dimen/dp_600"
         android:singleLine="true"
         android:textColor="@color/m2_line_name_tv_color"
-        android:textSize="@dimen/dp_20"
+        android:textSize="@dimen/dp_26"
         android:textStyle="bold"
         app:customGap="0.2"
         app:layout_constraintEnd_toEndOf="@+id/iv_line_name_container"
@@ -123,20 +123,21 @@
 
     <com.mogo.och.common.module.wigets.MarqueeTextView
         android:id="@+id/station_name_tv"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_8"
+        android:layout_marginTop="@dimen/dp_18"
         android:ellipsize="marquee"
         android:marqueeRepeatLimit="marquee_forever"
+        android:gravity="left"
         android:singleLine="true"
         android:text="@string/m2_p_empty_tv"
-        android:textColor="@color/m2_line_name_tv_color"
-        android:textSize="@dimen/dp_22"
+        android:textColor="@color/shuttle_color_17417B"
+        android:textSize="@dimen/dp_34"
         android:textStyle="bold"
         app:customGap="0.2"
-        app:layout_constraintEnd_toEndOf="@+id/cl_left_container"
         app:layout_constraintStart_toStartOf="@+id/tv_next_station_title"
         app:layout_constraintTop_toBottomOf="@+id/tv_next_station_title"
+        app:layout_constraintEnd_toEndOf="@+id/cl_left_container"
         app:useCustomGap="true" />
 
     <!--    region 到下一站距离和时间    -->
@@ -152,6 +153,7 @@
         android:id="@+id/bg_distance_lefttime"
         android:layout_width="@dimen/dp_182"
         android:layout_height="@dimen/dp_48"
+        android:layout_marginTop="@dimen/dp_22"
         android:background="@drawable/bg_driving_distance_lefttime"
         app:layout_constraintStart_toStartOf="@+id/tv_next_station_title"
         app:layout_constraintTop_toBottomOf="@+id/station_name_tv" />
@@ -200,6 +202,7 @@
         android:gravity="center"
         android:text="@string/m2_p_arrived_station_title"
         android:textColor="@color/shuttle_color_1f860d"
+        android:layout_marginTop="@dimen/dp_22"
         android:textSize="@dimen/dp_18"
         android:visibility="gone"
         app:layout_constraintStart_toStartOf="@+id/tv_next_station_title"
@@ -219,13 +222,13 @@
 
 
     <!-- 行车卡片-->
-    <TextView
+    <com.mogo.och.common.module.wigets.OCHGradientTextView
         android:id="@+id/speed_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dp_50"
         android:layout_marginTop="@dimen/dp_27"
-        android:text="--"
+        android:text="60"
         android:textColor="@color/m2_p_speed_tv_color"
         android:textSize="@dimen/dp_60"
         android:textStyle="bold"
@@ -253,9 +256,10 @@
         android:gravity="center"
         android:text="@string/m2_p_auto_tv"
         android:textColor="@color/m2_button_auto_tv_color"
+        android:layout_marginBottom="@dimen/dp_34"
         android:textSize="@dimen/dp_18"
         app:layout_constraintLeft_toLeftOf="@+id/speed_tv"
-        app:layout_constraintTop_toBottomOf="@+id/speed_tv" />
+        app:layout_constraintBottom_toBottomOf="parent" />
 
     <!-- 转向灯  IMoGoChassisLamplightListener-->
     <com.mogo.och.bus.passenger.ui.widget.M2TurnLightView
@@ -308,22 +312,21 @@
         android:format12Hour="HH:mm"
         android:format24Hour="HH:mm"
         android:gravity="center"
-        android:layout_marginTop="@dimen/dp_30"
+        android:layout_marginTop="@dimen/dp_25"
         app:layout_constraintTop_toTopOf="@+id/aciv_speed_time_bg"
         app:layout_constraintStart_toEndOf="@+id/view_split"
         android:layout_marginEnd="@dimen/dp_90"
         android:textColor="@color/shuttle_color_17417B"
         android:includeFontPadding="false"
-        android:textSize="@dimen/dp_46"
-        android:textStyle="bold" />
+        android:textSize="@dimen/dp_46" />
 
     <TextClock
         android:layout_marginStart="@dimen/dp_21"
         android:id="@+id/viewTextClockDate"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:format12Hour="yyyy年MM月dd日 EEEE"
-        android:format24Hour="yyyy年MM月dd日 EEEE"
+        android:format12Hour="yyyy年MM月dd日"
+        android:format24Hour="yyyy年MM月dd日"
         android:gravity="center"
         app:layout_constraintBottom_toTopOf="@+id/viewTextClockWeek"
         app:layout_constraintStart_toEndOf="@+id/view_split"
diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/values/colors.xml b/OCH/mogo-och-shuttle-passenger/src/m2/res/values/colors.xml
index a0f8207330..3d073b442c 100644
--- a/OCH/mogo-och-shuttle-passenger/src/m2/res/values/colors.xml
+++ b/OCH/mogo-och-shuttle-passenger/src/m2/res/values/colors.xml
@@ -33,4 +33,6 @@
  <color name="shuttle_color_2d3e5f">#2D3E5F</color>
  <color name="shuttle_color_1f860d">#1F860D</color>
  <color name="shuttle_color_b9e7c0">#B9E7C0</color>
+ <color name="shuttle_color_43cefe">#43CEFE</color>
+ <color name="shuttle_color_1466fb">#1466FB</color>
 </resources>
\ No newline at end of file