主要变更: **类型系统重构** - 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 敏感配置
133 lines
5.6 KiB
Go
133 lines
5.6 KiB
Go
package devices
|
|
|
|
import (
|
|
"context"
|
|
"xiaomihome/xiaomi"
|
|
)
|
|
|
|
// Thermostat 温控器统一控制接口
|
|
type Thermostat interface {
|
|
Device
|
|
TurnOn(ctx context.Context) error
|
|
TurnOff(ctx context.Context) error
|
|
IsOn(ctx context.Context) (bool, error)
|
|
SetTargetTemp(ctx context.Context, temp float64) error
|
|
GetTargetTemp(ctx context.Context) (float64, error)
|
|
GetCurrentTemp(ctx context.Context) (float64, error)
|
|
SetHeating(ctx context.Context, on bool) error
|
|
IsHeating(ctx context.Context) (bool, error)
|
|
|
|
OnStateChanged(handler func(state HeaterState, changed string)) (string, error)
|
|
GetState() HeaterState
|
|
FetchState(ctx context.Context) (HeaterState, error)
|
|
}
|
|
|
|
type thermostatDevice struct {
|
|
BaseDevice
|
|
propOn siidPiid
|
|
propTargetTemp siidPiid
|
|
propCurrentTemp siidPiid
|
|
propHeating siidPiid
|
|
stateCache HeaterState
|
|
}
|
|
|
|
func NewThermostat(client *xiaomi.Client, info *xiaomi.DeviceInfo) (Thermostat, error) {
|
|
d := &thermostatDevice{BaseDevice: NewBaseDevice(client, info)}
|
|
resolver := d.getSpecResolver()
|
|
if resolver == nil { return nil, xiaomi.ErrNoSPEC }
|
|
siid, piid, ok := resolver.find("on")
|
|
if !ok { return nil, xiaomi.ErrNotSupported }
|
|
d.propOn = siidPiid{siid, piid, true}
|
|
if s, p, ok := resolver.find("target-temperature"); ok { d.propTargetTemp = siidPiid{s, p, true} }
|
|
if s, p, ok := resolver.find("temperature"); ok { d.propCurrentTemp = siidPiid{s, p, true} }
|
|
if s, p, ok := resolver.find("heater"); ok { d.propHeating = siidPiid{s, p, true} }
|
|
return d, nil
|
|
}
|
|
|
|
func (d *thermostatDevice) TurnOn(ctx context.Context) error {
|
|
if !d.propOn.valid { return xiaomi.ErrNotSupported }
|
|
return d.SetProp(ctx, d.propOn.siid, d.propOn.piid, true)
|
|
}
|
|
func (d *thermostatDevice) TurnOff(ctx context.Context) error {
|
|
if !d.propOn.valid { return xiaomi.ErrNotSupported }
|
|
return d.SetProp(ctx, d.propOn.siid, d.propOn.piid, false)
|
|
}
|
|
func (d *thermostatDevice) IsOn(ctx context.Context) (bool, error) {
|
|
if !d.propOn.valid { return false, xiaomi.ErrNotSupported }
|
|
prop, err := d.GetProp(ctx, d.propOn.siid, d.propOn.piid)
|
|
if err != nil { return false, err }
|
|
if b, ok := prop.Value.(bool); ok { return b, nil }
|
|
return false, nil
|
|
}
|
|
func (d *thermostatDevice) SetTargetTemp(ctx context.Context, temp float64) error {
|
|
if !d.propTargetTemp.valid { return xiaomi.ErrNotSupported }
|
|
return d.SetProp(ctx, d.propTargetTemp.siid, d.propTargetTemp.piid, temp)
|
|
}
|
|
func (d *thermostatDevice) GetTargetTemp(ctx context.Context) (float64, error) {
|
|
if !d.propTargetTemp.valid { return 0, xiaomi.ErrNotSupported }
|
|
prop, err := d.GetProp(ctx, d.propTargetTemp.siid, d.propTargetTemp.piid)
|
|
if err != nil { return 0, err }
|
|
return toFloat(prop.Value), nil
|
|
}
|
|
func (d *thermostatDevice) GetCurrentTemp(ctx context.Context) (float64, error) {
|
|
if !d.propCurrentTemp.valid { return 0, xiaomi.ErrNotSupported }
|
|
prop, err := d.GetProp(ctx, d.propCurrentTemp.siid, d.propCurrentTemp.piid)
|
|
if err != nil { return 0, err }
|
|
return toFloat(prop.Value), nil
|
|
}
|
|
func (d *thermostatDevice) SetHeating(ctx context.Context, on bool) error {
|
|
if !d.propHeating.valid { return xiaomi.ErrNotSupported }
|
|
return d.SetProp(ctx, d.propHeating.siid, d.propHeating.piid, on)
|
|
}
|
|
func (d *thermostatDevice) IsHeating(ctx context.Context) (bool, error) {
|
|
if !d.propHeating.valid { return false, xiaomi.ErrNotSupported }
|
|
prop, err := d.GetProp(ctx, d.propHeating.siid, d.propHeating.piid)
|
|
if err != nil { return false, err }
|
|
if b, ok := prop.Value.(bool); ok { return b, nil }
|
|
return false, nil
|
|
}
|
|
|
|
func (d *thermostatDevice) OnStateChanged(handler func(state HeaterState, changed string)) (string, error) {
|
|
type field struct{ siid, piid int; name string; fill func(*HeaterState, interface{}) }
|
|
var fields []field
|
|
if d.propOn.valid {
|
|
fields = append(fields, field{d.propOn.siid, d.propOn.piid, "on", func(s *HeaterState, v interface{}) { s.On, _ = v.(bool) }})
|
|
}
|
|
if d.propTargetTemp.valid {
|
|
fields = append(fields, field{d.propTargetTemp.siid, d.propTargetTemp.piid, "target-temperature", func(s *HeaterState, v interface{}) { s.TargetTemp = toFloat(v) }})
|
|
}
|
|
if d.propCurrentTemp.valid {
|
|
fields = append(fields, field{d.propCurrentTemp.siid, d.propCurrentTemp.piid, "temperature", func(s *HeaterState, v interface{}) { s.CurrentTemp = toFloat(v) }})
|
|
}
|
|
if len(fields) == 0 { return "", xiaomi.ErrNotSupported }
|
|
return d.SubProp(0, 0, func(did string, prop *xiaomi.PropertyValue) {
|
|
for _, f := range fields {
|
|
if f.siid == prop.SIID && f.piid == prop.PIID {
|
|
f.fill(&d.stateCache, prop.Value)
|
|
handler(d.stateCache, f.name)
|
|
return
|
|
}
|
|
}
|
|
})
|
|
}
|
|
|
|
func (d *thermostatDevice) GetState() HeaterState { return d.stateCache }
|
|
func (d *thermostatDevice) FetchState(ctx context.Context) (HeaterState, error) {
|
|
keys := []xiaomi.PropKey{}
|
|
if d.propOn.valid { keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: d.propOn.siid, PIID: d.propOn.piid}) }
|
|
if d.propTargetTemp.valid { keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: d.propTargetTemp.siid, PIID: d.propTargetTemp.piid}) }
|
|
if d.propCurrentTemp.valid { keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: d.propCurrentTemp.siid, PIID: d.propCurrentTemp.piid}) }
|
|
props, err := d.client.GetProps(ctx, keys)
|
|
if err != nil { return d.stateCache, err }
|
|
state := HeaterState{}
|
|
for _, p := range props {
|
|
switch {
|
|
case d.propOn.valid && p.SIID == d.propOn.siid && p.PIID == d.propOn.piid: state.On, _ = p.Value.(bool)
|
|
case d.propTargetTemp.valid && p.SIID == d.propTargetTemp.siid && p.PIID == d.propTargetTemp.piid: state.TargetTemp = toFloat(p.Value)
|
|
case d.propCurrentTemp.valid && p.SIID == d.propCurrentTemp.siid && p.PIID == d.propCurrentTemp.piid: state.CurrentTemp = toFloat(p.Value)
|
|
}
|
|
}
|
|
d.stateCache = state
|
|
return state, nil
|
|
}
|