主要变更: **类型系统重构** - HomeInfo.ID/RoomInfo.ID/HomeID 从 string 改为 int64,json tag 使用 ,string - GetHome/GetRooms/GetRoomDevices 接口同步修改 - 新增 int64FromStr 工具函数,更新 parseHomeInfo 解析逻辑 **新增 Speaker 设备** - 新增 KindSpeaker 类型 - classify 映射覆盖 speaker/bluetooth-speaker/alarm-clock/media-player/playback/music **设备驱动重构** - AC 驱动彻底重写:从硬编码常量改为基于 SPEC ValueList 的动态 valMapper - 所有设备(Fan/Humidifier/Light/OccupancySensor/Switch/TempHumiditySensor/Thermostat/Vacuum/WaterHeater/Cover)新增 GetState() 和 FetchState(ctx) 接口 - base.go 新增 specResolver.format() 方法 **MIoT 模块增强** - MIoTClient 新增 homeIDs 字段,支持按家庭过滤设备 - RefreshDevices 支持 homeIDs 参数 - SpecStdLib 引入 logger.Logger,log.Printf 全部迁移为结构化日志 **其他** - Config 新增 RedirectURL 和 HomeIDs 字段 - AuthInfo.ExpiresIn 类型从 int 改为 int32 - UUID 生成简化为 hex.EncodeToString - 新增 github.com/sirupsen/logrus 依赖 - .gitignore 新增 examples/*/data/ 忽略规则 - 删除已提交的 config.json 敏感配置
105 lines
3.9 KiB
Go
105 lines
3.9 KiB
Go
package devices
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"xiaomihome/xiaomi"
|
|
)
|
|
|
|
// OccupancySensor 人在传感器读取接口(只读)。
|
|
type OccupancySensor interface {
|
|
Device
|
|
IsOccupied(ctx context.Context) (bool, error)
|
|
GetIlluminance(ctx context.Context) (float64, error)
|
|
|
|
OnStateChanged(handler func(occupied bool, illuminance float64)) (string, error)
|
|
GetState() (bool, float64)
|
|
FetchState(ctx context.Context) (bool, float64, error)
|
|
}
|
|
|
|
type occupancyDevice struct {
|
|
BaseDevice
|
|
propOccupancy siidPiid
|
|
propIlluminance siidPiid
|
|
stateCache [2]interface{} // [0]=bool occupied, [1]=float64 lux
|
|
}
|
|
|
|
func NewOccupancySensor(client *xiaomi.Client, info *xiaomi.DeviceInfo) (OccupancySensor, error) {
|
|
if info == nil { return nil, xiaomi.ErrDeviceNotFound }
|
|
miotDev := client.GetMIoTDevice(info.DID)
|
|
if miotDev == nil { return nil, fmt.Errorf("%w: device not initialized", xiaomi.ErrDeviceNotFound) }
|
|
spec := miotDev.SpecInstance()
|
|
if spec == nil { return nil, fmt.Errorf("%w: device has no SPEC information", xiaomi.ErrNotSupported) }
|
|
d := &occupancyDevice{BaseDevice: BaseDevice{client: client, info: info}}
|
|
for _, svc := range spec.Services {
|
|
for _, prop := range svc.Properties {
|
|
switch propertyShortName(prop.Type) {
|
|
case "occupancy":
|
|
if !d.propOccupancy.valid { d.propOccupancy = siidPiid{svc.IID, prop.PIID, true} }
|
|
case "illumination":
|
|
if !d.propIlluminance.valid { d.propIlluminance = siidPiid{svc.IID, prop.PIID, true} }
|
|
}
|
|
}
|
|
}
|
|
if !d.propOccupancy.valid { return nil, fmt.Errorf("%w: no occupancy property in SPEC", xiaomi.ErrNotSupported) }
|
|
return d, nil
|
|
}
|
|
|
|
func (d *occupancyDevice) IsOccupied(ctx context.Context) (bool, error) {
|
|
prop, err := d.GetProp(ctx, d.propOccupancy.siid, d.propOccupancy.piid)
|
|
if err != nil { return false, err }
|
|
if b, ok := prop.Value.(bool); ok { return b, nil }
|
|
return false, nil
|
|
}
|
|
func (d *occupancyDevice) GetIlluminance(ctx context.Context) (float64, error) {
|
|
if !d.propIlluminance.valid { return 0, xiaomi.ErrNotSupported }
|
|
prop, err := d.GetProp(ctx, d.propIlluminance.siid, d.propIlluminance.piid)
|
|
if err != nil { return 0, err }
|
|
return toFloat(prop.Value), nil
|
|
}
|
|
|
|
func (d *occupancyDevice) OnStateChanged(handler func(occupied bool, illuminance float64)) (string, error) {
|
|
if !d.propOccupancy.valid && !d.propIlluminance.valid { return "", xiaomi.ErrNotSupported }
|
|
return d.SubProp(0, 0, func(did string, prop *xiaomi.PropertyValue) {
|
|
switch {
|
|
case d.propOccupancy.valid && prop.SIID == d.propOccupancy.siid && prop.PIID == d.propOccupancy.piid:
|
|
if b, ok := prop.Value.(bool); ok { d.stateCache[0] = b }
|
|
case d.propIlluminance.valid && prop.SIID == d.propIlluminance.siid && prop.PIID == d.propIlluminance.piid:
|
|
d.stateCache[1] = toFloat(prop.Value)
|
|
}
|
|
occ, _ := d.stateCache[0].(bool)
|
|
lux, _ := d.stateCache[1].(float64)
|
|
handler(occ, lux)
|
|
})
|
|
}
|
|
|
|
func (d *occupancyDevice) GetState() (bool, float64) {
|
|
b, _ := d.stateCache[0].(bool)
|
|
f, _ := d.stateCache[1].(float64)
|
|
return b, f
|
|
}
|
|
func (d *occupancyDevice) FetchState(ctx context.Context) (bool, float64, error) {
|
|
keys := []xiaomi.PropKey{}
|
|
if d.propOccupancy.valid { keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: d.propOccupancy.siid, PIID: d.propOccupancy.piid}) }
|
|
if d.propIlluminance.valid { keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: d.propIlluminance.siid, PIID: d.propIlluminance.piid}) }
|
|
props, err := d.client.GetProps(ctx, keys)
|
|
if err != nil {
|
|
b, _ := d.stateCache[0].(bool)
|
|
f, _ := d.stateCache[1].(float64)
|
|
return b, f, err
|
|
}
|
|
var occupied bool
|
|
var illuminance float64
|
|
for _, p := range props {
|
|
switch {
|
|
case d.propOccupancy.valid && p.SIID == d.propOccupancy.siid && p.PIID == d.propOccupancy.piid:
|
|
occupied, _ = p.Value.(bool)
|
|
case d.propIlluminance.valid && p.SIID == d.propIlluminance.siid && p.PIID == d.propIlluminance.piid:
|
|
illuminance = toFloat(p.Value)
|
|
}
|
|
}
|
|
d.stateCache = [2]interface{}{occupied, illuminance}
|
|
return occupied, illuminance, nil
|
|
}
|