From 3f2a2db46dc0da787d159e3507c4808223af6b57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Fri, 14 May 2021 12:50:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E5=88=87=E6=8D=A2=E8=A7=86?=
 =?UTF-8?q?=E8=A7=92=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java    | 2 +-
 .../src/main/res/layout/module_mogo_och_base_fragment.xml    | 5 +++--
 OCH/mogo-och/src/main/res/values-xhdpi-2560x1600/dimens.xml  | 4 ++--
 .../src/main/res/layout/module_ext_layout_entrance.xml       | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
index 1f095f1887..ecdb512c14 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
@@ -46,7 +46,7 @@ class MogoOCHTaxiModel {
     /**
      * 到达起始点围栏
      */
-    public static final int ARRIVE_AT_START_STATION_DISTANCE = 10;
+    public static final int ARRIVE_AT_START_STATION_DISTANCE = 20;
 
     private static volatile MogoOCHTaxiModel sInstance;
 
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 890e9ab8d8..66ae400e43 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
@@ -3,8 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/module_mogo_och_margin_bottom">
+    android:layout_height="match_parent">
 
     <CheckedTextView
         android:id="@+id/module_mogo_och_autopilot_status"
@@ -44,6 +43,7 @@
         android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"
         android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"
         android:layout_marginLeft="@dimen/module_mogo_och_autopilot_status_text_m_l"
+        android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"
         android:background="@drawable/module_mogo_och_operation_status_bg"
         android:elevation="@dimen/dp_10"
         android:gravity="center"
@@ -59,6 +59,7 @@
         android:id="@+id/module_mogo_och_slide_panel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"
         android:visibility="gone"
         app:BLOCK_START_X="@dimen/module_mogo_och_slide_panel_block_start_x"
         app:BLOCK_START_Y="@dimen/module_mogo_och_slide_panel_block_start_y"
diff --git a/OCH/mogo-och/src/main/res/values-xhdpi-2560x1600/dimens.xml b/OCH/mogo-och/src/main/res/values-xhdpi-2560x1600/dimens.xml
index 90c60c7488..c384e61bb5 100644
--- a/OCH/mogo-och/src/main/res/values-xhdpi-2560x1600/dimens.xml
+++ b/OCH/mogo-och/src/main/res/values-xhdpi-2560x1600/dimens.xml
@@ -21,8 +21,8 @@
     <dimen name="module_mogo_och_autopilot_status_bg_width">460px</dimen>
     <dimen name="module_mogo_och_autopilot_status_bg_height">140px</dimen>
 
-    <dimen name="module_mogo_och_operation_status_bg_width">144px</dimen>
-    <dimen name="module_mogo_och_operation_status_bg_height">144px</dimen>
+    <dimen name="module_mogo_och_operation_status_bg_width">145px</dimen>
+    <dimen name="module_mogo_och_operation_status_bg_height">145px</dimen>
 
     <dimen name="module_mogo_och_operation_status_padding">92px</dimen>
 
diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
index f5b8e825f0..34b9c40586 100644
--- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
+++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
@@ -51,7 +51,7 @@
         android:layout_width="@dimen/module_switch_map"
         android:layout_height="@dimen/module_switch_map"
         android:layout_marginLeft="@dimen/dp_20"
-        android:layout_marginBottom="@dimen/dp_20"
+        android:layout_marginBottom="46px"
         android:elevation="@dimen/dp_10"
         android:padding="@dimen/dp_20"
         android:visibility="gone"