yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_robotaxi-d-app-module_266_220425_2.6.6' into dev_robobus-d_220427_local

Browse Source
This commit is contained in:
wangmingjun
2022-05-06 11:55:08 +08:00
parent 56fc483c45 eff7456acd
commit 0eef785296
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OCH/mogo-och-bus/src/main/res/layout/activity_bus_switch_line.xml
View File

@@ -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

14
OCH/mogo-och-bus/src/main/res/layout/bus_switch_line_list_item.xml
View File

@@ -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>

6
tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java
View File

@@ -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")