Fix Contact Sensor not working (#75)

0x5e · Nov 13, 2022 · 2d7346e · 2d7346e
1 parent 7405b10
commit 2d7346e
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/src/accessory/ContactSensorAccessory.ts b/src/accessory/ContactSensorAccessory.ts
@@ -7,17 +7,25 @@ export default class ContaceSensor extends BaseAccessory {
   constructor(platform: TuyaPlatform, accessory: PlatformAccessory) {
     super(platform, accessory);
 
-    const service = this.accessory.getService(this.Service.ContactSensor)
+    const schema = this.getContactSensorSchema();
+    if (schema) {
+      const service = this.accessory.getService(this.Service.ContactSensor)
       || this.accessory.addService(this.Service.ContactSensor);
 
-    service.getCharacteristic(this.Characteristic.ContactSensorState)
-      .onGet(() => {
-        const status = this.getStatus('doorcontact_state');
-        return status!.value ?
-          this.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED:
-          this.Characteristic.ContactSensorState.CONTACT_DETECTED;
-      });
+      const { CONTACT_NOT_DETECTED, CONTACT_DETECTED } = this.Characteristic.ContactSensorState;
+      service.getCharacteristic(this.Characteristic.ContactSensorState)
+        .onGet(() => {
+          const status = this.getStatus(schema.code)!;
+          return status.value ? CONTACT_NOT_DETECTED : CONTACT_DETECTED;
+        });
+    }
 
+
+  }
+
+  getContactSensorSchema() {
+    return this.getSchema('doorcontact_state')
+      || this.getSchema('switch');
   }
 
 }