From 9cb1947522bbb0d6e879af3c36f798677c4768ff Mon Sep 17 00:00:00 2001
From: chenfufeng <chenfufeng@zhidaoauto.com>
Date: Fri, 6 May 2022 11:27:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[Update]debug=E6=A8=A1=E5=BC=8F=E4=B8=8B?=
 =?UTF-8?q?=E5=85=B3=E9=97=ADtts=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java b/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java
index 691033e5e6..e8aa685a9e 100644
--- a/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java
+++ b/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java
@@ -131,9 +131,9 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
                     .setSavedDirPath("/sdcard/aispeech/echo")//设置echo前后音频保存路径
                     .create();
 
-            if (BuildConfig.DEBUG) {
-                DUILiteSDK.openLog();//开启日志，需要在sdk init 之前调用
-            }
+//            if (BuildConfig.DEBUG) {
+//                DUILiteSDK.openLog();//开启日志，需要在sdk init 之前调用
+//            }
 
             DUILiteSDK.init(mContext, new DUILiteConfig.Builder()
                     .setApiKey("113cc31f6385113cc31f6385618c86f5")

From eff7456acd59c3142ab4e42696b381ba6761a912 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Fri, 6 May 2022 11:54:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[Taxi/Bus=20v2.6.6]=20bus=20driver=20?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E8=B7=AF=E7=BA=BFUI=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/activity_bus_switch_line.xml   |  1 +
 .../main/res/layout/bus_switch_line_list_item.xml  | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/OCH/mogo-och-bus/src/main/res/layout/activity_bus_switch_line.xml b/OCH/mogo-och-bus/src/main/res/layout/activity_bus_switch_line.xml
index 0c04f9c833..91d2b5134d 100644
--- a/OCH/mogo-och-bus/src/main/res/layout/activity_bus_switch_line.xml
+++ b/OCH/mogo-och-bus/src/main/res/layout/activity_bus_switch_line.xml
@@ -48,6 +48,7 @@
         android:fadingEdgeLength="40dp"
         android:layout_marginTop="@dimen/dp_50"
         android:layout_marginLeft="@dimen/dp_80"
+        android:layout_marginRight="@dimen/dp_80"
         android:layout_marginBottom="@dimen/dp_30"/>
 
     <TextView
diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_switch_line_list_item.xml b/OCH/mogo-och-bus/src/main/res/layout/bus_switch_line_list_item.xml
index 273b53d516..3119ef90c8 100644
--- a/OCH/mogo-och-bus/src/main/res/layout/bus_switch_line_list_item.xml
+++ b/OCH/mogo-och-bus/src/main/res/layout/bus_switch_line_list_item.xml
@@ -2,7 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="282px">
+    android:layout_height="wrap_content"
+    android:paddingBottom="@dimen/dp_80">
 
     <ImageView
         android:id="@+id/switch_line_item_select_iv"
@@ -14,11 +15,14 @@
 
     <TextView
         android:id="@+id/switch_line_name"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toRightOf="@+id/switch_line_item_select_iv"
         android:layout_marginLeft="@dimen/dp_33"
+        android:maxLines="2"
+        android:ellipsize="end"
         android:textStyle="bold"
         android:textColor="@android:color/white"
         android:text="@string/bus_switch_line_name"
@@ -26,7 +30,7 @@
 
     <TextView
         android:id="@+id/switch_line_start_station"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/dp_17"
         android:layout_marginTop="@dimen/dp_30"
@@ -35,6 +39,7 @@
         android:text="@string/bus_switch_line_start"
         android:textColor="#B9C3E9"
         android:textSize="@dimen/dp_36"
+        app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/switch_line_name"
         app:layout_constraintLeft_toRightOf="@+id/switch_line_start_greenDot"/>
 
@@ -69,7 +74,7 @@
 
     <TextView
         android:id="@+id/switch_line_end_station"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/dp_17"
         android:layout_marginTop="@dimen/dp_30"
@@ -78,6 +83,7 @@
         android:text="@string/bus_switch_line_end"
         android:textColor="#B9C3E9"
         android:textSize="@dimen/dp_36"
+        app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintLeft_toRightOf="@+id/switch_line_end_blueDot"
         app:layout_constraintTop_toBottomOf="@+id/switch_line_start_station"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file