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 ed2bdaacac..661eb53fbc 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 @@ -142,7 +142,7 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i slidePanelView.setVisibility( View.VISIBLE ); slidePanelView.setText( getString( R.string.module_och_taxi_arrive_at_end_station ) ); mOrderStatus.setText( "已到达乘客下车地点" ); - showNotice( "请携带好随身物品,注意侧后\n方来车,感谢体验蘑菇智行自\n动驾驶车" ); + showNotice( "请携带好随身物品,注意侧后\n方来车,感谢体验蘑菇智行自\n动驾驶车!" ); } else if ( MogoOCHTaxiModel.getInstance().isOnTheWay2EndStation() ) { Logger.d( TAG, "已经去往终点" ); slidePanelView.setVisibility( View.GONE ); diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/module_och_taxi_panel_bkg.xml b/OCH/mogo-och-taxi/src/main/res/drawable/module_och_taxi_panel_bkg.xml index d6aa33cbcd..e189a5b0e2 100644 --- a/OCH/mogo-och-taxi/src/main/res/drawable/module_och_taxi_panel_bkg.xml +++ b/OCH/mogo-och-taxi/src/main/res/drawable/module_och_taxi_panel_bkg.xml @@ -3,7 +3,10 @@ - + + android:angle="270" + android:endColor="#141C35" + android:startColor="#344687" /> \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/module_och_taxi_panel_distance_bkg.xml b/OCH/mogo-och-taxi/src/main/res/drawable/module_och_taxi_panel_distance_bkg.xml index 998e8eeaaf..fc07af2764 100644 --- a/OCH/mogo-och-taxi/src/main/res/drawable/module_och_taxi_panel_distance_bkg.xml +++ b/OCH/mogo-och-taxi/src/main/res/drawable/module_och_taxi_panel_distance_bkg.xml @@ -1,9 +1,10 @@ + android:angle="0" + android:centerColor="#7f080F25" + android:endColor="#7f121A35" + android:startColor="#7f131D42" /> + android:background="#4D151B37" /> > extends MvpFragment { protected SlidePanelView slidePanelView; + private View tvNoticeContainer; private TextView tvNotice; private CheckedTextView ctvAutopilotStatus; private FrameLayout flStationPanelContainer; @@ -48,6 +49,7 @@ public abstract class BaseOchFragment> e @Override protected void initViews() { slidePanelView = findViewById(R.id.module_mogo_och_slide_panel); + tvNoticeContainer = findViewById(R.id.module_mogo_och_notice_container); tvNotice = findViewById(R.id.module_mogo_och_notice); ctvAutopilotStatus = findViewById(R.id.module_mogo_och_autopilot_status); flStationPanelContainer = findViewById(R.id.module_mogo_och_station_panel_container); @@ -113,7 +115,7 @@ public abstract class BaseOchFragment> e getActivity().runOnUiThread(() -> { tvNotice.setText(notice); AIAssist.getInstance(getContext()).speakTTSVoice(notice); - tvNotice.setVisibility(View.VISIBLE); + tvNoticeContainer.setVisibility(View.VISIBLE); fivNoticeHead.setVisibility(View.VISIBLE); fivNoticeHead.startAnim(); }); @@ -121,7 +123,7 @@ public abstract class BaseOchFragment> e public void hideNotice() { getActivity().runOnUiThread(() -> { - tvNotice.setVisibility(View.GONE); + tvNoticeContainer.setVisibility(View.GONE); fivNoticeHead.setVisibility(View.GONE); fivNoticeHead.stopAnim(); }); diff --git a/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml b/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml index cfe4238f5a..3ce2aa886f 100644 --- a/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml +++ b/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml @@ -41,19 +41,28 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" /> - + app:layout_constraintTop_toTopOf="parent" + android:layout_width="wrap_content" + android:background="@drawable/module_mogo_och_base_notice_box_bg" + android:layout_height="wrap_content"> + + + + app:layout_constraintRight_toRightOf="@id/module_mogo_och_notice_container" + app:layout_constraintTop_toTopOf="@id/module_mogo_och_notice_container"/>