From d4660b2d7042e82bf97170316f8e253c3bc73499 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 18 May 2023 19:49:10 +0800 Subject: [PATCH] =?UTF-8?q?[charter]=20[3.2.0]=20[UI=E3=80=81tts=E9=97=B4?= =?UTF-8?q?=E9=9A=94=E5=8F=98=E5=B0=8F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/bus/passenger/receive/DriverMessage.kt | 3 ++- .../ui/dialogfragment/DebugViewWatchDogFragment.kt | 7 +++++++ .../src/main/res/layout/m1_main_fragment.xml | 6 +++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/receive/DriverMessage.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/receive/DriverMessage.kt index 74e9af28f7..1f4eb3cbe2 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/receive/DriverMessage.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/receive/DriverMessage.kt @@ -23,6 +23,7 @@ import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.common.module.utils.SoundPoolHelper import com.mogo.och.common.module.voice.VoiceNotice +import com.mogo.tts.base.IMogoTTSCallback object DriverMessage: IReceivedMsgListener { override fun onReceivedMsg(type: Int, byteArray: ByteArray) { @@ -55,7 +56,7 @@ object DriverMessage: IReceivedMsgListener { VoiceNotice.showNotice(msg.msg, AIAssist.LEVEL1) if(msg.msg.contains("核销成功")){ val string = AbsMogoApplication.getApp().getString(R.string.m1_welcome_tts) - VoiceNotice.showNotice(string, AIAssist.LEVEL1,15_000) + VoiceNotice.showNotice(string, AIAssist.LEVEL1,4_000) } } } diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/DebugViewWatchDogFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/DebugViewWatchDogFragment.kt index c891e5b98c..a93b1a9814 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/DebugViewWatchDogFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/DebugViewWatchDogFragment.kt @@ -16,6 +16,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ import com.mogo.eagle.core.utilcode.util.AppStateManager import com.mogo.eagle.core.utilcode.util.BarUtils import com.mogo.eagle.core.utilcode.util.ClickUtils +import com.mogo.eagle.core.utilcode.util.KeyboardUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.presenter.DebugWatchDogPresenter @@ -48,6 +49,9 @@ class DebugViewWatchDogFragment : }else{ if(text.toString() == "123987"){ dismissAllowingStateLoss() + dialog?.window?.let { + KeyboardUtils.hideSoftInput(it) + } ToggleDebugView.toggleDebugView.toggle(requireContext()) }else{ ToastUtils.showShort("请输入正确密码") @@ -55,6 +59,9 @@ class DebugViewWatchDogFragment : } } actv_cancle.setOnClickListener { + dialog?.window?.let { + KeyboardUtils.hideSoftInput(it) + } dismissAllowingStateLoss() } } diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml index ddcd9d5d72..eebd97bc98 100644 --- a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml +++ b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml @@ -109,7 +109,7 @@ app:layout_constraintBottom_toTopOf="@+id/tv_distance_unit" app:layout_constraintVertical_chainStyle="packed" android:fontFamily="@font/din" - android:text="80" + android:text="--" android:textSize="@dimen/dp_37" android:textColor="@color/bus_p_m1_203555" android:layout_width="wrap_content" @@ -144,7 +144,7 @@ app:layout_constraintVertical_chainStyle="packed" app:layout_constraintBottom_toTopOf="@+id/tv_distance_surplus_time_unit" app:layout_constraintHorizontal_chainStyle="packed" - android:text="80" + android:text="--" android:fontFamily="@font/din" android:textSize="@dimen/dp_37" android:textColor="@color/bus_p_m1_203555" @@ -179,7 +179,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintVertical_chainStyle="packed" - android:text="80" + android:text="--" android:fontFamily="@font/din" android:textSize="@dimen/dp_37" android:textColor="@color/bus_p_m1_203555"