From 3c01de63eee0f03e4830506acbde3bfdeda89385 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Fri, 1 Aug 2025 14:39:48 +0800
Subject: [PATCH] =?UTF-8?q?[8.2.0]=20[=E7=AE=97=E8=B7=AF]=20[=E5=AF=B9?=
 =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E8=BF=9B=E8=A1=8C=E6=8E=92=E5=BA=8F]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/routingselect/RoutingSelectView.kt     |  72 +++++++++
 .../drawable-nodpi/biz_routing_order_bg.png   | Bin 0 -> 16389 bytes
 .../biz_routing_search_icon.png               | Bin 0 -> 487 bytes
 .../res/routing/layout/biz_taxi_select.xml    | 143 ++++++++++++++++++
 .../main/res/routing/values/strings.xm.xml    |   7 +
 5 files changed, 222 insertions(+)
 create mode 100644 OCH/common/biz/src/main/res/routing/drawable-nodpi/biz_routing_order_bg.png
 create mode 100644 OCH/common/biz/src/main/res/routing/drawable-nodpi/biz_routing_search_icon.png

diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectView.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectView.kt
index 11dec34bee..8abbc106a1 100644
--- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectView.kt
+++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectView.kt
@@ -25,7 +25,18 @@ import com.mogo.och.common.module.wigets.WrapContentLinearLayoutManager
 import com.mogo.och.biz.routing.ui.RoutingSwitchModel
 import com.mogo.och.biz.routing.ui.routingselect.RoutingSelectModel.SwtichRoutingViewCallback
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
+import com.mogo.och.common.module.utils.ResourcesUtils
 import kotlinx.android.synthetic.main.biz_taxi_select.view.aciv_refresh_task
+import kotlinx.android.synthetic.main.biz_taxi_select.view.actv_current_order
+import kotlinx.android.synthetic.main.biz_taxi_select.view.actv_order_by_distance
+import kotlinx.android.synthetic.main.biz_taxi_select.view.actv_order_by_id_asc
+import kotlinx.android.synthetic.main.biz_taxi_select.view.actv_order_by_id_desc
+import kotlinx.android.synthetic.main.biz_taxi_select.view.actv_order_by_num_asc
+import kotlinx.android.synthetic.main.biz_taxi_select.view.actv_order_by_num_desc
+import kotlinx.android.synthetic.main.biz_taxi_select.view.actv_order_by_time_asc
+import kotlinx.android.synthetic.main.biz_taxi_select.view.actv_order_by_time_desc
+import kotlinx.android.synthetic.main.biz_taxi_select.view.cl_select_order
+import kotlinx.android.synthetic.main.biz_taxi_select.view.cl_select_order_contain
 import kotlinx.android.synthetic.main.biz_taxi_select.view.include_empty
 import kotlinx.android.synthetic.main.biz_taxi_select.view.include_error
 import kotlinx.android.synthetic.main.biz_taxi_select.view.switch_routing_rv
@@ -122,6 +133,67 @@ class RoutingSelectView: ConstraintLayout, SwtichRoutingViewCallback {
             }
             animator?.start()
         }
