diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt index d7fe05aea2..0ebb6c440b 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt @@ -383,11 +383,11 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba override fun setLightTop1View(leftLight: Boolean, isFirst: Boolean) { tv_light_top_01?.let { if (leftLight) { - tv_light_top_01.text = context.getString(R.string.charter_p_close_light1) + tv_light_top_01.text = context.getString(R.string.charter_p_open_light1) tv_light_top_01.isChecked = true if (!isFirst) ToastCharterUtils.showToastShort("打开顶灯1") } else { - tv_light_top_01.text = context.getString(R.string.charter_p_open_light1) + tv_light_top_01.text = context.getString(R.string.charter_p_close_light1) tv_light_top_01.isChecked = false if (!isFirst) ToastCharterUtils.showToastShort("关闭顶灯1") } @@ -397,11 +397,11 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba override fun setLightTop2View(rightLight: Boolean, isFirst: Boolean) { tv_light_top_02?.let { if (rightLight) { - tv_light_top_02.text = context.getString(R.string.charter_p__close_light2) + tv_light_top_02.text = context.getString(R.string.charter_p_open_light2) tv_light_top_02.isChecked = true if (!isFirst) ToastCharterUtils.showToastShort("打开顶灯2") } else { - tv_light_top_02.text = context.getString(R.string.charter_p_open_light2) + tv_light_top_02.text = context.getString(R.string.charter_p__close_light2) tv_light_top_02.isChecked = false if (!isFirst) ToastCharterUtils.showToastShort("关闭顶灯2") } @@ -411,12 +411,12 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba override fun setLightAtmosphereView(atmosphereLight: Boolean, isFirst: Boolean) { tv_light_atmosphere?.let { if (atmosphereLight) { - tv_light_atmosphere.text = context.getString(R.string.charter_p_close_atmosphere) + tv_light_atmosphere.text = context.getString(R.string.charter_p_open_atmosphere) tv_light_atmosphere.isChecked = true iv_bottom_light_setting.setImageResource(R.drawable.charter_p_function_atmosphere_select) if (!isFirst) ToastCharterUtils.showToastShort("打开氛围灯") } else { - tv_light_atmosphere.text = context.getString(R.string.charter_p_open_atmosphere) + tv_light_atmosphere.text = context.getString(R.string.charter_p_close_atmosphere) tv_light_atmosphere.isChecked = false iv_bottom_light_setting.setImageResource(R.drawable.charter_p_function_atmosphere_nor) if (!isFirst) ToastCharterUtils.showToastShort("关闭氛围灯") diff --git a/OCH/charter/passenger/src/main/res/values/strings.xml b/OCH/charter/passenger/src/main/res/values/strings.xml index 62696d8687..dc0b149dab 100644 --- a/OCH/charter/passenger/src/main/res/values/strings.xml +++ b/OCH/charter/passenger/src/main/res/values/strings.xml @@ -13,13 +13,13 @@ - 关闭顶灯1 - 关闭顶灯2 - 关闭氛围灯 + 开启顶灯1 + 开启顶灯2 + 开启氛围灯 - 开启顶灯1 - 开启顶灯2 - 开启氛围灯 + 关闭顶灯1 + 关闭顶灯2 + 关闭氛围灯 KM/h