diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java index 8f319e12b6..c22ba2956d 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java @@ -52,8 +52,8 @@ public class TaxiPassengerServiceManager { * @return */ private String getDriverAppSn(){ -// return CallerTelematicManager.INSTANCE.getServerToken(); - return "X2020220425Q466X1F"; + return CallerTelematicManager.INSTANCE.getServerToken(); +// return "X2020220425Q466X1F"; } /** diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml index 8c3e716a90..e7dc22f64a 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml @@ -269,8 +269,9 @@ android:id="@+id/tv_taxi_passenger_number_back" android:layout_marginEnd="@dimen/dp_30" android:background="@drawable/bg_taxi_p_keyboard_background" - android:text="x" + android:text="@string/tv_delete" style="@style/och_check_number_keyboard" + android:textSize="@dimen/sp_36" app:layout_constraintEnd_toStartOf="@+id/tv_taxi_passenger_number_submit" app:layout_constraintStart_toEndOf="@+id/tv_taxi_passenger_number_zero" app:layout_constraintTop_toTopOf="@+id/tv_taxi_passenger_number_nine" /> diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/strings.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values/strings.xml index 9f66fe500a..09eea7fcc8 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/values/strings.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/values/strings.xml @@ -30,4 +30,5 @@ Hello,您好 请输出手机号后4位: 小蘑菇 + 删除 \ No newline at end of file