diff --git a/app/src/main/java/com/casic/br/view/device/RangeHoodActivity.kt b/app/src/main/java/com/casic/br/view/device/RangeHoodActivity.kt index 12d120d..071b55a 100644 --- a/app/src/main/java/com/casic/br/view/device/RangeHoodActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/RangeHoodActivity.kt @@ -36,6 +36,8 @@ private val inflater by lazy { LayoutInflater.from(this) } private var fragmentPages: ArrayList = ArrayList() private lateinit var deviceInstance: ITuyaDevice + private var isWorking = false + private var isDelayed = false override fun initLayoutView(): Int = R.layout.activity_range_hood @@ -81,8 +83,6 @@ override fun onDpUpdate(devId: String?, dpStr: String?) { Log.d(kTag, "onDpUpdate: $dpStr") val parseObject = JSONObject.parseObject(dpStr) - var isWorking = false - var isDelayed = false parseObject.keys.forEach { when (it) { "1" -> { @@ -92,12 +92,15 @@ isDelayed = parseObject[it] as Boolean } "105" -> { - delayTimeView.text = - if (isWorking && isDelayed) { + if (isWorking) { + delayTimeView.text = if (isDelayed) { String.format("${parseObject[it].toString()}s") } else { "0s" } + } else { + delayTimeView.text = "未开启" + } } } }