Merge pull request #21 from Oldcucumber/master

修复了加湿器的按钮视图，屏蔽了暂时不可用的恒湿模式
sky130 · May 5, 2024 · b0f64ca · b0f64ca
2 parents eb318fb + bdb5945
commit b0f64ca
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/app/src/main/java/com/github/miwu/miot/InitSpecAtt.kt b/app/src/main/java/com/github/miwu/miot/InitSpecAtt.kt
@@ -50,6 +50,8 @@ fun initSpecAttFun(
 
     "fan" -> Fan(device, layout, manager)
 
+    "Humidifier" -> Humidifier(device, layout, manager)
+
     "control-panel" -> ControlPanel(device, layout, manager)
 
     else -> {

diff --git a/app/src/main/java/com/github/miwu/miot/widget/HumidifierBar.kt b/app/src/main/java/com/github/miwu/miot/widget/HumidifierBar.kt
@@ -16,12 +16,14 @@ class HumidifierBar(context: Context) : MiotBaseWidget<Binding>(context) {
             field = value
             refreshOn(value)
         }
+
+    private val levelList get() = getProperty("fan-level").valueList!!
+
     private var level = 1
         set(value) {
             field = value
             setLevelDebug(value)
         }
-    private val levelList = getProperty("fan-level").valueList!!
 
 
     override fun init() {
@@ -37,6 +39,16 @@ class HumidifierBar(context: Context) : MiotBaseWidget<Binding>(context) {
             } else {
                 index++
             }
+
+            // 如果当前索引对应的元素的值为 4，则再增加一次索引，跳过该元素
+            if (index < levelList.size && levelList[index].value == 4) {
+                index++
+            }
+            // 如果索引超出了列表范围，则重置为 0
+            if (index >= levelList.size) {
+                index = 0
+            }//该段为暂时屏蔽没有用的恒湿模式使用，后续如果上线恒湿可以删掉
+
             val obj = getPropertyWithSiid("fan-level")
             this.level = levelList[index].value
             putValue(level, obj.first, obj.second.iid)