diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java index 17e26d4f0b..023888b7d8 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java @@ -221,7 +221,7 @@ public class OchBusFragment extends BaseOchFragment< OchBusFragment, OchBusPrese isOperationStatus = launch; if ( launch ) { tvOperationStatus.setText( "收车" ); - showSlidePanle("滑动出发"); +// showSlidePanle("滑动出发"); showPanel(); } else { AIAssist.getInstance(getContext()).speakTTSVoice("已收车"); diff --git a/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml b/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml index 888fec075e..184f70bcd8 100644 --- a/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml +++ b/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml @@ -72,6 +72,7 @@ android:layout_height="wrap_content" android:text="上车" android:textColor="@color/module_och_taxi_order_start_station_anchor_textColor" + android:layout_marginRight="@dimen/module_och_taxi_order_text_marginRight" android:textSize="@dimen/module_och_taxi_order_start_station_anchor_textSize" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@+id/module_och_taxi_order_start_station" @@ -116,6 +117,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="下车" + android:layout_marginRight="@dimen/module_och_taxi_order_text_marginRight" android:textColor="@color/module_och_taxi_order_end_station_anchor_textColor" android:textSize="@dimen/module_och_taxi_order_end_station_anchor_textSize" android:textStyle="bold" diff --git a/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml b/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml index 95796c9ef6..8e162d85e5 100644 --- a/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -5,7 +5,7 @@ 15px 25px 25px - 20px + 32px 1px 20px 20px @@ -24,4 +24,5 @@ 32px 36px 17px + 31.5 \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/res/values/dimens.xml b/OCH/mogo-och-taxi/src/main/res/values/dimens.xml index 954782677b..ff8e1c5530 100644 --- a/OCH/mogo-och-taxi/src/main/res/values/dimens.xml +++ b/OCH/mogo-och-taxi/src/main/res/values/dimens.xml @@ -24,4 +24,5 @@ 20px 24px 17px + 22.5px \ No newline at end of file diff --git a/OCH/mogo-och/src/main/java/com/mogo/och/view/SlidePanelView.java b/OCH/mogo-och/src/main/java/com/mogo/och/view/SlidePanelView.java index ee4785e198..fd2c4ddd65 100644 --- a/OCH/mogo-och/src/main/java/com/mogo/och/view/SlidePanelView.java +++ b/OCH/mogo-och/src/main/java/com/mogo/och/view/SlidePanelView.java @@ -57,7 +57,7 @@ public class SlidePanelView extends View { private final Paint blockPaint = new Paint(Paint.ANTI_ALIAS_FLAG); private final Paint textPaint = new Paint(Paint.ANTI_ALIAS_FLAG); - private static int textSize = 40; + private static int textSize = 67; private static int BLOCK_START_X = 15; private static int BLOCK_START_Y = 15; private static int NORMAL_TEXT_MARGIN_LEFT = 40; diff --git a/gradle.properties b/gradle.properties index 5b32afb1b0..995425e5dc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -187,3 +187,4 @@ applicationId=com.mogo.launcer applicationName=IntelligentPilot versionCode=80007 versionName=8.0.7 +MAP_SDK_VERSION=1.0.0-vr-8.5.49 \ No newline at end of file