From 105cf686b724dc776887ec399eea7741f30ed67b Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 1 Mar 2023 21:49:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[m1]=20[1.0.2]=20[=E5=8A=A8=E7=94=BB?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E5=89=8D=E4=B8=8D=E6=98=BE=E7=A4=BA=E8=83=8C?= =?UTF-8?q?=E6=99=AF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt index e8152785d0..59548bb634 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt @@ -16,6 +16,7 @@ import android.widget.SeekBar import android.widget.SeekBar.OnSeekBarChangeListener import android.widget.TextView import androidx.core.content.ContextCompat +import androidx.core.view.isVisible import androidx.recyclerview.widget.LinearSnapHelper import androidx.recyclerview.widget.SnapHelper import com.mogo.commons.mvp.MvpFragment @@ -409,7 +410,9 @@ class M1SoftFragment : if(enable){ adapter.setEnable(true) if(tv_setting_aircondition.isChecked) { - iv_temperature_select.visibility = View.VISIBLE + if(iv_loading.visibility==View.GONE){ + iv_temperature_select.visibility = View.VISIBLE + } } rb_wind_speed_low.setTextColor(ContextCompat.getColorStateList(requireContext(),R.color.bus_p_function_airconditon_pattern_text_color_selector)) }else{ From eeff0d2e46d707a56b0010cb3635e8027dcbe8a1 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 1 Mar 2023 21:52:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[m1]=20[1.1.2]=20[tts=20=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E5=AF=BC=E5=85=A5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 7b5e3a5c69..35dbcd418f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -325,7 +325,7 @@ dependencies { implementation rootProject.ext.dependencies.mogocustommap implementation project(':libraries:map-usbcamera') - implementation project(':tts:tts-pad') + implementation project(':tts:tts-iflytek') implementation project(':core:function-impl:mogo-core-function-startup') implementation project(':core:function-impl:mogo-core-function-devatools') implementation project(':core:function-impl:mogo-core-function-datacenter')