From b4c1fed7d411c00993a6363f6612d35317829753 Mon Sep 17 00:00:00 2001 From: aibingbing Date: Tue, 28 Nov 2023 21:18:19 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=87=AA=E4=B8=BB=E7=AE=97=E8=B7=AF=E9=AA=8C?= =?UTF-8?q?=E8=AF=81]=20opt:=20=E4=BC=98=E5=8C=96=20=E6=8E=A5=E5=8D=95=20?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=BD=AE=E7=81=B0=20=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/taxi/ui/base/BaseTaxiTabFragment.kt | 11 -------- .../com/mogo/och/taxi/ui/base/TaxiFragment.kt | 24 ++++++++++++++++++ .../taxi_autopilot_text_color_selector.xml | 3 ++- .../drawable-xhdpi/taxi_out_btn_disable.png | Bin 0 -> 2217 bytes .../shape_size_operation_out_disable.xml | 7 +++++ .../src/main/res/layout/routing_fragment.xml | 10 +++++--- 6 files changed, 39 insertions(+), 16 deletions(-) create mode 100644 OCH/taxi/unmanned-driver/src/main/res/drawable-xhdpi/taxi_out_btn_disable.png create mode 100644 OCH/taxi/unmanned-driver/src/main/res/drawable/shape_size_operation_out_disable.xml diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt index a34b987022..8a4be834c4 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt @@ -12,7 +12,6 @@ import androidx.fragment.app.FragmentTransaction import androidx.localbroadcastmanager.content.LocalBroadcastManager import com.mogo.commons.AbsMogoApplication import com.mogo.commons.module.status.MogoStatusManager -import com.mogo.commons.module.status.StatusDescriptor import com.mogo.commons.mvp.IView import com.mogo.commons.mvp.MvpFragment import com.mogo.commons.mvp.Presenter @@ -207,16 +206,6 @@ abstract class BaseTaxiTabFragment> : MvpFragment -// if (StatusDescriptor.TAXI_UNMANED_DRIVER_LINE_ROUTING_VERIFY_MODE == descriptor) { -// UiThreadHandler.post { -// module_mogo_och_operation_status.isEnabled = !isTrue -// } -// } -// } taxi_close_navi_icon.setOnClickListener { showAmapNaviToStationFragment(false) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiFragment.kt index d6fe659f2c..5edb67d7cc 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiFragment.kt @@ -167,6 +167,7 @@ class TaxiFragment : BaseTaxiTabFragment(), } else { showTaskFragment() } + updateOperationBtnStatusOnModeChange(isTrue) } } } @@ -265,6 +266,29 @@ class TaxiFragment : BaseTaxiTabFragment(), MogoStatusManager.getInstance().setTaxiUnmanedDriverTakingOrders(TAG, inOperation) } + private fun updateOperationBtnStatusOnModeChange(isRoutingVerifyMode: Boolean) { + if (MogoStatusManager.getInstance().isTaxiUnmanedDriverTakingOrders) { + return + } + module_mogo_och_operation_status.isEnabled = !isRoutingVerifyMode + val isBtnEnable = module_mogo_och_operation_status.isEnabled + if (isBtnEnable) { + module_mogo_och_operation_status.setCompoundDrawablesWithIntrinsicBounds( + resources.getDrawable(R.drawable.shape_size_operation_out), + null, + null, + null + ) + } else { + module_mogo_och_operation_status.setCompoundDrawablesWithIntrinsicBounds( + resources.getDrawable(R.drawable.shape_size_operation_out_disable), + null, + null, + null + ) + } + } + override fun onMapLoaded() {} fun updateAutopilotStatus(status: Int) { diff --git a/OCH/taxi/unmanned-driver/src/main/res/color/taxi_autopilot_text_color_selector.xml b/OCH/taxi/unmanned-driver/src/main/res/color/taxi_autopilot_text_color_selector.xml index 16cef94271..a5d1f74aec 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/color/taxi_autopilot_text_color_selector.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/color/taxi_autopilot_text_color_selector.xml @@ -1,4 +1,5 @@ - + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-xhdpi/taxi_out_btn_disable.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-xhdpi/taxi_out_btn_disable.png new file mode 100644 index 0000000000000000000000000000000000000000..779e39d482cdbef02ae70796f6f64850fec5f3b7 GIT binary patch literal 2217 zcmV;a2v+xrP)Px-V@X6oRA@uZT77U-R~7%AyKfhvm8lS^w4^0KAT^E-qymL;#uP)9qT|p|s`aC- z*6)vY)UoO?j(<3vD)vKBTeZ{L7FvktjFn2E;5bfeY7~b*)V7!wOB+it5=lsCvhN<} zzI*T6``*5{`!?A?@668b`?%+v-#Nc??z!(RVFH7h=K+`l;9LMS0TD@47{D-qej<9Q zR+%*!!OZgktOam>t%_>A{}_P1M06zUyv#tDxf#IK07O>dle|v?*hxf(v&hK=gqhC) z@C5*#5qcWHKL8A6QBuP_uLp1mfY+HhMF8I?qEppmWCe0LfYnCWaR3hx(MUDn6S>aJ zGXQ)9z#Gl{CyD4lHCb7K+yp>*OO0(r^n5kJlex~!3jkbeWDF6}oz>)31;Wg#I(^az z8U^q@B2pD*$_6tlyS@Zqx>0fu5%pJ6m<7mX0N!PU{EdiyIb{eO!OXk?K&v_R1QGpl zvOqozK$TrJeoaJ&&Jd8d0eGL$b%cl>oG=h(E&%v4fSeI>2N9`7Ysv>RtHt(aqsRxa zg^0$|6j!7cGcN|P$xMEQh<-Zd2%_}55x|?wsU1Z0+(dz_1JGtBXDWmB1j@{A+5Za> zJvLDwp9gTBnf!Aida<5{R+Gid7XkRFxo?n&eo!+IW}Xe;GiKtehNG%&IAepERXe0| zbed86BO)3|G9Wcan0bY15Y@bAh^Xs~A&BP5MgT45lxifOt`*1!0W36=b`#OTvjk)r zfGdseULx9_83;40=I|>{lXw>qojglGW&-%4(XE=u?-G&vj*LWVG4mn-A24?wC!)L0 z1_-N@nLp(;kq;BmKeGb40>E-}b2ky~JIg>i0IW1N{E3JjPXuC`w08nn3P9~W>OQ2Y zck0XjR!V}?(tKCCR({VA1P(Qvi{BHG45-D-YXGdOr}c3I1A84XnT(GEbHLd7zK^Ho zHPC(wM77LnLo=yijSoE?H$K6zvZ%OVt3=EXJR?rcn@zV{AYXSH!MR68}>wlk1q#(_<)(m&~<>ctXINRxs7g0<%DZ?}Lly z(rybxRV-Dx!r_L#r{`JRe)nz+3=YHdJP7m2dm{MVFl#1mxTYPgOBze_D;e*2e`sg~ z-`VmIdXKye;Z1{QWC~9p=M^A?z*}0I@S%+z@N%Axj1S1102JqZaiHa5deQ=UGk~ko zO6Ij6+k%0?AqX#D0wR0H_y%i`^ zUKAdFc{a;uJ-DVo%^tN z|I<#SJ>(UDAkreFT1Wc|tY~XBiLPC)fXvQ|Esc#d8a9n1s1GqL&R&OkwVxzx$2Wk(VfzdO)_N4g$QjfSSKz*QUC(LBE~TDBQu z%NFKtQ*uKfr%v-HBAfKaZ%oK`i{iV%e8Ub$FrF+yq$p5jZ#i+GQsa=7w39w}9vQlf<( zkMUmT0U(1+*R%@HB^{?kC8HFt;2!U&KT`uRF$*;t~IYrI(#BF3lhD_owJRh=wty>Uirl$npNUFzMR z2&DJld?f?R!YCw_%WCazTosYu9p(RGCpw= z6!%ubLxCjTr^<5V#q%I>4nY>q5%;Zap}s^Q>SXUxZXP3C?n|lOs#2O)BGid*XR|!s zsqj=Kx%^5n1T*``$;%&j@6zb|_p0v@mC)yp@n(xW^gs?>O%3!+{QP8(f7Ly{8N&Q0 zA=s1)_{CyZ=c;KHb-m_*?CSQ*oW@dgb*`%HwAUbzaR-QAY*~8s0n+;l-$I1EOPd_9 z?c($6|Hpw}JmufQLhG`P&h(tvw*Kvvb!Cdkzxuh;=iomgc8t;pwl+19`cFz-$FA;T zr<7FEB``WXDz;wVURhTrAbov2W8A|!$ymSwC*&CREV_`6))j#f_UNB^##qr`Cz%$I rD?t) literal 0 HcmV?d00001 diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable/shape_size_operation_out_disable.xml b/OCH/taxi/unmanned-driver/src/main/res/drawable/shape_size_operation_out_disable.xml new file mode 100644 index 0000000000..13ce8bb87d --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/res/drawable/shape_size_operation_out_disable.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/routing_fragment.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/routing_fragment.xml index 7e0db62f44..fb9ef5ed94 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/routing_fragment.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/routing_fragment.xml @@ -20,9 +20,9 @@ + app:layout_constraintTop_toBottomOf="@+id/taskTitleTv" + app:layout_constraintBottom_toBottomOf="parent"/>