From 99a82a9244a1de1a6efb4400994db3f87d77905f Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@ybm100.com>
Date: Fri, 27 May 2022 14:47:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=92=AD=E6=94=BE=E7=A6=81?=
 =?UTF-8?q?=E6=AD=A2=E6=8B=96=E5=8A=A8=E5=92=8C=E5=8F=8C=E5=87=BB=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E5=BC=80=E5=A7=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../taxi/passenger/network/TaxiPassengerServiceManager.java   | 4 ++--
 .../src/main/res/layout/taxi_p_passenger_check_panel.xml      | 3 ++-
 OCH/mogo-och-taxi-passenger/src/main/res/values/strings.xml   | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

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 @@
     <string name="taxi_p_check_hello_text">Hello，您好</string>
     <string name="taxi_p_check_input_phone_tail_title">请输出手机号后4位:</string>
     <string name="taxi_p_check_small_mogo">小蘑菇</string>
+    <string name="tv_delete">删除</string>
 </resources>
\ No newline at end of file