+
+        cl_select_order_contain.onClick {
+            cl_select_order_contain.visibility = View.GONE
+        }
+        cl_select_order.onClick {
+            cl_select_order_contain.visibility = View.VISIBLE
+        }
+
+        actv_order_by_distance.onClick {
+            mRoutingLineList.sortBy { it.distance }
+            mChooseLineListAdapter.notifyDataSetChanged()
+            cl_select_order_contain.visibility = View.GONE
+            actv_current_order.text = ResourcesUtils.getString(R.string.biz_routing_order_default)
+            switch_routing_rv.smoothScrollToPosition(0)
+        }
+        actv_order_by_id_asc.onClick {
+            mRoutingLineList.sortBy { it.lineId }
+            mChooseLineListAdapter.notifyDataSetChanged()
+            cl_select_order_contain.visibility = View.GONE
+            actv_current_order.text = ResourcesUtils.getString(R.string.biz_routing_order_id_asc)
+            switch_routing_rv.smoothScrollToPosition(0)
+        }
+        actv_order_by_id_desc.onClick {
+            mRoutingLineList.sortByDescending { it.lineId }
+            mChooseLineListAdapter.notifyDataSetChanged()
+            cl_select_order_contain.visibility = View.GONE
+            actv_current_order.text = ResourcesUtils.getString(R.string.biz_routing_order_id_desc)
+            switch_routing_rv.smoothScrollToPosition(0)
+        }
+        actv_order_by_num_asc.onClick {
+            mRoutingLineList.sortBy {
+                (it.lineSuccessCount?:0)+(it.lineFailCount?:0)
+            }
+            mChooseLineListAdapter.notifyDataSetChanged()
+            cl_select_order_contain.visibility = View.GONE
+            actv_current_order.text = ResourcesUtils.getString(R.string.biz_routing_order_num_asc)
+            switch_routing_rv.smoothScrollToPosition(0)
+        }
+        actv_order_by_num_desc.onClick {
+            mRoutingLineList.sortByDescending {
+                (it.lineSuccessCount?:0)+(it.lineFailCount?:0)
+            }
+            mChooseLineListAdapter.notifyDataSetChanged()
+            cl_select_order_contain.visibility = View.GONE
+            actv_current_order.text = ResourcesUtils.getString(R.string.biz_routing_order_num_desc)
+            switch_routing_rv.smoothScrollToPosition(0)
+        }
+        actv_order_by_time_asc.onClick {
+            mRoutingLineList.sortBy { it.contrailId }
+            mChooseLineListAdapter.notifyDataSetChanged()
+            cl_select_order_contain.visibility = View.GONE
+            actv_current_order.text = ResourcesUtils.getString(R.string.biz_routing_order_time_asc)
+            switch_routing_rv.smoothScrollToPosition(0)
+        }
+        actv_order_by_time_desc.onClick {
+            mRoutingLineList.sortByDescending { it.contrailId }
+            mChooseLineListAdapter.notifyDataSetChanged()
+            cl_select_order_contain.visibility = View.GONE
+            actv_current_order.text = ResourcesUtils.getString(R.string.biz_routing_order_time_desc)
+            switch_routing_rv.smoothScrollToPosition(0)
+        }
     }
 
     private fun showEmptyView() {
diff --git a/OCH/common/biz/src/main/res/routing/drawable-nodpi/biz_routing_order_bg.png b/OCH/common/biz/src/main/res/routing/drawable-nodpi/biz_routing_order_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a85566ad798f0409fe5b6c63fe23569d563a39d
GIT binary patch
literal 16389
zcmeIZX;_kJ_%^PlWoctmjY}@nG&4G5N@}@`3YL}ASYyjf=1OI5Arew9v1Ls;lc_UP
zNsT3zV@{=#DIlp}o8*eNNP>bzN~J)kfbj6(`=IkX-v99)|M$!Lxep!)Jok3p*L_{*
z&2^r?@A@fX>5^4T%*@P|ZvSD+9y2rZPBSx$3hRZ?C(h2HB<RH)zb9g|SzWKod+5!U
z<o(-IcJ4I$4*K8P%)B7o%+mA-^tTH7Gc#LIVQ#hndNntFR$=i!-<o$;Ecl=QEh<b8
zZsDHYU}lEIZr`%$=Uj97a9qvJm{^C8bss)FpFa3msI=QM<+6{p<7aPHw})*$WIdAa
z2tO}A`oQYkub!;~k*$4?Ev=(hZQNGru;nYa8$Ra0ru}B^TVcC7(AL)W(R#n(gy*sk
znSv=fIFZQsK;kOFY<Vl~mtVL6gN$M&5DKuqS1YlCx&(n+Rzi5#Ni%Z`f|Xd<e1Zl?
zSg*nDrb)Mk$`G?roz)R1+d{uOy4yT=H~-3C3bMXu_7#8h6}Z=};)eCI)kn`*@D{$Q
z2k0O74jT7pv-W4ylEyiS@(}H`c6`O^u#v<s0;8HRt*PUjTN8?^uvdG=w@wUBp1<|k
zZXZkQWlab2!}GJ#LOa?2hB_E-xz08b)~x*OWfPW^j!E|()zpr<d6`>Sx>@FvHnAF+
z8>l}41Bdw6)x@8+6Dr^SV#j^QY5P6}ldgOgzpoMNrQOne97QQXKuuDXHQnCz0hMY9
zZ9v&vAd})f1I7zI;VEsa#$)a<Xi5M#8<_ZaoUox0J{E793C(I?^O37C-a+49wUi?P
zYJ1?JbguG80KEoRwYAY9?oLt{kz1|g$@)qJdQc`*zL)V*i_q<+#tv4!D}Dw;(cs<v
zapN*VLy`<2z!_Y)qqq7@6pW+MM^1r5J|G#}l7UnJI-PgVXe={M^ET16x|HSnZT{i3
zSA~M{k`f^6DhA17z<@U&XgFW|<hYQ?mF?00!hKC|RXigisbI!}uYn{HT@4O7;Bl_2
zXcPDGs9yA9XfNnXYR>Qjx&8_nRUbsf1STUz<hq;*0jpa}@NPt&eS8K%96gAp2ldJV
zMY-`BfpALkKC&kj_V>6zppWFoiqPedBjl{TYrn3boPA8fVUxW8G^Rx(jO~TXJN^bj
zg9J*Y%)6FyiTfwLbs&%?&5&N;lO-ug0iO784@e5uP}_Y15_PfC79Z2nR_wRA#_7dH
zA$!S897>~QuuB1a2$L;l^_O^R%g>9A$1z5^t3zM&ZOJ=oV(Qg#UO&oN2Cca-ewUh{
zS8<F@_R`vDj(7mnd=B|jrd6-Ai<AWB-lE|FVHJafSFw2~6dkz6JT)2^%aU&v-kIqk
zzTeo+c7Zd{c+gNvKB)$vj>t7nE<qz2emrTGPe6_A`Zzs4C=qDTfF6wXXwOae7ToCZ
z)Q$!UtJq|)PEXY>SX6o{`D&Mn!$cJtpFs~CXa~`FA6PUZbwX)hpuYNixyiv-?q5PB
z*Fk<km8JpYIyGKePIlq)HPR+Z*Cjq*QjK@fdiP-R#%_k{KJF|ldDS>Qg!AS_V!G8+
zK?;#aH7u2KRmmGf9Rb+&Flp19jdT78v(#5~@T+NYA7t^8Vz3I=EiXgG7XGc*kzK&1
zEb#EL$?<3LT=KD5U-545Gut80sPZ4v>s+)L;$J=-@?&ueQkh`tle?jqZ9FG93YqV~
zH~Hb$ed@H*DsrzHGfiy|lF(c8&aL30G~<IMqh$Fpz;!3WPpfe*9n-5T0aaUJOKG`)
zpG>(`#8$06GQPkEkaDVUL&3eWA&&pRn{$Mz4?qxA&S4ByejRo)tSW3_*Pf+dtfZth
zNGxcNCBF@YUQ^QA%Q@U*QHY#da@h@9bck$oT_G`oz0whk*HpR!k<uZmJoblnVthST
zK$)oLm1n?|<mvth3Gnfe9e1jhB|afjj|*t&^5+<SaO`Zy0HVLWgrQNP1$Ci9eMzH#
zNM@tvwZ9vR?!|_}(k}0#_Fu`hw*y4VU$BkmG8vkE&RnrjAe^~0K-nk^kPxSy3~*i`
zGMUC6f67!*fH?Q{%V-p6K+{__@xX5+(!cA}_)OEHD|gBt!nG00iV1JD6ShxhKz}V$
zG57^xlGD)foE=}N<IsRo$nXC3cRTjE;2B=eo`?w6;4@LdX9qG}@@KmJ_=b9WBJ4=P
zY?XWvb_52?1alG|yN^1V0*AyZ_AWwz;7QWu)k0o%+;2v)4ZP)J9Gz>_dsfp33-`nJ
zOXKS>>AXG{UP1Zi$)n{Hw9@;I%zABIoo#J%-qUA(dbVv_ZqZdfyDHmfrBuv=Q9@3s
zlDr(b_lvkpt2Ys`&Oib**6O1;3)N5R3vwK->G=2nJ!IA}MRPpm_sD$#Ix=|SAt*4Z
zYH%S4B;xtyLQla@+pv6DpmthXssH@v9K6@CgufNZiv%xsRg5o~tdTray|*ux3_Vnp
z33&mHkD8yt9V9(6MWThJb;vRc`Oc17%}-MfLTV;O!<Ll;xi&pik$bs0qssL(oR{Rx
z?_^ID;E)bexY6-q&?Q2I%0nSpw`gma=~EAHs*I46yQCsTxi4ZI%N2!;tIfuV20mF=
z<Q%|haP4C;OCqET9iRwf{bEUDfG3?%LOY=wrBd#Ze%I`+{oA&}w!vdP;FJ>7>p#{&
z`L`$aZK%pX_SWM@hdSQL?+>&GQSSDv4sOC7e3Xkt7L$t`xC1GH?RvGAI}5_ll9N*j
z^3|M_*Bf_2r{-i^hy{0u^X)qxVphkWjrII?0sM9s`E1<T{k=*wkD+qX)zlXWdf4xH
zUr3Fsc%bkI@=?a|N1YFIQUBBT4~Y~dK?0~tLMET)un1B<Y<^Fa*2EjFj|}~q<Uthn
z>(svFG_`ahLZnT?_ImZmP9X5LOY7qc$?-l4I&O&WrSa>tcZmLmN6_OmmBZRU&GY05
z@)K`<cQ<Ym&ANKhQ~!nnxTV58UvsIAmL{2*s`T0*rT=sIfa?+tVl~hj3FfBs%BHBo
zzH_=3J-NF`I>dUFa@WhdZihy@POY^%T$B7m;%wU@#7B(W`51@(8qqKrdlSkoVI$(@
zO@o}h8WdU6Km&FAvMu*46zvi5w^9sG0e}?bAm@}YiE*pj#Zbq+wM<f9ZRQ92b`Xkj
z9NKk9ysF-rg?*v>OY_LgxX+nVLtuKF_HW4DLcX+*hZVQz=qRG<37--5?WtRK&GlUP
zYP=V%U*e3{{W-PfGJa4gg6vE1Pq4!ZkKg-t!Fud_p3|>Ef)c-VIT#@2nleLDGo=;g
z+-tY9HpRM=Z6uFAa>;BMA$;0PPM;wus;G(jR?WA?x<6>gX%2&YMtx7}W1<8WPDgd6
zp2tfAwZr}80Um(EZ;(IGFlP^+$2P(lWGt{}T)UwyDN$Q|V<%*YlWhhI6@k=@&=lvi
zNUv*peL4N^^zPr%N?J=5F@G1zil?Nx&(YYWHLBOp;@_3Pnk$GOZdI43p)$eXrE+-2
z?aptYl`m_;S_+;2p=Shr6l<cl8?nH3E0qG<eXdGX%10_hS+(-GGOqlJY;mXYK|cz3
zb>?le1XO54bZ;-rR>*<9tk!$xCKHCNw~!Y-qcU?!QDRQNj4I^SDpv4!bof(!<FZ-?
z#z=#8@-AI1kTn|~cj_MH-77w>QPoemr4|yzQ{`|pie}9BpZ!zw`b!81<}ZpH8Po{O
zXAcA0XsGYO!Ftl!Uw0G}s-UzO3P@>tHByxm*rb#-WTN@b7j+|Pypn|d%s+@xfFP87
zx0XB0jNSkl3F;_jwbAJ@JstbqY&4KdGXK&q`QZDE+jbAGcE_JnJv#xRl0z-;zh8L~
z4Cj&0<LfBydEonM8u>=+6Jr4eTw8Yg?(ZgVcKa&dT@>6^(lXiUiIf<-eT}gZH23#^
z=$1=4wDCBRbx#!lusIYSp1<Ovt}Sh<(yr54?wn)HjGIdRE9Yq0+-&ydr;40!=TKCI
zD8s0KZ_ddpaNv(D?8JM(N1QcV8mg*kK%;hP?3@7~H)Qs~LF1CAS_ZNaEKH?Wgq!fO
zrM=}(+y}CvGu-e0Y6d1c*crS(x^<k;#%c;#qNLSp%kuPP_h9l@{G1CaIK@z<!L(68
zX7qZ~@a7ht7G8dw8{n1ER3X0r1T!PYb_6hlp)1eglDM+VsmjD-UBR8k>-{MGZxm1(
zE{B&IK@G(kC}$IPb4^}nmcKIXpzfurWHXKIp79e*q&euQ9SamOWNIf?le>7ScS2-9
zO4yjuMJd!o9R}t0e;M;fU-UyD<z(A8`A>^e%k#$QjXi&EPeoOQ$a!V-t9<{gY6(>e
zVH|IoP@EB$lT#!mBY;%7u$i0tL*gKRQHfk_NB(%4!oe8t<ee@xnZep+ZQsL5P_7)F
z%>>wYX-<l9$>$nys1!fgPL!Zl$y&>VKS)%a2hQszQp*VZhxbSw>IC@;gE79(G#9h{
zDeFf14kN?9RGFq73+9n9W4kzo-Tq^huxQ15(S=JFP)Ufo44yI52gY=EnMr<srj8Lc
z0f2<R7QI~uT`Eqt+2>bFbiFz4lD{3p;qAK5V=jV20ZewP4@(FJN$wZWb7zEK*u^$y
z!zVe~R=6>=L%Cmc*aU9prq8LD#R+NA<fh>Z2QOc@mj?zE1Fiif=yb*5Q4I<|D{sIw
z!aeX)GhgcN<_73O+1n%MJivQ%1sJ|cRp;B_{%F1Ma@;BzQKA7oJlk<wgUJ*217xSu
zzOY6nax4elN50z@z=X5OJ)EKeDEUH@4zlFj2D|pc(zVHf+Z2bxG;65igBtW;36)P~
z`mmJeNU6~whRdE<&VbmBqV)+7&X3Am(un<_!(*_AdmaA>N?gLLV&}HUWMAWui=zsF
zvfOviF4=WBJk4gYz`?iC%$y6T=3|vXrU0}0sJR8D1x(_r=uyeWEzS17`fwZVlc%-3
zKsp(r$0ZYdzXy+dd0<5^mS)>!BJ*YN9Q=J#!?2NuRzka-vwrgHPHCiNDeF_p2*v3E
z0@0%6mNpKWB{u${zQTMj(qJ05&6!5AuLAsB5+G^9NmZJw2s5B<LZ(#%d$MD)_1$Fh
zgp4yB_mc5MwKWG2ayRO{$UhJNkg~(n)WK_6%yVPnXf#t+oOdj(1-=9D<;fn$b`NK(
zl^)o*{f=)JaFY-AtTb)jvZkZ?n&Qc*#)1^%I>w(#PUi==xw2VGSv<2o`{VcDc)*TO
z?&^Ogcp8cp(T*&bZ(^3O3H3n<9{L&|6xp&e{8mr>atKiu4-;K@i8tKe=#gX9c-8P+
z-kgBFDm^~5d2T($_P=$fBX7wn<?W0SXBpmw&UgWneKyc&e^FPFkpq9lNp!*H&*kv2
zkxoltR6bBy4KKaY$S4x&TS-08HGx}>clWI3rtBI!#AIQ<C-sGU4O)$QB+adw`dy#+
zAJSGrzHMV}?F2R*PhsXo6<4~_U#$?-^;Cph5l*3jd*jb*UzI2Z56#6v>-eUyu5vrN
zAt?E*_`3fQ;Tdt>InnZq%>^v3{p2rlE9L|;%2lyuF5I9k1fnvAUAcG42xcj7$bkic
zsjI=H>8ysJ86h<RdEa2&Fu&1RR>I&;EhGB3lZAJ%e$!cs!#ojT4j?7yKN~P^ojOxl
zM1gg0oij^ad<D4iPh^(<2FbhV_<7ySk|eCS40Pmf?B>OGUrUG+?^d`Cakd$fQ*++W
zM=j5lX-+FqCweLhv*k&(w^iaH>QoS?Qhs`}FJ)8SBHH4)ZT&JI9z?ok`;<ZLQP&rN
z1zB~Ju|YAy16ayZi(oepFTW9!ME}gCyJbyZntUJu3IRgy8^^Oj3hiO!X}IXJ5@0Kf
z{ZC~{+J}XeC5Tm&-#(Z!nz==?g?y3S<1%J<O$PPD?+jI?go+MgX=BR7yO(q}zA#0l
zuuE-8C83(>_vqBS$s<Mb*x&OcLj4=V&58_co}?j{wSE3TZMBdGqi7lMO9!d)XLnMM
zYS3)xmW{zuydd1b9x#43+N?o5`EuUz4(DrbdY#H@@uinq9F@c(+?8FeL6m{wP3$Hg
z<1+QcXRdRd?pobvyu!2XL=5SF%z{!Hz%GxWN^yM5RMIX@8DB4V9ra6H@ZYm*|JdY2
zC&yhrK6=<XdvCKsXv9ferQw^d*cB@`WSMY}S-x++=4Fq2ajwd?J7a2~o8c1Cydj54
z_VCDYZe}&727H*`nL8`fVjzEZI!jofY++<B>C}A8xvI4qikRDK?;l2>lWhBh_|~yl
zdO}f{JtU&nY67fA%di}$C#G8#WVI_{0Qm~<tb@dXC`)ioJS5`62RZAAJ9mjUrJgc{
z+q(S+Y&*l@l7eK3QW;l<6kSky*kOp%|DUys8?U(+ekm#S%}mcU)MOKUJ$O$XwRU-j
z(@*~w#eT7nN76y=^`X?CFD{ef6qldvQw}>^1Z}K46T@k9!^Bs#R>pVU@L3(b0DFC8
zCxNvvnfAtpo_x;qt#$nUwt;oRl_%rw46nTC^#mr?hXM0JIoY~#o$zAJqD0``vf=3)
z^6`gd8dr~A-?<G8WVNN+Z|!q+&6bh-v!w%OEzfQ!##Us(P2Uc&ERyVtq{bBz)_^kj
zm1Nb$IISyjlk<GPK~}{}xk*}h>DOisF+1jR@UIpQ%ZWU4;;G5~KENEJ&R@RlqTLG|
zaCq+Be)COvHJ8D;xJ_U3mYUfxJe_CVxpRmA9GX4--D(fmiwoL3)6Z(g<$)g(-uTe&
zSA=ZqGTphBU5**q^Kj3uUgFy$YfV0oWxgqfY`J94AFfzgj&@g9`kS8fa9DP6G@`<6
zzD*d^;QLPvK3VCLYs{UYPv_xN)c6!CKjnu{N%0eO_=J}}fy7Tx+H{xrbbt7CY5IhW
zKOy5!$oLa7{)CJ_A>&WT_!BbzgpB{6kg?73-0@T8cu|t&D8^;s+;9CQOX7e0;p~};
zmWbKHUH)_BilUPhEvr)LbEQbNg|5y|wDXI_|G$+0Q)$0;Q{D^Fi=Fh074ub#pDMm8
zv>e4191bwOf3eub`65q&GIU#xepxtI#=5-gfGr0%L~X&=N^<UUzxALeG;78lxDP^0
zf|_{m9@$X%r5SvkCF^4Iw;qxc<Fx_IkZw2AZ^WyQ##ne2dcWBz>R$tWCvqo^-$UT|
z5cdyi>1@SJ>F+<-q*SvOj*bIvhl=K_FU&AP1pDGvDfLjv;*OmJtyS{u$*MQrqQ_IF
z!pF%rsEXv*X>?7d?XGukmktfKI)8sho3g7eGmtccc20b3KR<H11yl*kyO-t_W;dEh
zbZZWEx(FcZ_le@@6QTqE4VB+^CxWvLc9z7YbPElG<zAa~eGqfdYSih<XC`a>Y~2WN
zg$i)+x4q5TylN)2gar67u6nKtx%w!>LUq&2;;!8T4(#RmaUZInDL|%WmYtgHfjEOW
z<=%Dk42DSiw3zA1&d9@o<(}5j<$3-j509y>+}!Mfxj~kBEK8HX8|*JezMOu2CB`1m
zlf|qJRJ5JzlFs3F&GFX`y^6m1I_*XaFgif+&})o3P&(#MvQOIO%?XQC$^1im<~TyD
zk8ZaZhAl{Wms~~<EXE^5@g@GqEH6>;7_TB;IJ1us@vX<+ZF59{uOZf5+-$Kg`ssnf
z>=uYSEpCBp#|$ye_7_u~Z#+K-7%(g5JT7eHoRv6NT4ddccs20d{w1wmS}z24?=Fr;
zh^8g9h`yS0BdE$+x>X1IlHMhIXymb5=jx$E%TbPV4*FD9fA8E=@z=w;ZX`)|*PTi2
zO;r={N1q3G!kKqM<u<x4CT=rSu>UcC=H|0FR%Q`$eB%Oa2KC3T_1*rOX|RfrjVJAL
zyZ`#aov8Z%94~q#Ckh6OVZiBGqztKsq`ihP)&z+}i$(`O^bKM%)4e?wIfl=5yDGnQ
z6D^Z|@%0ySAuo25w3Q8);fWChY4H`7O-B{Fc7>f@e)T`b2~_EnsPv1f>C^|M7}U1z
zTGC^VvD{RMR%jm!nY8W|&LT;bp(pLXg8pqQAuXz1!g;!ET=Y&Bf!e3&VB@Y%EfV#h
zPPFDtjkyb-i$i9%{8#IHvZQ5@Q@w#Ry()TP;#p~I839jn(ei(1yhKOtQe+k@i5S#c
zW6w+X7*n0e+=9Bg@1Bem#g%RhSHAMU-FYD7{zKbNVi;3;I(tgqMTfy0&d(o=<Ry(2
zhL;+{)9c;;LL`C8#wtLsd#8=&Qq+78o<qr^##qVni=kB}#=EJ=IS%ngovY!#DbKIt
zh6a@H(M7r@z4~f!Oc1zHvRmxWUjJ%%h@;mdMa`XYHsd$vYn5kgwv4rWd}zZRbPHJ+
zdsg_&&}4tS2*~mlwh9I+hC;tGUcCqUxg(pkzuV8x%W82WL^&uV7>T~z2OGlICvF6i
z2#RyXi#v(^wC}Zd*niF)e3vzSn<pKFnr>Q^|3hC{1C0I$o`jU$D`K1$?Ag`6;7#YE
z<mR#r%FegdLfS9INGz5$=3v_0)kk+*{JD{joF&c{g<Od!5ZZQEkw|&c6E#nUFwwA!
zIqSsCsp&BX6w$|c<-+XuHBR&A(&mda$_uST6x<mt3<ttQ4yQm4M<TcsL&b0hwEO{}
zVj`eModX}@q!^R~{+He7_QPS#$7hjna0j8+J117O=<qa9GKAmJ%zn(MIPXx1CiV}%
zO+^BOvjWbF_tfkK|FN+O9cH!w#(sVyPZRW_U^Eb7*8Bny&A$V5?|7Hw9q*<EjEWY_
z-hihCEic8(XQwg~sq@kBa+@c;Ws)X(^d)}sTGBM2+Or<g1CVydO-nm9hmVa2d^}h~
zErfo_EGU^B)YMJRy5w?_=gm^nMkl_uLCw@=?}ZVQ4s5d@J;7`y9+@JE&a#S<<bB6Q
z<vt$NOa*E^P_L}jJYR0?c(!zGew*{GgaJiHUN&}Y=fcBhUq1`fXvRT^_H+k}4;5W-
z_2epSI*IR|)k1s{<Q;>KIfE+ozidkL<`%pqjojsv5@FOEoje=0@X*_xuv3G49l53J
zCKDp*LPRfTd}MSDJQ0A{4r@^VQ1-XnF}&7%{c6T@t@r%Q11th)1O<Ecg<D?%%0&7G
z1MhvyOPXa49RUsv@fol642TKXGsyR+t&|S)V8+)lgurMwQh?tyPlM`R+b7Ni%QQPf
z;0%J_N-g6`xKlAiIfJYgN+R6LnnZU)c7G-D^0peyJjjRZPO(R8qbU04s$qy6zan;i
z8t20ZkJN?oqG$u-(bLNiB^D>)heF)dSA6!mWEYu1obBZyJt*DC2`h$JrO15BN@QkQ
zOULE8t(#c!+e8}0TelX&cO?6eE6ZSlwUk5Nq6t|pHL7~NpYJKdU&V0UWo{>CYI0I#
zu>qIBv<6yNGY(k1B!EVo?2w5d+Sy+3wE1JSCSS8{90eWmA}0Lw#}Ld}6jOE2i5Ntc
za{htnmf*XJ?lQmiKwrxMr%D@5JMrOGPUBs}-$Vb-r(3jzJmQA2K=ZYLmN`xe^lmMj
z5CCM@DKuyt#YZ7oEUwZuc_=q-Svlest*e06!+-@%b7^G#`x53Ec-PkX0PSccq{dUm
z{AjuzhKY{|M}eLcxD9E6P4_;%Uf86^^<JxK0gL^#qXvvT@073GvIm!8LB-iQjGT+e
zsdtqn<Z$N}<*^^<Ig%&xQ5fY{v*`ftUplM9`mS{=;w#>=Zk(b><#;L*4?L_7ee?0S
zhlg}=s?xsM_$;0yWC#)o@_ja)vp8vc5mNLGt<!3LVrdqXKJu1fJ4Q_|TkU7YW7_p_
zkcuvq<KID_edIt&3B8#daKAH5mo4qg-2x>(Se|_aoNJi$^jbHYYST3{=63MPX4Afh
zyn?#o;AD&9wuML>ec$ReE!Q3S?;tS)$yx*URNws?+VfQNz-c_jXM^)&8xu*pgmu?&
zpV?167~Ta@pYj()k3@@tJ7A8ReII&0^bsL8R8l+wr5sy`=hoyUuY(jEk>J(l+R!K{
zuK5Nww92m!kHiAs+NkJzXJ<^*qSpiD7}m`>U$*-#j417uA+&7D5NBxBm1Pe$E_@S+
zSoudilJ=a{4?_xH41R%*NQgV_>n1FC^GeAhnK$cZ{JJ#5cag)!4^O3XXA<YWq$0|6
zIJK-Wz;pF1hm<p3(uf^mzeGIuSytkzU32;1AYTpsnqb3Y=vuG>h}tY2^KnTE=^bX$
z&y4aJupd9N{dG&d)|ceTbBha2F0NRUKl6JqD|1+%Do6dT|9xNf!b89A)%d+L31}$T
z>8Z7}3(}usSILB9npbyMonFryY`3ASbI|gF<%U?mcOojp@bM8WeFg0N_Bnd~5X!>q
zD<pYptOs_&sFP7@NhzQ2cS?bX+mMqd#E#4E!7#+fi~(c}i69XM%9LrquI40M@(ph4
zEf^j^ypeT5tb9A-$N~u&)T_CJVYHY$ujg|)0=sx91NoN%#o(@Wn%%VxmPXn&Mnno0
zC2Odf(fCFHvDs^23K~LxM6_u5!_9*STOh3sQb>Y1l?uc!>)gw8-w;GbEG&`t$A4?r
z+>}97<EIo6=Z^ZxzU;I6VP}0<8+s2+2uk%Js54agzc_@Tb6_T}xEIqYqp*<h4G+-c
z79Jid2O0hgrt}cUUrfhRF1>9Qg>nYn-_B`yax4-34^<H&h;=t!`_{I}_AdD<2#JLz
zde~LEcz$XfV@)X<5=6Cw8;b$P6Ef^*p|fU3u~s9sZEp&N6j*1IYfzL~Kr&mekx?Zt
zjr_-U`y{8aCR*SMYs2InI!B*Gn>EO!{55_fH)<v#JiJWu6<1k%>f_w^YZC)x5V!U`
zfOgTM?||0T&Fppnz)j<?f*I0{z{zgifAWevV3U<(kQ1zl6Y(l@_WnaKg{hH4mcp{j
z0wFJok@E*~ko>T>TDaGb=sWV}%stwJOVW%a1W+I(ZWFKID`hue(Y@Esi|f!B6I!yp
zciK7He;p(pNj7VjL)wwTqvt)teP!7IjABq#)AGiyU^6AtQ#<8SXQBCU;GiPf6s4P%
z<ZDt!_W{j+aQlpIZ~06(o!mld_{ng7!1ksW=IlX5kLp$XiQZ%+;tAP%Oxl@R^uHA(
zu!F}~0+T2vVdNU;2S}#0N3<xVhE^1ph8WyDmE^Tv%J<<iUBwYU3F4%4gm>sl*3kN`
z?l57%T_`zixTIP7JuU6EBXYNUUDe4>Hc9T74e{N1e(kE6p_;X#{ro#hWmy;FG{&-j
zYkVaCJ><fs^g)ux>@OE{omt!x-Oo0?aO?x!b^E_j!U4n!1jOu99;ux>VV_wyh7s#9
zx@!aE+a%)sR=lBA^YzQ9at``@vtO=n4WuQ)L<XN72}DevCxWl2;B!SxZIGJ)(Di_}
zwLJk7gH6*lWN)C~qzO}WW!rX<5uN976M6qyy}KZnhRRX!JSHirFIe=N+i>Q+UoGjr
z7q?PP%aE_Y81|#3ybtq&DNYTcl3~Zfam0!%7_lkD#aL#)enzIB%OR`$c4Pk!$&_aF
z+030)a7Ia4Ev2DHl5ucmGw{t-cq0tH3RVvfuRiVoQSe{156yhe?=YKyL}EjJkjhZe
zLvF;41_I3;&rM`-?c14n%&%Qr6C?T1!RO9B&PYC>25}Myjg(9UvFLIE<U%131D(ap
zF3E$uA-<}O(*`9a93&pBFNLXsl4o~0uW^c=7zZM?qns)xt&p6kx@yDrmImmmQZ;x;
zNS9Pc<Kral?ru^<7@+3R2zZm;4jEt)CkjxiRVGN%{nb&Ab?s_$%L_i6Q)GM=C<7S8
zMNZqm6B3vptL23T52bUIA1~)+;s90=$#<1OAGXIMX;My6RLlQOvse1?pZ`O#XCozZ
zU=hf=c%;)c!~G2cI&7HREt#Q~hxU%<qD1tql=PMj4vtbIgMGQgljf(%DSULIHyt{8
zN8wA>S^bC<Xr)tKxJD9Epl9QvitXebsd99ZR~>Pn<K0_<2`0pYU54P_V~)ZQ()ePQ
zJq!RoIzu9)S0#d{vF%J0q-ZGiR0cWeE}4=Ar|p^Y0XVb=DJvC{Gf`ZW%@apBBu8z`
z8|9dIq5`_)m)YCoDb$H;xH?z_1v<!Jc{o1*h4MWV>7=peS&6z6aas{X63uV^A`pAv
zyjE?J6Ux!l0Zq>nncFzqo!3A1k}ikNh)p_uGGK}!SS5o*pQ^=LJOmnDU`Ozjc|~JU
zG-n_X3-O`z2Q5oCr_|tvo|izvo1rq0gsB@fx|Cq*v=|8AwYpcbC<$d00?%stJ8~t8
z(1SxjiKn^@WN2ClCpw9m>ufTqmOEX;XdN?IF2F*zw5STu^r+E;D717cCaz0Y75ctU
z*}*1LkU8n#ZOKzXVoo}T)<tHTUjXan0zFw#$Zq<qC@Omxx=AujVJO;)xv;+p4vi$^
zLSB*qkRtJ|NnB1cM}of&`h4X*{o2`$`M<@z7hjYB<kDv7qCc29c!6N*<MQ?cUMKad
zsG4c$;-l!oF~Ok$@<ibsN_$6l2OSNWHu61x(%Bg68aD=nl8|kBRV=qauAQEeHneX{
zg8X!-&;odvim9cc#tWVZW08_F*I<c+a0?_oIC=}-GWn6DuBlZ|k&uapT;M%k@))55
z-sImye2ch8N75yM0%%f7mOqT3sa5lvrj4;b#OrNfx%s5yt_{q_oOJK5K~^c@#_)YQ
zH^RiF^|Q`cT0sIz2in=VA&NqlFiyiIgM`-shVYGwI8<!h-;p0lXm$jIWbzkn8hN!o
zIGciPQi{o_?X$1{iVl?&W-hMxB4}FmFA5m+qiB;Q!}7zq4sNj}d%TbEt;n%5!i(XB
zUAjc|A%!p&7$A{;k+G|}DAVZL+ij&Mosq0sZN_i_f_sdJw0c-i>#7GL?K%q~=Ia5A
z{G`*0SKtcbxt!9EtABm6l~n8i-EgBG*h28-h^6;;PrW|`ZCtV_@g>&CIjwG^d|3*4
j#NGFNXJy>YSv#}MyZ^b>FmlTz!Qa01r!94x51jg6y0x9#

literal 0
HcmV?d00001

diff --git a/OCH/common/biz/src/main/res/routing/drawable-nodpi/biz_routing_search_icon.png b/OCH/common/biz/src/main/res/routing/drawable-nodpi/biz_routing_search_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..2df184c80a86bdb958fbee22447482de078f3cf9
GIT binary patch
literal 487
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1>!3HF|Hk`EvQjEnx?oJHr&dIz4a$Hg)JkxxA
z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvPE3tqX&K3qKoch#d4^Ua4r;B5V
zh2YvLhJMV30<PCJH8ftV3{ozX=5jg6xx;ly48u}yajvFAwocxy854q@vQ6v|(fz+R
zZA$4I--r*>*L>`G{y*}(3g6U#>tCDC^j>4FW6W9dQOc=;M`-_~&mj&b>V@_vT)B_!
zW8ZbGon<<!YiyS0+w~30&0<gO$(Z|CoWXcUXk+PRB{MD`E{@$tj+m_e#v^7``@N?=
z!sJ5Mg)Jv!w`Q&QyZPG8<5joTetQ4qtM>D)`2jZ%Ug7_ruspZ$M<Ao{oRf98_VqV1
zn>z(L#BT^b=E40t+C=8D+ngl~%e~Ij`5x(+JG1bSMwI6fCMk>Nv<E!@BqTJNQx9-%
zGFLdwv1OHC#BYZ5#d?L8thfs_lD^DVD{E+dD%0{kFTLBwb?u{{4<sL2W;WN`pJzPp
zq~3RrVH#(TG1ueZM+JUj3Z72+M#bOSb{@T>pL}&)c9{HD`QK4~(_f39y8sGgPgg&e
IbxsLQ06p-vcmMzZ

literal 0
HcmV?d00001

diff --git a/OCH/common/biz/src/main/res/routing/layout/biz_taxi_select.xml b/OCH/common/biz/src/main/res/routing/layout/biz_taxi_select.xml
index fd2ce8f974..29a172b06c 100644
--- a/OCH/common/biz/src/main/res/routing/layout/biz_taxi_select.xml
+++ b/OCH/common/biz/src/main/res/routing/layout/biz_taxi_select.xml
@@ -30,6 +30,35 @@
         android:layout_width="@dimen/dp_60"
         android:layout_height="@dimen/dp_50"/>
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_select_order"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/aciv_search_order"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginTop="@dimen/dp_48"
+            android:layout_marginEnd="@dimen/dp_63"
+            android:src="@drawable/biz_routing_search_icon"
+            android:layout_width="@dimen/dp_24"
+            android:layout_height="@dimen/dp_19"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/actv_current_order"
+            app:layout_constraintTop_toTopOf="@+id/aciv_search_order"
+            app:layout_constraintBottom_toBottomOf="@+id/aciv_search_order"
+            app:layout_constraintEnd_toStartOf="@+id/aciv_search_order"
+            android:text="@string/biz_routing_order_default"
+            android:textSize="@dimen/dp_38"
+            android:textColor="@color/common_ffffffff"
+            android:layout_marginEnd="@dimen/dp_20"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/switch_routing_rv"
         android:layout_width="match_parent"
@@ -48,6 +77,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:visibility="gone"
+        tools:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -59,7 +89,120 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:visibility="gone"
+        tools:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_select_order_contain"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/aciv_select_order_info"
+            android:src="@drawable/biz_routing_order_bg"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginTop="-19dp"
+            android:layout_marginEnd="-29dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_width="@dimen/dp_458"
+            android:layout_height="@dimen/dp_672"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/actv_order_by_distance"
+            android:layout_marginTop="@dimen/dp_19"
+            app:layout_constraintTop_toTopOf="@+id/aciv_select_order_info"
+            app:layout_constraintBottom_toTopOf="@+id/actv_order_by_id_asc"
+            app:layout_constraintEnd_toEndOf="@+id/aciv_select_order_info"
+            android:layout_marginEnd="@dimen/dp_109"
+            android:textColor="@color/common_ffffffff"
+            android:textSize="@dimen/dp_38"
+            android:text="@string/biz_routing_order_default"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/aciv_search_order_icon"
+            app:layout_constraintTop_toTopOf="@+id/actv_order_by_distance"
+            app:layout_constraintBottom_toBottomOf="@+id/actv_order_by_distance"
+            app:layout_constraintStart_toEndOf="@+id/actv_order_by_distance"
+            android:layout_marginStart="@dimen/dp_20"
+            android:rotation="180"
+            android:src="@drawable/biz_routing_search_icon"
+            android:layout_width="@dimen/dp_24"
+            android:layout_height="@dimen/dp_19"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/actv_order_by_id_asc"
+            app:layout_constraintBottom_toTopOf="@+id/actv_order_by_id_desc"
+            app:layout_constraintTop_toBottomOf="@+id/actv_order_by_distance"
+            app:layout_constraintEnd_toEndOf="@+id/actv_order_by_distance"
+            android:textColor="@color/common_ffffffff"
+            android:textSize="@dimen/dp_38"
+            android:text="@string/biz_routing_order_id_asc"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/actv_order_by_id_desc"
+            app:layout_constraintTop_toBottomOf="@+id/actv_order_by_id_asc"
+            app:layout_constraintBottom_toTopOf="@+id/actv_order_by_num_asc"
+            app:layout_constraintEnd_toEndOf="@+id/actv_order_by_distance"
+            android:textColor="@color/common_ffffffff"
+            android:textSize="@dimen/dp_38"
+            android:text="@string/biz_routing_order_id_desc"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/actv_order_by_num_asc"
+            app:layout_constraintTop_toBottomOf="@+id/actv_order_by_id_desc"
+            app:layout_constraintBottom_toTopOf="@+id/actv_order_by_num_desc"
+            app:layout_constraintEnd_toEndOf="@+id/actv_order_by_distance"
+            android:textColor="@color/common_ffffffff"
+            android:textSize="@dimen/dp_38"
+            android:text="@string/biz_routing_order_num_asc"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/actv_order_by_num_desc"
+            app:layout_constraintTop_toBottomOf="@+id/actv_order_by_num_asc"
+            app:layout_constraintBottom_toTopOf="@+id/actv_order_by_time_asc"
+            app:layout_constraintEnd_toEndOf="@+id/actv_order_by_distance"
+            android:textColor="@color/common_ffffffff"
+            android:textSize="@dimen/dp_38"
+            android:text="@string/biz_routing_order_num_desc"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/actv_order_by_time_asc"
+            app:layout_constraintTop_toBottomOf="@+id/actv_order_by_num_desc"
+            app:layout_constraintBottom_toTopOf="@+id/actv_order_by_time_desc"
+            app:layout_constraintEnd_toEndOf="@+id/actv_order_by_distance"
+            android:textColor="@color/common_ffffffff"
+            android:textSize="@dimen/dp_38"
+            android:text="@string/biz_routing_order_time_asc"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/actv_order_by_time_desc"
+            app:layout_constraintTop_toBottomOf="@+id/actv_order_by_time_asc"
+            app:layout_constraintBottom_toBottomOf="@+id/aciv_select_order_info"
+            app:layout_constraintEnd_toEndOf="@+id/actv_order_by_distance"
+            android:textColor="@color/common_ffffffff"
+            android:textSize="@dimen/dp_38"
+            android:layout_marginBottom="@dimen/dp_19"
+            android:text="@string/biz_routing_order_time_desc"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+
+
 </merge>
\ No newline at end of file
diff --git a/OCH/common/biz/src/main/res/routing/values/strings.xm.xml b/OCH/common/biz/src/main/res/routing/values/strings.xm.xml
index 7dcbd3e41e..6509906cda 100644
--- a/OCH/common/biz/src/main/res/routing/values/strings.xm.xml
+++ b/OCH/common/biz/src/main/res/routing/values/strings.xm.xml
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="biz_bus_dialog_tips">您确认要结束任务吗？</string>
+    <string name="biz_routing_order_default">距离最近</string>
+    <string name="biz_routing_order_id_asc">线路ID升序</string>
+    <string name="biz_routing_order_id_desc">线路ID降序</string>
+    <string name="biz_routing_order_num_asc">验证次数升序</string>
+    <string name="biz_routing_order_num_desc">验证次数降序</string>
+    <string name="biz_routing_order_time_asc">灰度时间升序</string>
+    <string name="biz_routing_order_time_desc">灰度时间降序</string>
 </resources>
\ No newline at end of file