|
|
@@ -1578,7 +1578,10 @@ Page({
|
|
|
obj.isAromAtomization = obj.friendly_name.includes('香薰机雾化')
|
|
|
obj.isAromatherapy = obj.friendly_name.endsWith('香薰机') || obj.friendly_name.endsWith('香薰机开关')
|
|
|
if (obj.entity_id && obj.state && checkState(obj.state) && obj.friendly_name && obj.domain && !obj.isAromlight && !obj.isAromAtomization && !obj.isAromatherapy) {
|
|
|
- listSwitchTemp.push(obj)
|
|
|
+
|
|
|
+ if (!obj.friendly_name.endsWith("电视")) {
|
|
|
+ listSwitchTemp.push(obj)
|
|
|
+ }
|
|
|
} else if ((obj.isAromlight || obj.isAromAtomization || obj.isAromatherapy) && checkState(obj.state)) {
|
|
|
listAromatherapyMachineTemp.push(obj)
|
|
|
}
|
|
|
@@ -2850,7 +2853,10 @@ Page({
|
|
|
obj.isAromAtomization = obj.friendly_name.includes('香薰机雾化')
|
|
|
obj.isAromatherapy = obj.friendly_name.endsWith('香薰机') || obj.friendly_name.endsWith('香薰机开关')
|
|
|
if (obj.entity_id && obj.state && checkState(obj.state) && obj.friendly_name && obj.domain && obj.domain != 'automation' && !obj.isAromlight && !obj.isAromAtomization && !obj.isAromatherapy) {
|
|
|
- listSwitchTemp.push(obj)
|
|
|
+
|
|
|
+ if (!obj.friendly_name.endsWith("电视")) {
|
|
|
+ listSwitchTemp.push(obj)
|
|
|
+ }
|
|
|
} else if ((obj.isAromlight || obj.isAromAtomization || obj.isAromatherapy) && checkState(obj.state)) {
|
|
|
listAromatherapyMachineTemp.push(obj)
|
|
|
}
|
|
|
@@ -3400,7 +3406,10 @@ Page({
|
|
|
obj.isAromAtomization = obj.friendly_name.includes('香薰机雾化')
|
|
|
obj.isAromatherapy = obj.friendly_name.endsWith('香薰机') || obj.friendly_name.endsWith('香薰机开关')
|
|
|
if (obj.entity_id && obj.state && checkState(obj.state) && obj.friendly_name && obj.domain && obj.domain != 'automation' && obj.domain != 'automation' && !obj.isAromlight && !obj.isAromAtomization && !obj.isAromatherapy) {
|
|
|
- listSwitchTemp.push(obj)
|
|
|
+
|
|
|
+ if (!obj.friendly_name.endsWith("电视")) {
|
|
|
+ listSwitchTemp.push(obj)
|
|
|
+ }
|
|
|
} else if ((obj.isAromlight || obj.isAromAtomization || obj.isAromatherapy) && checkState(obj.state)) {
|
|
|
listAromatherapyMachineTemp.push(obj)
|
|
|
}
|