diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java index a09989f479..ed2bdaacac 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java @@ -152,10 +152,10 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i mOrderStatus.setText( "已到达上车地点,等待乘客上车" ); if ( MogoOCHTaxiModel.getInstance().isUserArriveAtStartStation() ) { Logger.d( TAG, "乘客已上车" ); - slidePanelView.setVisibility( View.VISIBLE ); if ( MogoApisHandler.getInstance().getApis().getAdasControllerApi().getAutopilotStatus() == IMogoAdasOCHCallback.STATUS_AUTOPILOT_ENABLE ) { + slidePanelView.setVisibility( View.VISIBLE ); } else { -// slidePanelView.setVisibility( View.GONE ); + slidePanelView.setVisibility( View.GONE ); } slidePanelView.setText( getString( R.string.module_och_taxi_arrive_at_start_station ) ); } diff --git a/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java b/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java index dc9d899663..0ad9f649e6 100644 --- a/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java +++ b/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java @@ -112,9 +112,9 @@ public abstract class BaseOchFragment> e public void showNotice(String notice) { getActivity().runOnUiThread(() -> { tvNotice.setText(notice); -// if (MogoApisHandler.getInstance().getApis().getAdasControllerApi().getAutopilotStatus() == IMogoAdasOCHCallback.STATUS_AUTOPILOT_DISABLE) { -// return; -// } + if (MogoApisHandler.getInstance().getApis().getAdasControllerApi().getAutopilotStatus() == IMogoAdasOCHCallback.STATUS_AUTOPILOT_DISABLE) { + return; + } AIAssist.getInstance(getContext()).speakTTSVoice(notice); tvNotice.setVisibility(View.VISIBLE); fivNoticeHead.setVisibility(View.VISIBLE);