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

Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0

Browse Source
This commit is contained in:
wangmingjun
2023-03-01 21:56:11 +08:00
parent 98820f2f65 eeff0d2e46
commit 0466ef4ce9
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt
View File

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

2
app/build.gradle
View File

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