From d415eea5f3d371c9e1689b7df193aa4a32640397 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 9 Oct 2024 15:36:42 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.0]=20[fea]=20[=E5=BD=93=E5=89=8D=E8=A1=8C?= =?UTF-8?q?=E7=A8=8B=E5=92=8C=E5=BE=85=E6=9C=8D=E5=8A=A1=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wigets/map/orderstatus/OrderStatusView.kt | 24 ++- .../map/orderstatus/OrderStatusViewModel.kt | 7 +- .../drawable-nodpi/common_order_status.png | Bin 0 -> 2248 bytes .../drawable-nodpi/common_order_status_bg.png | Bin 0 -> 394 bytes .../drawable-nodpi/common_unorder_status.png | Bin 0 -> 925 bytes .../res/layout/common_order_status_view.xml | 24 +++ .../taxi/TaxiUnmannedDriverProvider.kt | 13 ++ .../taxi/ui/bizswitch/SwitchBizView.kt | 37 +++- .../taxi/ui/bizswitch/SwtichBizeModel.kt | 5 + .../taxi/ui/bizswitch/TaxiSelectViewGroup.kt | 52 ++++++ .../itinerarycurrent/ItineraryCurrentModel.kt | 29 ++++ .../itinerarycurrent/ItineraryCurrentView.kt | 53 ++++++ .../ui/itinerarynext/ItineraryNextModel.kt | 29 ++++ .../ui/itinerarynext/ItineraryNextView.kt | 52 ++++++ .../unmanned/taxi/wigets/TaxiSelectView.kt | 4 + .../res/drawable-nodpi/taxi_new_message.png | Bin 0 -> 665 bytes .../res/drawable-nodpi/taxi_task_close.png | Bin 0 -> 650 bytes .../taxi_task_current_end_station_point.png | Bin 0 -> 1227 bytes .../taxi_task_current_start_station_point.png | Bin 0 -> 1194 bytes .../taxi_task_end_station_point.png | Bin 0 -> 762 bytes .../res/drawable-nodpi/taxi_task_exercise.png | Bin 0 -> 2625 bytes .../main/res/drawable-nodpi/taxi_task_nav.png | Bin 0 -> 1641 bytes .../res/drawable-nodpi/taxi_task_order.png | Bin 0 -> 2261 bytes .../taxi_task_start_station_point.png | Bin 0 -> 610 bytes .../drawable/shape_itinerary_bg_default.xml | 6 + .../shape_itinerary_bg_order_count.xml | 7 + .../src/main/res/layout/taxi_select_view.xml | 13 +- .../res/layout/taxi_select_view_group.xml | 28 +++ .../res/layout/unmanned_itinerary_current.xml | 164 ++++++++++++++++++ .../res/layout/unmanned_itinerary_next.xml | 126 ++++++++++++++ .../main/res/layout/unmanned_switch_biz.xml | 47 +++-- .../src/main/res/values/colors.xml | 2 + 32 files changed, 703 insertions(+), 19 deletions(-) create mode 100755 OCH/common/common/src/main/res/drawable-nodpi/common_order_status.png create mode 100755 OCH/common/common/src/main/res/drawable-nodpi/common_order_status_bg.png create mode 100755 OCH/common/common/src/main/res/drawable-nodpi/common_unorder_status.png create mode 100644 OCH/common/common/src/main/res/layout/common_order_status_view.xml create mode 100644 OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/bizswitch/TaxiSelectViewGroup.kt create mode 100644 OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarycurrent/ItineraryCurrentModel.kt create mode 100644 OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarycurrent/ItineraryCurrentView.kt create mode 100644 OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarynext/ItineraryNextModel.kt create mode 100644 OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarynext/ItineraryNextView.kt create mode 100755 OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_new_message.png create mode 100755 OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_close.png create mode 100755 OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_current_end_station_point.png create mode 100755 OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_current_start_station_point.png create mode 100755 OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_end_station_point.png create mode 100755 OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_exercise.png create mode 100755 OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_nav.png create mode 100755 OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_order.png create mode 100755 OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_start_station_point.png create mode 100644 OCH/taxi/unmanned-driver/src/main/res/drawable/shape_itinerary_bg_default.xml create mode 100644 OCH/taxi/unmanned-driver/src/main/res/drawable/shape_itinerary_bg_order_count.xml create mode 100644 OCH/taxi/unmanned-driver/src/main/res/layout/taxi_select_view_group.xml create mode 100644 OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_itinerary_current.xml create mode 100644 OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_itinerary_next.xml diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/orderstatus/OrderStatusView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/orderstatus/OrderStatusView.kt index 22a28ddd8c..a7e1eb3083 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/orderstatus/OrderStatusView.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/orderstatus/OrderStatusView.kt @@ -2,15 +2,19 @@ package com.mogo.och.common.module.wigets.map.orderstatus import android.content.Context import android.util.AttributeSet +import android.view.LayoutInflater +import android.widget.RelativeLayout import androidx.appcompat.widget.AppCompatImageView +import androidx.constraintlayout.widget.ConstraintLayout import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.findViewTreeViewModelStoreOwner import com.mogo.och.common.module.R +import kotlinx.android.synthetic.main.common_order_status_view.view.iv_order_status /** * */ -class OrderStatusView : AppCompatImageView, OrderStatusViewModel.IVisualCallback { +class OrderStatusView : RelativeLayout, OrderStatusViewModel.IVisualCallback { private val TAG = "VisualView" @@ -25,7 +29,7 @@ class OrderStatusView : AppCompatImageView, OrderStatusViewModel.IVisualCallback ) private fun initView() { - setImageResource(R.drawable.common_status_unorder) + LayoutInflater.from(context).inflate(R.layout.common_order_status_view, this, true) } override fun onAttachedToWindow() { @@ -48,8 +52,20 @@ class OrderStatusView : AppCompatImageView, OrderStatusViewModel.IVisualCallback } } - override fun setImageViewResource(name: Int) { - setImageResource(name) + override fun setImageViewResource(name: Int,ordering:Boolean) { + iv_order_status.setImageResource(name) + if (iv_order_status.layoutParams is RelativeLayout.LayoutParams) { + val temp = iv_order_status.layoutParams as RelativeLayout.LayoutParams + temp.removeRule(RelativeLayout.ALIGN_PARENT_START) + temp.addRule(ALIGN_PARENT_END) + iv_order_status.layoutParams = temp + }else{ + val temp = iv_order_status.layoutParams as RelativeLayout.LayoutParams + temp.removeRule(RelativeLayout.ALIGN_PARENT_END) + temp.addRule(ALIGN_PARENT_START) + iv_order_status.layoutParams = temp + } + } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/orderstatus/OrderStatusViewModel.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/orderstatus/OrderStatusViewModel.kt index ad8e90818d..82f4b26dfe 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/orderstatus/OrderStatusViewModel.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/orderstatus/OrderStatusViewModel.kt @@ -32,16 +32,17 @@ class OrderStatusViewModel : ViewModel(), ILoginCallback { override fun onOpenOrderStatusEnumChange(businessEnum: OpenOrderStatusEnum?) { UiThreadHandler.post({ if (LoginStatusManager.isOpenOrderType()) { - this.viewCallback?.setImageViewResource(R.drawable.common_status_ordinging) + this.viewCallback?.setImageViewResource(R.drawable.common_order_status,true) } else { - this.viewCallback?.setImageViewResource(R.drawable.common_status_unorder) + this.viewCallback?.setImageViewResource(R.drawable.common_unorder_status,false) } + }, UiThreadHandler.MODE.QUEUE) } interface IVisualCallback { - fun setImageViewResource(@DrawableRes name: Int) + fun setImageViewResource(@DrawableRes name: Int,ordering:Boolean) } } \ No newline at end of file diff --git a/OCH/common/common/src/main/res/drawable-nodpi/common_order_status.png b/OCH/common/common/src/main/res/drawable-nodpi/common_order_status.png new file mode 100755 index 0000000000000000000000000000000000000000..869a3eeb4ff20eb948c0dd4f388b5e8afeee488d GIT binary patch literal 2248 zcmWlbc{r6@8^&cil#q{99K<$k^E|6f97AFoQbdCx6&XUNB-1vA44E?>M21hcX(LnE zDpMKaP`*Tbri|_Peb>A9dHY@0de*hpdj7cYd#yiKBGJn9_|Y>*nV6W4o0}QiVlxpN zsvIm>1$(ulOiawZL`!=UY^fK4;yVuU?F<87ATdN!EL1C(CCD!H)4Fl68Z zRB{ld5?F#t!wt~HsWjXCToAm<_$$kj`8j|XPWLlwf zeyCh6tdRoah9HCcKztZdtc27vAT1K2NkVkP0j5xz0!dLIeILMJFmxgSCICCdHWkZZ z?I@rXjo^A|_}8#h7bMdHNp?f{|H8_Juude9dj)C50!+VV!f&(cDTv-fME?O$$^LB| z)1wyxG?EaBL7IUdkZz^vh9Z)EkV+n+oR4{dFh??NkW>c^GpLq^V197}5GF~s9?}a1 z>M5}PLm*!Tsb(X%ewthZjK!t)4Aw}*Dk5JEspcTmCAwNBqEH1ZmO=*pKs^=NrZM71 zfeZzDF@{e$>IH{#ZTpmfICK7%|>Pwhmn*8taYaH#-TG$PkuA;d0N zz8cmf!QXc1qwDm^A9U&(TJ#yMokZ=3hWv#IUZqEOpuye1vjR940R0?9 zrir$3z?j>iPj1nhzo9P|(1tm*Y8-W}2394&V-Rs}N3J&^I>pHO6vX*0?AQuxw!$#V zAb&;c$I*;w@bn`H9|zf^AdU*2z6HLm;K~bNL`E#D5xr-K=4-7>yJBy{ zAE)FRjL|B>smIIqhwwFH6B8r0Y+HU_Nn?A$-^K(Bg2l$xmQQ3H@@1&=;ENl3&|0hJ zM!;CRr*%_OZrcC9)?JLh_e!q9DPC~_PE+;lu6UPFKlS|1)h>4p@>`B6O6p77P-oE` z2}MN_MUnJl%8pBOC!&%~ML#`TVJQf={FSSCRV9MW-7knIN8cf&_DQUk=$&ubGhXFR zSzaZaGaoBO)cO`@89g^ED{iIbF^tnl`JLttqoWR^4i3Ezy}hHowofBvraZ;M+GL6c zyvuYOJEnZ(B(=9lN{uAqv5{$^VFzNBcT(kYip32$alU4GwU>KYttL~H!5R==D)HLpS#Ah ztSh{@nW><8O-#s4oB6)Cx8k#Cj{XmWd*W=JG3P5|14l$AW6uxVLc9-Wsf$ktZBprb zVS=>%Mb%agO3&uOxsuPKq@MgQg~aXg@s#nDlxk)XGr1O*jCrFYM;K z&0Ir>3MREa=$3k;b}3^1(Y(7zhS;$YdELdOrIR9tSLPqFvaJd(^9#7(D7ki7nVE5f zdAltw4bO7H8tT*J5g==j;IVXm9XZ>xGdM|BBC#Lq>r`(RHYhE-Uw|o&2 z5D+lkE-&N5b1$2pBb59M55aBe6FcT}rpPUa&4+P+vma&M^$-|~I1<))L@Zh+I$WM- z|MK>Xdr=W{3Bxsn-78Bkir|ERDs_c^$ln+uDI6EA+YIKJs9 zUF6f@qlXI>W-F|6(_P3(PrquxaU{|B>{(F=%yB1rmu>9so`Gvnt6GxPkCy?lfx5v( z9pO9gH=hN5_|wBt$|Z<3G;39nU`@&VD{Ey-W|Yu%Bj(_r_D}v*5;z?~2|vG0!edAA zh?D601bzZf3=CAU@prOtatd?`415=K@c6vu;CruEGY;IAlN|fIyRylWNnK(0z4!*4 z1yP);MMhX8*DFzevf`a0E^dzRU9Sc6+S0o9@4Cton?>!58_&?|>Gkyw>mM>l>P51` z$2Q)?@lwO(R^qC|ZGRD}t07}Z26q(AMl?>j^+Sg2@!q;pikJe{4THRrE9(M33H=fBvcE=7 zt+o>k@wToOg7RjhVr$vux;|4*m4>X~5U~#&2B(L-=kXWw^oEC_;5JjK;_L#?y}03_ zjg6+~AGtU9?a!U^8f0x&_;F1B$2B7X=a{mFIxn?ExULdCu~#(`Z#i~t%5!bb{0EJ{w)1?vbUgN%Lu#r%}V9(=eZenFz IZ*(*IU!@(s3jhEB literal 0 HcmV?d00001 diff --git a/OCH/common/common/src/main/res/drawable-nodpi/common_order_status_bg.png b/OCH/common/common/src/main/res/drawable-nodpi/common_order_status_bg.png new file mode 100755 index 0000000000000000000000000000000000000000..f84de094a2e046628ea5488d00e2143d3730a660 GIT binary patch literal 394 zcmeAS@N?(olHy`uVBq!ia0vp^Wk77i!3-q#ZMYu^q-+9wLR^8gFBo`wdIkjrLD+E8 z$HxcA_Ve?DkPZ$GKn73{B0g27f++8|vaz|yPA4k^F?3DbC zbAi&YJY5_^A`YLu5iQnaz{7IEGx}cB)SLg~Y!}!oz2HAvU_ODlR<$`l^Nn+`w0}aW z@GrxM>t{57Oc5*k6T2l@@owQm6N&DPiiy`lHm=Az)F<7&JMs0sOODm|LuxM^eY`o( zTYc^IU2^N+ySNMA3vzW2J#^Y3oH^{`i&IKsvU5vcAHNjKVsJT@P2hzd!^s!tgxt7# zUT9uW4p3OI(4l!2lW7l=nwIvjlZ$j!tsEA;b}F&#n#XkYaJx@==N9oZA2Z literal 0 HcmV?d00001 diff --git a/OCH/common/common/src/main/res/drawable-nodpi/common_unorder_status.png b/OCH/common/common/src/main/res/drawable-nodpi/common_unorder_status.png new file mode 100755 index 0000000000000000000000000000000000000000..52e9b671fc6e544c80cee1434dbe04c014c4cec7 GIT binary patch literal 925 zcmV;O17iG%P)mH+?% z6m(KfQvmwyx*Yc1rJjg+YFSPY4+xXRk|hf3&j0`dpGibPR7l6Im)UZwFbqIh+AK}l zG_3@LB>_wz1hV!2KkmvbmxA4vHa;(6Cc_y=l8vQ_td{TQ#L(eebYo(^FIU=+JSRmVknb7u$0Fn6|Xekh@H6|WrATX;I2vXq(e&P%*X@*`xu|)JigfDS1T4-;H z;8gH%K$iy_`YcFj!e{azxS~ z3fGz`6AJm-Ho}8P9J(k7O>OcUp@1NqXogH^m1#ueWggX}jgak$95LsSNrZ-`ON59H zaN@SWOg933E)P#*N2#E{gg~vc99Q@_vjD)v=0(-b)b7%~ULfgdS zua|L5D~&lkI6(Lg(KR;57m6}$n=4D3<14-4r9P)T=;(4N$NZwPi4xBd_jPIv6!=w7~Rvf_B;|B1xYykfU&krGVlXm!300000NkvXXu0mjfNiENg literal 0 HcmV?d00001 diff --git a/OCH/common/common/src/main/res/layout/common_order_status_view.xml b/OCH/common/common/src/main/res/layout/common_order_status_view.xml new file mode 100644 index 0000000000..f471a2180d --- /dev/null +++ b/OCH/common/common/src/main/res/layout/common_order_status_view.xml @@ -0,0 +1,24 @@ + + + + + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/TaxiUnmannedDriverProvider.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/TaxiUnmannedDriverProvider.kt index 2364dcf294..bf4001fb40 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/TaxiUnmannedDriverProvider.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/TaxiUnmannedDriverProvider.kt @@ -4,8 +4,10 @@ import android.content.Context import android.view.View import androidx.fragment.app.Fragment import com.alibaba.android.arouter.facade.annotation.Route +import com.alibaba.android.arouter.launcher.ARouter import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.och.common.module.biz.provider.CommonService import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.biz.provider.CommonServiceImpl import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutopilotAnalytics @@ -46,9 +48,20 @@ class TaxiUnmannedDriverProvider : CommonServiceImpl() { } override fun createOchBusinessView(context: Context?): View? { + CallerLogger.d(SceneConstant.M_TAXI + tag, "createOchBusinessView") return context?.let { SwitchBizView(it) } } + companion object{ + fun getFragmentInfo():Fragment?{ + (ARouter.getInstance().build(OchCommonConst.TAXI_UNMANNED_DRIVER) + .navigation() as? CommonService)?.apply { + return getFragment() + } + return null + } + } + } \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/bizswitch/SwitchBizView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/bizswitch/SwitchBizView.kt index 0a991bb6f5..616286ca4d 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/bizswitch/SwitchBizView.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/bizswitch/SwitchBizView.kt @@ -3,14 +3,24 @@ package com.mogo.och.unmanned.taxi.ui.bizswitch import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater +import android.view.View +import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.findViewTreeViewModelStoreOwner +import com.mogo.commons.module.status.MogoStatusManager +import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.util.ThreadUtils +import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.och.common.module.utils.FlowBus import com.mogo.och.common.module.utils.ResourcesUtils import com.mogo.och.common.module.wigets.WindowRelativeLayout import com.mogo.och.unmanned.taxi.R +import com.mogo.och.unmanned.taxi.TaxiUnmannedDriverProvider +import com.mogo.och.unmanned.taxi.constant.TaxiDriverEventConst import kotlinx.android.synthetic.main.unmanned_switch_biz.view.loading_biz +import kotlinx.android.synthetic.main.unmanned_switch_biz.view.order_operation_change +import kotlinx.android.synthetic.main.unmanned_switch_biz.view.taxiServerSelector class SwitchBizView: WindowRelativeLayout, SwtichBizeModel.SwtichLineViewCallback { @@ -30,16 +40,42 @@ class SwitchBizView: WindowRelativeLayout, SwtichBizeModel.SwtichLineViewCallbac private var viewModel: SwtichBizeModel?=null + private var fragment: LifecycleOwner?=null + init { LayoutInflater.from(context).inflate(R.layout.unmanned_switch_biz, this, true) initView() + initEventBus() } private fun initView(){ + fragment = TaxiUnmannedDriverProvider.getFragmentInfo() loading_biz.setEmptyText(ResourcesUtils.getString(R.string.common_biz_loading)) + order_operation_change.onClick { + if (MogoStatusManager.getInstance().isTaxiUnmanedDriverLineRoutingVerifyMode) { + ToastUtils.showLong("退出验证模式后再接单吧") + return@onClick + } + viewModel?.changeOperationStatus() + } } + private fun initEventBus() { + fragment?.let { + FlowBus.with(TaxiDriverEventConst.TabFragmentEvent.EVENT_TYPE_SHOW_RED_POINT) + .register(it) { show -> + taxiServerSelector.setNextItineraryRedBagVisable( if (show) View.VISIBLE else View.GONE) + } +// FlowBus.with(TaxiDriverEventConst.TabFragmentEvent.EVENT_TYPE_TASK_WITH_ORDER_CHANGED) +// .register(it) { taskWithOrder -> +// nextTaskFragment?.onTaskDataChanged(taskWithOrder) +// } + } + + } + + override fun onAttachedToWindow() { super.onAttachedToWindow() viewModel = findViewTreeViewModelStoreOwner()?.let { @@ -54,7 +90,6 @@ class SwitchBizView: WindowRelativeLayout, SwtichBizeModel.SwtichLineViewCallbac override fun showLoadingView(){ startLoading = System.currentTimeMillis() loading_biz.visibility = GONE - } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/bizswitch/SwtichBizeModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/bizswitch/SwtichBizeModel.kt index 6117199ee5..31f7ec9af9 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/bizswitch/SwtichBizeModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/bizswitch/SwtichBizeModel.kt @@ -1,6 +1,7 @@ package com.mogo.och.unmanned.taxi.ui.bizswitch import androidx.lifecycle.ViewModel +import com.mogo.och.unmanned.taxi.ui.task.TaxiTaskModel /** * @author XuXinChao @@ -18,6 +19,10 @@ class SwtichBizeModel : ViewModel() { } + fun changeOperationStatus(){ + TaxiTaskModel.updateCarServingStatus() + } + fun setDistanceCallback(viewCallback: SwtichLineViewCallback) { this.viewCallback = viewCallback this.viewCallback?.showLoadingView() diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/bizswitch/TaxiSelectViewGroup.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/bizswitch/TaxiSelectViewGroup.kt new file mode 100644 index 0000000000..276cffad25 --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/bizswitch/TaxiSelectViewGroup.kt @@ -0,0 +1,52 @@ +package com.mogo.och.unmanned.taxi.ui.bizswitch + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.map.listener.IMogoMapListener +import com.mogo.och.unmanned.taxi.R +import kotlinx.android.synthetic.main.taxi_select_view_group.view.textNextItinerary + +class TaxiSelectViewGroup @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : ConstraintLayout(context, attrs, defStyleAttr),IMogoMapListener { + companion object { + const val TAG = "LoadingMapStatusView" + } + + init { + LayoutInflater.from(context).inflate(R.layout.taxi_select_view_group, this, true) + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + CallerLogger.d(TAG,"onAttachedToWindow") + } + + + override fun onVisibilityAggregated(isVisible: Boolean) { + super.onVisibilityAggregated(isVisible) + if(isVisible){ + + }else{ + + } + + } + + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + CallerLogger.d(TAG,"onDetachedFromWindow") + } + + fun setNextItineraryRedBagVisable(visibility: Int) { + textNextItinerary.setRedBagVisable(visibility) + } + + +} \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarycurrent/ItineraryCurrentModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarycurrent/ItineraryCurrentModel.kt new file mode 100644 index 0000000000..52bc9237a1 --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarycurrent/ItineraryCurrentModel.kt @@ -0,0 +1,29 @@ +package com.mogo.och.unmanned.taxi.ui.itinerarycurrent + +import androidx.lifecycle.ViewModel + +/** + * @author XuXinChao + * @description BadCase录包管理页面 + * @since: 2022/12/15 + */ +class ItineraryCurrentModel : ViewModel() { + + private val TAG = ItineraryCurrentModel::class.java.simpleName + + private var viewCallback: SwtichLineViewCallback? = null + + + override fun onCleared() { + + } + + fun setDistanceCallback(viewCallback: SwtichLineViewCallback) { + this.viewCallback = viewCallback + } + + interface SwtichLineViewCallback { + + } +} + diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarycurrent/ItineraryCurrentView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarycurrent/ItineraryCurrentView.kt new file mode 100644 index 0000000000..fa36fe5fa2 --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarycurrent/ItineraryCurrentView.kt @@ -0,0 +1,53 @@ +package com.mogo.och.unmanned.taxi.ui.itinerarycurrent + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import androidx.constraintlayout.widget.ConstraintLayout +import androidx.lifecycle.LifecycleOwner +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.findViewTreeViewModelStoreOwner +import com.mogo.och.unmanned.taxi.R +import com.mogo.och.unmanned.taxi.TaxiUnmannedDriverProvider + +class ItineraryCurrentView: ConstraintLayout, ItineraryCurrentModel.SwtichLineViewCallback { + + + constructor(context: Context) : super(context) + + constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet) + + constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int) : super(context, attributeSet, defStyleAttr) + + constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes) + + + companion object { + const val TAG = "SwitchBizView" + } + + private var viewModel: ItineraryCurrentModel?=null + + private var fragment: LifecycleOwner?=null + + + init { + LayoutInflater.from(context).inflate(R.layout.unmanned_itinerary_current, this, true) + initView() + } + + private fun initView(){ + setBackgroundResource(R.drawable.shape_itinerary_bg_default) + fragment = TaxiUnmannedDriverProvider.getFragmentInfo() + } + + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + viewModel = findViewTreeViewModelStoreOwner()?.let { + ViewModelProvider(it).get(ItineraryCurrentModel::class.java) + } + viewModel?.setDistanceCallback(this) + } + +} diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarynext/ItineraryNextModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarynext/ItineraryNextModel.kt new file mode 100644 index 0000000000..2f93c8d360 --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarynext/ItineraryNextModel.kt @@ -0,0 +1,29 @@ +package com.mogo.och.unmanned.taxi.ui.itinerarynext + +import androidx.lifecycle.ViewModel + +/** + * @author XuXinChao + * @description BadCase录包管理页面 + * @since: 2022/12/15 + */ +class ItineraryNextModel : ViewModel() { + + private val TAG = ItineraryNextModel::class.java.simpleName + + private var viewCallback: SwtichLineViewCallback? = null + + + override fun onCleared() { + + } + + fun setDistanceCallback(viewCallback: SwtichLineViewCallback) { + this.viewCallback = viewCallback + } + + interface SwtichLineViewCallback { + + } +} + diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarynext/ItineraryNextView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarynext/ItineraryNextView.kt new file mode 100644 index 0000000000..a1a75d7974 --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarynext/ItineraryNextView.kt @@ -0,0 +1,52 @@ +package com.mogo.och.unmanned.taxi.ui.itinerarynext + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import androidx.lifecycle.LifecycleOwner +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.findViewTreeViewModelStoreOwner +import com.mogo.och.common.module.wigets.WindowRelativeLayout +import com.mogo.och.unmanned.taxi.R +import com.mogo.och.unmanned.taxi.TaxiUnmannedDriverProvider + +class ItineraryNextView: WindowRelativeLayout, ItineraryNextModel.SwtichLineViewCallback { + + + constructor(context: Context?) : super(context) + + constructor(context: Context?, attributeSet: AttributeSet) : super(context, attributeSet) + + constructor(context: Context?, attributeSet: AttributeSet, defStyleAttr: Int) : super(context, attributeSet, defStyleAttr) + + constructor(context: Context?, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes) + + + companion object { + const val TAG = "SwitchBizView" + } + + private var viewModel: ItineraryNextModel?=null + + private var fragment: LifecycleOwner?=null + + + init { + LayoutInflater.from(context).inflate(R.layout.unmanned_itinerary_next, this, true) + initView() + } + + private fun initView() { + fragment = TaxiUnmannedDriverProvider.getFragmentInfo() + } + + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + viewModel = findViewTreeViewModelStoreOwner()?.let { + ViewModelProvider(it)[ItineraryNextModel::class.java] + } + viewModel?.setDistanceCallback(this) + } + +} diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/wigets/TaxiSelectView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/wigets/TaxiSelectView.kt index ba227db631..078d80b4ad 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/wigets/TaxiSelectView.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/wigets/TaxiSelectView.kt @@ -11,6 +11,7 @@ import com.mogo.map.listener.IMogoMapListener import com.mogo.och.unmanned.taxi.R import kotlinx.android.synthetic.main.taxi_select_view.view.aciv_check_state import kotlinx.android.synthetic.main.taxi_select_view.view.actv_server_name +import kotlinx.android.synthetic.main.taxi_select_view.view.wait_order_num class TaxiSelectView @JvmOverloads constructor( context: Context, @@ -69,6 +70,9 @@ class TaxiSelectView @JvmOverloads constructor( CallerLogger.d(TAG,"onDetachedFromWindow") } + fun setRedBagVisable(visibility: Int) { + wait_order_num.visibility = visibility + } } \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_new_message.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_new_message.png new file mode 100755 index 0000000000000000000000000000000000000000..5743583744e0b2ab33e90ff00a155a17abf903ab GIT binary patch literal 665 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dydjotzT!Hj|WW>mb!Uak}L@>n} z7_O?R?H3k4Cn9oNMC664>PLNjpx)ggBJZuNPRq((QdWMXr}x&v;+Cf7dkc%Bf`V7% zpzcV2mHcWQZjTV~&%pv1>nzrTIv zk4{}AQf9wkcE6M~*Oqp{in=L#%}yxYH)fj3aPVYwGpCDIry+yN?$Q$+7sQSwls@0^ zYwHfanp5fD`HcPkI&hb;iP>8m@p-;u3Pa(a7XryEx-T%XeEe}Tu}5)J)6>m|FL8x* zeL1SQcZq>(+v4wRivz?XWrLTgpZ!@97XQv90#@gDw4Wzdvm2`_FIV>*-&_ S-Mt$aMGT&jaYZ2Z}g>MSu*T8mIq2afoSt&M<}p#E|Rx0SADV zDU}5I1vC6`XX(1NBcFGT^M`ke98%}*U5g42eY0`Ngp%2IdN1atoLtWuGM9mYah<1& zV~EG`nh9^GH7SU=_BSkTSo$;9bnCm{_D>l4yub9lo4-6Z*6f?d+Fx6|C+WSNI?cj$ zTk}E=<1Om8>6_l^o_-28KPugb4;wz2=cm@=-X*OXhn*R;$$ zdyz?^<4ydPX-)DsU!R<*D#ei5F)#c7gX3kN4xO2N!sCU-quh_-(MJro?my{eF#qO+ zYx_6yi_Sd%=EA1-+3p4Z+iyyA29>x7?>L|9<02dLkL}KLGb!`GVNuUC7!ENA=(q%E zJMQjC`uE>MwEN_Qtmv6aC*!{TSfB8;vb9)ZrSe`2o^Vs%_p3imxb&&*y0e$s6-WKk zEu3p?_V_d$b@~41Yorg`yaf-zopr05>N&CIA2c literal 0 HcmV?d00001 diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_current_end_station_point.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_current_end_station_point.png new file mode 100755 index 0000000000000000000000000000000000000000..dfa74f0a44141ff76885c72248b35dbf6757c520 GIT binary patch literal 1227 zcmV;+1T_1JP)-4?pIFJR!GfNZu3|zvs8EcSXbLtDXvp1uvBvQSUSH{CahCz@mN{jS8(-M=lkV! z`B+QOR$by($o0ly=2u_jS0$=bBdAkY-BvfeR7%fP<@x1n@K@vb<-7E^Af{7S+*j50 z*U|CTsOYZY_T;?uxGJzyqvEee%vD0iR@(U4vGA{N+jYk9$;0!)xbL~G?X9Qrp@!C& zTGnC9^vuZe%8}!hi{F!K%z=L5e`C~cXWDB~)L40XZ3qAW07rCEPE!CF8201JcXxL( z9vBl72l@H=`S$Se@bKp5=H}z$%*@Qk$H&LV$Huah z60ru9x@UL$|Mn6RNb=(No$utne7WbHfS7Ec<7riiv!v=t$AAp(G_G!T@-?f+;Wmb@ zP{|IexjG8{n%hMR0xkp%+73WwkC z@H+(j=}s{$xLL8|-@*79?3q6myxV1!AMR5r1J+dCyZhBmK}z52hv)-_q43Q^6dE9@ zdxLegdvLIOu!~`4%GCy^8_-0~CTo2~!ucjAX9BnT*ElEZENbO=opZUC){oou^MqsS zWL`o&fIbk|3T$CAGeA=(_#}Hh3@$VFmiLly;0sM%EN5WF_Jh#&ibPY?x8D+d8$5eU zqA7HKO7zd6`aOxJzQ=I?;;*Q$hSHBDI(qr<$8j_ojo%3RQpmNF=xE$-zlr1e{wcrD zg|bLwHL{9fCL@B|$@A%1^vurt7Ab?8C4s}G!^5RmG|rq?fBwNDqXt@LNO<>*losfm zCE?w(QaWL1ffU=1C&$sk5r)?ffqsq@+y6QzMGw$m<+E5V7AtOBB{Tql#^SYjF_sM6 zwn)(6wl2?$Y+f6Now&`t^Sbf&x?BDj@QgfmClc<2TOg6{9*uy&sM5u7 zyWAL;ka846(cY>m&n{QBw!b9)_dgd=F%+*%X?Oqt002ovPDHLkV1lJ0aKiuq literal 0 HcmV?d00001 diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_current_start_station_point.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_current_start_station_point.png new file mode 100755 index 0000000000000000000000000000000000000000..62ec826abb256d4c6c2d2f3f355d4d9a9617eb94 GIT binary patch literal 1194 zcmW-f2~d+)5XU1BE~`?3@!RK+4tO!u9v(%))Pf2cs0Kl>DqlD%PN;0Gdu}TmX z#S7wr#oCm5KyjohnTDcZsDvW~V&DrgfsZpl5`sA)>6iXy-n`v?JOA0;x97JoH_q}$ z{uByjRy-p%nY=%9A74**q<(HWg)*ai%chh#(hWX66>MyW<1QpHB5MoeSz$zu@-1k% zGq|RIKHoOKzir`Z*TQieI8$(24=?(m0|!eB~BwJsUtG z0y(8{#s(KY0MQ9!GI%-&Vgj5}#IvJ96KYW*qYSf4vEwf6$q-hj#hguW)CCP1cr*;t z&A@ShzzFZUz}o88?@=O_6SeoiF&C8Upz%F8n^B$>={iYGIA?{k7F0HddKE~cz{UFzKx+V^LuGcTCZ{qb6PYr7Ca%lu8-h+8 zj52zao?bgbS87!@`wOi-UuwB;(9>Ux(q%;GD`J&e4VLCt{r1PW{q?x@r+RZSVWc+< zZSCu&HE6G@XY0t{Wt>Q6Zlz$@TQ+;e3K|Uy4D|7_xiOo~29g1iJ`$-^Dj|9EltdsX zDJdl3aMW27xbei8B5lq-Q5JQ#Wtww>pOa81A7jc9_ybs+8!Dsu-n~(o>UK8qFJmVm5!$0Oq%if%ZdChH_-a|DJ z%ctri0{3`ec`r4skrm$IISIa0k7)I|^!zX0mhCAB@b~5=%7S9vE({I&h?dy?AjavH zo0Zr`tnZ2pB|gwD%dfAU#Z9(WjAVgQwDVMy1bNR=MF|RTg9SOour3Xw70q1m(x~CjH(i z=e?$&A9y)dame<8QLeEu!gC{cHEpM6$3t5Ew*9$ZrW$|UUXU74mYDN+S^Au?^{Y#l zzWl~(u08DDk=M`b>Zl8D#bsYfN)=xeCR4q>{Z6s;*5l7-ww2&l)s2g)1)*sDZ$&1zPuu;P!)9DTIvX7p`|UrG|WmX!E7W^Bc}J!k#{*@tfO literal 0 HcmV?d00001 diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_end_station_point.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_end_station_point.png new file mode 100755 index 0000000000000000000000000000000000000000..1eca96d54186694bea7b55890903b80d0ec46129 GIT binary patch literal 762 zcmVMQbNX7d;eK(@>omI zReS$fP0?0y@>npjQ!BVtb@^Cw_E=x!S2Vd)KgCrcrBibESZ3;1THaS7rc*%0Re1YZ zH@sCPs#JOWSy|myW9C>SsZ=4SQ$4~}cKKO1yjEP{SRtoVYwuSou2f^@S0AHOOww0) z`&d1|R3D>Mc>P%(q*EcLQ&H7dU*uRGqE$7#Q+xkaFt1Qk*j7;0Rz}NJS>9GUzf@!A zS616rO3qd{yi{fCS8456K*d!twp2aBRV}krT;W$k$W=7CRB!WGDzH>+@K|#8SWVJa zOwm)B&ky&rc*t^R3)lZYw%YntyEXrS4z)TLB&-v zw^XJoG`j!*06}z8PE!B`6-1R{AiR`%b#-oMVN_8|KsPrpFA4ei`T6zr@bK>L*459? z$;rC9u&<}5qobalkdBRphJAT>R!>7bA{!6{7!Y0n00AmVL_t(2&wbAaPr^_XhT*R* zQ>K96-h1!87pRC(MTQ{A=KuczPj3lr;g%3FD%mbaF&wdU;`&_G~YiR>I>~??t#^(Yf&b*pXpRxaJW);LXp3mhK zG;$0rlrk>?xJt=V(tr+>GPeP&Jer#oAV#|y(FPUO3m|kih!q$2gE(Q$FxgC&GEQ;` zUyQ36Yf>>MLJxyjAr_0NVyX`v6#-yA-io)VILBlJIIbir35FK7Yc>FcpUn9{wqDFE zLUBDI%W_+8Q?ii+#{JG`L5Jmo$1b2l*!${dzlFwKs28X@RZv+3=!MtHpx|SZVH8FSS%Hvs5LkQ!KGmBBxV${a7HTQ)uj0D6La^ z|5;?{S24C!Dz8*T$yGJFR5Q3#9;8zwsZ(a^S7PQ@OVCwy`B*~7Rd)JVVB}X^;a5As zRZrAbSKC%Myi`-zR#nu2Vn5RXV>^O3zkK(pE^#R#@Fu zJ;7BbtW@Rr=ts;|S>0Dn(pE;xR^j#JQPoyCy;NlASor?8Y9Om_x@_ljN6=;+B)_j(ypQSKL?a`R~m3%Es`? zirAZ4$8`Gs`Sktu?ECD;@yWL6z@6W!o9Lc?){lkld|%OQM80EQ;9B6=B}sgr=aGgm*AnN z^Pi0BhkxRMXV`Cb>uO-vXivpxY2jx}!)966U{%v!O2}VF#9v(6UO~cJ+4kDV_r<;K z!n5+OoZ_a4-;i_JePYRbWXyVI(RX;~a&O{oZ0lZY>s~v%T0Fg3+W6VS^}xLLwx{u- zsPmwo@|J(nl#cC)Yu;^F%xX~4TDP$1=KufzC3I3wQvmze)j~Qt`}_L(@bK{P+ts_f zjEswmczAetLPFcy+uOUlySu~R=p+CD2HHtPK~z}7#g${Q96=O?JGO0}*fw607i(i< zgU!a=cw^hPZQHhO+sUt-?#b-V&TLqf6z|fRXex?3<`=Me9MeM=`QWQ?1V8YPVS~K$d`?1w` zPL(2+)?gy@A7Gth@+bT9YX?i^kCdrWGEBLD{$xLx5b;y~7vhU(ss9VnMA9_>g(M4e?o~M#o zBY_Eqp217ZDd@wT^HXTGvtYpi%@w!pz>wQo&Z=Y{?6b7lf(`8$Y1%J1XU@S0OCB}ai#6vZCz6+?gxQfEzpy#v)BqO64{^MMg( zXza2ZZ~qAsP=b7Vpwn>f}+F zPq7+bQe#8lharAUL^(f9UekQ?7GP0(0~>&qvNr%&Qts)1_U*_@{xK;Ulhvw!V?Q3E zTJ74^YFG2X!{pjBXl!O>ZT8n-)a2SnF>)n`mjEYB`&0S*_K~ay)~jR@Fts*ObBu4f zC{d!spb~=^OcYxVU6OL?>>`tGw_PkhJ%}YGc8$Qu9^@7}y+KnL?b>q`fzH}3G9L9Yb?^cI#z&Pz18dDSo zA5qFgk5Rygvohx6*81FMNDrPxaSQtn0}F~5w;Ho| z&e3+$$%Cl5k2!ydUd4+ag2T8xn#JCdu0U6n^rCTbE22&n4|S^4snfGg&z}3*x-V3z zLgV%Q`t=*inQtezai8NetMueyDX_FkPhK~Z#;T`a!k~&m zzVs~AvuB~J7nsp_9OWeNfWik{rI2$j9G1$P7xeGn-wk_z#TV6;#=L}W8mkJ8hf>Ul zs+B!dtz4C%pH={Ed-dwo1h_+~Nn>s1FkI)P-iI$U)jo}zw3Tq7rb?R7Sl(;&po*%s zYE`XOmEln`=KkJVH1=h->{LAkoZLI`hm<~**d>0YWw{Jk-03SZP;0y?$ z@y71myC2~Nl!d@G4(_*0*J&&E2grfJ0|WZfIH0=&_X12vV^gWG(My!EG8R}?rVNdJ zxh8uX$4q~`no8CJkIR&yahcVFQBziy)%4N=Xkj?=LSKZ!4R1y<5wdee;&m#J)yuZPXmSzC;? z+XJ<^i`$Mb909<&9dNTJjalCa*F|k#-A5e;4AXYByUe*L?@NR7+!)iKLHPzZmpSEs zLyyXr=X>ZhUN)ye!@0E{A1oK#aPa3NekHZfMZ$e)%$xW z4Gb??a`;B+=Gr_-HZG5q2lud&CC7l&8#}zs_Jdeha>m+q3jwFxuL(Crzl%s?iUr+A zmAJTBgR(f1x+FoW`4MA*D} zo8@iB$gALK+e0a129KRY@o;(F;7LAn7NoLuJ}gCpjrMQK|=~J!J|hF8Zk&djaKSUhrXK00000NkvXXu0mjfUuW15^zb&?IaUNFYss1QLiK2}?rnYrnbgy}5tfGxztM^HOO6JC>Q^ zrX&(+nXeCZH~M}-JSN8I9d=B#h(t1?)BJ+AqpfRq_u8}tQsaPih7JUMpnYvA?IH_B z!0&_W@38J(m}`S1EhvT9?@H{f9-D84o8$2IEzbQ1V&?J8Ni13qNjebr!l)2#s%>kB zu~DIQ`joXyX!WNOSMgy~041Yvc?Jr`;kFtg4NxzKhjK8q!Z`yJsemhmRx#vgu(&y_ zbPQ{eV463OtcCj{AnJjU4mhue{0S)d?`-ujG{}IXh6{6$t%1I7n0gIq@8Q}MNV-AZ zMbt+JQB6Y|)X5=!2Clw`p-xco@%(WtV+xaYVNC;&^$u4G;La#fxl93Zv+!aN-o1fl zDR5M9SqJU?pc3G5GkE$GF73i6-e70+n7$1wSK<$cagG{4KaaCCc*O{Ya#bqHC1d1; zHn=nge+DNG8;1scehw0SA9jn&y|USr8x^5YR;j}tz-#CXY=)ujb1WhbZwpyosA z7@>N$m5AIThL!<5aRyJ+V$UUL0ZRip6Hur^y0A7ev`R362;++g2`GM<5-JtI&=W;; z?L_>VA-FRJ!ySYHqzk1(#*kHH4>hi75TXo7IFY?YLdZwmNz@THL6Tqh6O+)>3!T02 z+k3(u5Yr zS8JlwDjHkGZXADR{-bZ?je7=#g)(;0ku=`&3To*6N5B6mU|4CMEOB;TTtBmY|H0sN z*{*=O)Vh5UyoX8h^Q#L={A&E&7d~KZb}mYCcxmC1Pvun1z=Rw1Gi-LyFDoW)4dsuc zDOS~VcF8Mh=Z_A7zJuY1r48TC+Rq#R#XR-EKEcLFV;#w0jC|K8n@t#%U5veL;n-et z=?7{>O>vS*#GrXpVrK93^t8uH%S)dy_2Hb3iHnkmh=}rEGhy{Rl6$$4dPO^hLV3j_ zfB!-8N-guqz<^2BXm2kbGua)UyYWoz68Wp`@tvK)J2%8Uz8aJ0v!!wA8)1Kcf_Ia4 z#h4xUbZtfjIsWIQ2dtc&(;q)$?5My4Tj`g-Sp z5T=)5*P-=}ytueHF}o~l$Z6FlQD@gr^A1EuvqJ3iv%jQvY~92OyG`RY_~{j86G1+a zp*#03_FI4TR$iXsF#Q&QXY0={DU2cy50B2zvMK}pLgD?C z58T^!N+=ZC?cR9Q!#^^|Ku>Q`+TE{pteSk@cjek&PuX{Pa=D;+?Fo?y<=7YA^=Pb| zETG<`hr;a$OM6K>@$^H=K3z?PeWl1uST$_I^7?f4F*k~{gl{IYT~S%fa8oK2x?W3`dJPe&9N_JO8ZCV0c#Udh>6OkK zgR9H#m8}VCaym0UAGSPI|HTp7d87w#zJ)ew2RU z^8OtQI>s-_`!7GC2Rm3#HH)h)N-}y*Of4{$F1%PP-nLVuurYQy^^JMGMO9pS^j>Dc iJ{mhZ-E)tpe);rJUDJNv$0_K)Ci!j;pjLT@#s3R;fl`zJ literal 0 HcmV?d00001 diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_order.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_order.png new file mode 100755 index 0000000000000000000000000000000000000000..8022b12092b6d421a20380f42a7cbb48390e3af1 GIT binary patch literal 2261 zcmV;`2rBo9P)`kP z+x<0;`!bjM(dYhv%KUc3{6Mt&$>;uxy8SJw`Z1aNE3f+e{r|Ss{zbg{c)|QCv-*a^ z{LJS5me%|$t@^*({=MS;h`RlWw*7y#{guxAhsOMX#r!gt`>V_SZm|3{wfge;|Geb= ziOT$S!2G`9{+`hNU8?*zgZxUT`$v-d-0}Xy;{LPY{gTK1hrRtzko-Q4`#-GuGNtk(Ub$NiGR{fX85bISZ^rTk8q{6L2MXu>;qWUqd`P}OM z(CGfQ+y1uG{)fcLqJ|7cW0000SbW%=J0RBGv z)zyo5LOSs9@bKH)+q=8FjEi`9+uOUlo|bvy000IANklVbP zi4Oj*mHqbk(Yvd1mrq%ak~%=s&wSsv-!GDTj-4@fh5$ln-x&8G{PFihaM!UNKv%|k zOz04Lupw*KtX{JkB|4C`*A6s$z(4;GHfWZHJ+t6wja<8S)!J182mu62 z(}Aq@d;a-Hus&1UMflWkl+uA;{yuDBc=*Ebg(y#V{zR9M=X%{#QSnBay{V{Z()iJx zRZX(J>gyw;U%&zt(gV{`&g~6vr1Q_yYMiRgDxwE`H!$!4QI*yo=xiX@X=&ng5j{dT zlFrsi1g;B2aaBU(Y7(>Uq~?*BZ4%reDw0$Y(H%(%zo3d}d%93}iAvBElq{BzmX?r~ zAc#qbK{+=O*`BAxq^0SC6VkA2BOlmgKYA|FFZg3ptYl45=J2DWa}0|ynPN;aD3j@& z=^V=Ru7oF>Os3?_%*?x)cTt(3S?u`!V#)7J0nLd;4|xAdRKdGbpMl3&Y;3G4)@0gm z+K)0p#>VbPvgMtaqm=vD{j$!)e;g~of1IiI=aLt4^?qo!RN~~)lPLL+dnW}gYH1Wo zxl?GatHS~(rLL}7?e`w6_X8HSd2`g}C=WQG-j(qV#GP6{-|mAt$&cV~$($0R5+S}J z*vngNg)hDz)AI_`Wb#3>4T@}4EK(vU zG6)6nk_68pzn|e)$d-*Jc!g^o9GQPy!^cP-Ecp>^BrDQD5DU^F2TP|{MAtOeJUFPB zG+2T}u;3a|{v{5?H6il(6Gm9Dj<@yo_1OrPPWOmj1_u}97Zr#jWL{oDa4}ggd$5ot z`0bA$Z>4+WJrp8?C_{*c2o5&FLZhQYqeBJJ&@Is|Eur;9H^uy+l^&xP*ytX=mv@WF z<<_XPWKsDKAUL!Ing@$}1Rs#^RatC(YU=vb^;)hYScrV0-@G3tTY<8diZ9OioWViE z7pwdT{&1FKA+iYZ0m1MnIg(~MW^;}?2W2)NF&{yh&1N2qmh;+5JH?!TvKhE{^#8HS zk6k5s1OAn%;)%r9bw|`BiUYiuETB~&~Q)X&p+yhf3d9dLlopZ z7Pn`;9Cq4+~6rN{H&`1sxAA@K=uPYxKu~GK7%DCC2dRECIg9q1Hnm2BEj{z{Hdd6+qPC4oyQ&O0@2Y^8p;tY%((K! z1@X3=1#w5f&|M>oURCWm^Rh z4jTbiwLIrD6+Bq8zl;YfXJzezSHC-tEzwh$Nc6>SCEIy>bxmRGZ9!{cVNGMBxW|j1 zPH4D~V8b&!7|kbav7RSHm5UcwyU0MfxW7mS5Nvn`YZuXc!Zz;Pw{hP_4jOb}1HG?B zulZyn9T&wGUbI=YAlU6kxjPS*&IZIio3E#IXSF11U)WE4sjRHLB2zm5#*O(m@SC+ERKZu&HLqGR*@1H+_u`UxkfG&)&fXeYW>H+SqG)6SV@Rcp>v00000NkvXXu0mjf5xTvU literal 0 HcmV?d00001 diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_start_station_point.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_start_station_point.png new file mode 100755 index 0000000000000000000000000000000000000000..b2c4edba60b650806f01199ef6cfd4e261572337 GIT binary patch literal 610 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX3?zBp#Z3TG9|C+rT!FOY_NS7q-z8sNmTdc> zFyX&s(Lc$*XC%x2NX~sHdFhVik8_gMza*!8l)QaI^7A>6?8fIH1wh7{SCU5_O8z?| z(e_>9)g`Iozf#LzOP#nU_4kZa`CqAPx1@fam3(kr^793$;{Q^M-btOgEA{`3!u|US z|MyECcqF;+k<`pjQqw<3E_w?xYS&ZA{f|Kgp1mhI_dUq!>$fEPzerB`B)RpOvz#mW1U z6@MkSJ(E0fPqO^4)rRGVfqvF03GxeO_}tnW%<=j2OCWdz1UGNq+z$jRR`dWtSy@?d zuniD!aNN9ER#s^jz8I+QtEY=&h{pNa)9rc94gxF}7@Mo#@16c--h{NGPT}Khv;X|R zpVGSKv*M0wsZ4im-oCWERhAPquJ1N((P5hzuV);gkPz~NQ=>J)-$c9@EKIo_UG4oaJizH|(88{7m$pad)r7F*`sj(MIlS`IVttUaH)?%N zh{hpX_Jn8iREpF(K58T$SiaxwQsIS){tFDt>)T!kNZfqiu%?k=^YoIkbA692>QBz= moKUzrsONb1)N2xV?6>t#t8-tuXb&&|7(8A5T-G@yGywp2U@QIr literal 0 HcmV?d00001 diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable/shape_itinerary_bg_default.xml b/OCH/taxi/unmanned-driver/src/main/res/drawable/shape_itinerary_bg_default.xml new file mode 100644 index 0000000000..33cd161e8c --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/res/drawable/shape_itinerary_bg_default.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable/shape_itinerary_bg_order_count.xml b/OCH/taxi/unmanned-driver/src/main/res/drawable/shape_itinerary_bg_order_count.xml new file mode 100644 index 0000000000..190dd17629 --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/res/drawable/shape_itinerary_bg_order_count.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_select_view.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_select_view.xml index ddf43327bb..3f184f2f38 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_select_view.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_select_view.xml @@ -21,7 +21,7 @@ android:id="@+id/actv_server_name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:checked="false" + tools:checked="true" android:button="@null" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -29,4 +29,15 @@ android:text="@string/task_current_itinerary" android:textColor="@color/taxi_biz_text_color_selector" android:textSize="@dimen/dp_45" /> + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_select_view_group.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_select_view_group.xml new file mode 100644 index 0000000000..b2935175a7 --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_select_view_group.xml @@ -0,0 +1,28 @@ + + + + + + + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_itinerary_current.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_itinerary_current.xml new file mode 100644 index 0000000000..fd6679d196 --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_itinerary_current.xml @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_itinerary_next.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_itinerary_next.xml new file mode 100644 index 0000000000..cfc8550727 --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_itinerary_next.xml @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml index aa6dc4acf4..e441e5f713 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml @@ -20,6 +20,13 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"/> + + - + + + + - diff --git a/OCH/taxi/unmanned-driver/src/main/res/values/colors.xml b/OCH/taxi/unmanned-driver/src/main/res/values/colors.xml index 177f69f99e..0ce09bc38c 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/values/colors.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/values/colors.xml @@ -35,4 +35,6 @@ #CCB9C3E9 #2EACFF #4Dffffff + #4D000000 + #CCCCCC \ No newline at end of file