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 0000000000..779e39d482 Binary files /dev/null and b/OCH/taxi/unmanned-driver/src/main/res/drawable-xhdpi/taxi_out_btn_disable.png differ 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"/>