From 43b11d675184194a2bcc2c97e4f1c03f087b14c8 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 23 May 2023 15:55:22 +0800 Subject: [PATCH] =?UTF-8?q?[bugfix]=20[3.2.0]=20[=E7=BB=88=E7=82=B9?= =?UTF-8?q?=E5=9D=90=E6=A0=87=E3=80=81=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bus/passenger/presenter/BusPassengerPresenter.kt | 2 +- .../layout/m1_novice_guidance_welcome_fragment.xml | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt index 2e1fd4a181..cb21c0746b 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt @@ -348,7 +348,7 @@ class BusPassengerPresenter(view: MainFragment?) : it.wgs84Lat!! ) - val latLng = LatLng(coordinateConverterWgsToGcj.longitude, coordinateConverterWgsToGcj.latitude) + val latLng = LatLng(coordinateConverterWgsToGcj.latitude, coordinateConverterWgsToGcj.longitude) mView?.drawEndStation(latLng) } } diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_novice_guidance_welcome_fragment.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_novice_guidance_welcome_fragment.xml index 32e9cf3a81..f5cd6e00d2 100644 --- a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_novice_guidance_welcome_fragment.xml +++ b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_novice_guidance_welcome_fragment.xml @@ -68,7 +68,7 @@ android:id="@+id/actv_userinfo_title" app:layout_constraintTop_toTopOf="@+id/actv_contain_order_info" app:layout_constraintStart_toStartOf="@+id/actv_contain_order_info" - android:layout_marginTop="@dimen/dp_59" + android:layout_marginTop="@dimen/dp_74" android:layout_marginStart="@dimen/dp_100" android:text="用户信息：" android:textColor="@color/bus_p_m1_20418D" @@ -81,6 +81,8 @@ app:layout_constraintTop_toBottomOf="@+id/actv_userinfo_title" app:layout_constraintStart_toStartOf="@+id/actv_userinfo_title" android:text="*** *** ***" + android:fontFamily="@font/din" + android:layout_marginTop="@dimen/dp_15" android:textColor="@color/bus_p_m1_222222" android:textSize="@dimen/dp_45" android:layout_width="wrap_content" @@ -90,7 +92,7 @@ android:id="@+id/actv_order_time_title" app:layout_constraintTop_toBottomOf="@+id/actv_userinfo" app:layout_constraintStart_toStartOf="@+id/actv_userinfo" - android:layout_marginTop="@dimen/dp_29" + android:layout_marginTop="@dimen/dp_60" android:text="用车时间：" android:textColor="@color/bus_p_m1_20418D" android:textSize="@dimen/dp_30" @@ -102,6 +104,8 @@ app:layout_constraintTop_toBottomOf="@+id/actv_order_time_title" app:layout_constraintStart_toStartOf="@+id/actv_order_time_title" android:text="9:00-18:00" + android:fontFamily="@font/din" + android:layout_marginTop="@dimen/dp_15" android:textColor="@color/bus_p_m1_222222" android:textSize="@dimen/dp_45" android:layout_width="wrap_content" @@ -113,7 +117,7 @@ app:layout_constraintStart_toStartOf="@+id/actv_contain_order_info" app:layout_constraintEnd_toEndOf="@+id/actv_contain_order_info" app:layout_constraintBottom_toBottomOf="@+id/actv_contain_order_info" - android:layout_marginBottom="@dimen/dp_81" + android:layout_marginBottom="@dimen/dp_85" android:layout_width="@dimen/dp_360" android:layout_height="@dimen/dp_80"/> @@ -126,6 +130,7 @@ app:layout_constraintBottom_toBottomOf="@+id/v_clikc_go_explore_bg" android:layout_marginEnd="@dimen/dp_10" android:text="点击开始探索" + android:textStyle="bold" android:textColor="@android:color/white" android:textSize="@dimen/dp_30" android:layout_width="wrap_content"