From 316c99f4c627e6e68ef203305bebb2e16b24ffe0 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Mon, 25 Jul 2022 15:33:56 +0800
Subject: [PATCH] =?UTF-8?q?[290=20bus=E5=8F=B8=E6=9C=BA=E7=AB=AF]=20UI?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/och/bus/fragment/BusFragment.java  |  2 +-
 .../src/main/res/layout/fragment_och_bus.xml         | 12 ++++++++----
 .../och/common/module/utils/NumberFormatUtil.java    |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
index d711a2dceb..ff6d6b5d2c 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
@@ -238,7 +238,7 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
         if (isShow){
             mSwitchLine.setVisibility(View.VISIBLE);
         }else {
-            mSwitchLine.setVisibility(View.INVISIBLE);
+            mSwitchLine.setVisibility(View.GONE);
         }
     }
 
diff --git a/OCH/mogo-och-bus/src/main/res/layout/fragment_och_bus.xml b/OCH/mogo-och-bus/src/main/res/layout/fragment_och_bus.xml
index 6af29db03a..c9e7d8a07b 100644
--- a/OCH/mogo-och-bus/src/main/res/layout/fragment_och_bus.xml
+++ b/OCH/mogo-och-bus/src/main/res/layout/fragment_och_bus.xml
@@ -5,6 +5,7 @@
     android:id="@+id/module_och_bus_order_status_stationInfo"
     android:layout_width="@dimen/module_mogo_och_autopilot_order_bg_width"
     android:layout_height="wrap_content"
+    android:paddingBottom="@dimen/dp_28"
     android:background="@drawable/bus_line_panel_bg"
     app:layout_constraintLeft_toLeftOf="parent"
     app:layout_constraintTop_toTopOf="parent">
@@ -82,7 +83,7 @@
         android:id="@+id/module_och_bus_current_station"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="6px"
+        android:layout_marginTop="@dimen/dp_16"
         android:layout_marginRight="@dimen/dp_60"
         android:ellipsize="end"
         android:maxLines="2"
@@ -98,7 +99,7 @@
         android:id="@+id/module_och_bus_next_station_anchor"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/module_och_bus_order_distance_anchor_marginTop"
+        android:layout_marginTop="@dimen/dp_34"
         android:text="下一站："
         android:textColor="#CAD6FF"
         android:textSize="@dimen/module_och_bus_order_start_station_anchor_textSize"
@@ -110,15 +111,20 @@
         android:id="@+id/module_och_bus_order_end_station"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        app:layout_goneMarginTop="@dimen/dp_30"
+        android:layout_marginTop="@dimen/dp_16"
         android:layout_marginRight="@dimen/dp_60"
+        android:layout_marginBottom="@dimen/dp_30"
         android:ellipsize="end"
         android:maxLines="2"
+        app:layout_goneMarginBottom="@dimen/dp_40"
         android:text="--"
         android:textColor="#FFF"
         android:textSize="@dimen/module_mogo_och_bus_station_name_text_size"
         android:textStyle="bold"
         app:layout_constraintLeft_toLeftOf="@+id/module_och_bus_next_station_anchor"
         app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/switch_line_btn"
         app:layout_constraintTop_toBottomOf="@+id/module_och_bus_next_station_anchor"
         tools:text="后路站1" />
 
@@ -158,14 +164,12 @@
         android:layout_width="@dimen/bus_switch_line_btn_width_1"
         android:layout_height="@dimen/bus_switch_line_btn_height_1"
         android:layout_marginLeft="@dimen/dp_28"
-        android:layout_marginTop="@dimen/dp_30"
         android:background="@drawable/bus_switch_line_btn"
         android:gravity="center"
         android:text="@string/bus_switch_line_btn"
         android:textColor="@android:color/white"
         android:textSize="@dimen/module_mogo_och_bus_station_notice_text_size"
         android:visibility="visible"
-        app:layout_constraintTop_toBottomOf="@+id/module_och_bus_order_end_station"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent" />
 
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/NumberFormatUtil.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/NumberFormatUtil.java
index 984d132feb..4c626a4659 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/NumberFormatUtil.java
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/NumberFormatUtil.java
@@ -9,7 +9,7 @@ import java.math.RoundingMode;
  */
 public class NumberFormatUtil {
     /**
-     * 有小数两位， 没有小数保留整数
+     * 有小数1位， 没有小数保留整数
      * @param d
      * @return
      */