主要变更: **类型系统重构** - 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 敏感配置
94 lines
3.7 KiB
Go
94 lines
3.7 KiB
Go
package devices
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"xiaomihome/xiaomi"
|
|
)
|
|
|
|
// TempHumiditySensor 温湿度传感器读取接口(只读)。
|
|
type TempHumiditySensor interface {
|
|
Device
|
|
GetTemperature(ctx context.Context) (float64, error)
|
|
GetHumidity(ctx context.Context) (float64, error)
|
|
|
|
OnStateChanged(handler func(temp, humidity float64)) (string, error)
|
|
GetState() (float64, float64)
|
|
FetchState(ctx context.Context) (float64, float64, error)
|
|
}
|
|
|
|
type tempHumidityDevice struct {
|
|
BaseDevice
|
|
propTemp siidPiid
|
|
propHumidity siidPiid
|
|
stateCache [2]float64 // [0]=temperature, [1]=humidity
|
|
}
|
|
|
|
func NewTempHumiditySensor(client *xiaomi.Client, info *xiaomi.DeviceInfo) (TempHumiditySensor, 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 := &tempHumidityDevice{BaseDevice: BaseDevice{client: client, info: info}}
|
|
for _, svc := range spec.Services {
|
|
for _, prop := range svc.Properties {
|
|
switch propertyShortName(prop.Type) {
|
|
case "temperature":
|
|
if !d.propTemp.valid { d.propTemp = siidPiid{svc.IID, prop.PIID, true} }
|
|
case "relative-humidity":
|
|
if !d.propHumidity.valid { d.propHumidity = siidPiid{svc.IID, prop.PIID, true} }
|
|
}
|
|
}
|
|
}
|
|
if !d.propTemp.valid && !d.propHumidity.valid {
|
|
return nil, fmt.Errorf("%w: no temperature or humidity property in SPEC", xiaomi.ErrNotSupported)
|
|
}
|
|
return d, nil
|
|
}
|
|
|
|
func (d *tempHumidityDevice) GetTemperature(ctx context.Context) (float64, error) {
|
|
if !d.propTemp.valid { return 0, xiaomi.ErrNotSupported }
|
|
prop, err := d.GetProp(ctx, d.propTemp.siid, d.propTemp.piid)
|
|
if err != nil { return 0, err }
|
|
return toFloat(prop.Value), nil
|
|
}
|
|
func (d *tempHumidityDevice) GetHumidity(ctx context.Context) (float64, error) {
|
|
if !d.propHumidity.valid { return 0, xiaomi.ErrNotSupported }
|
|
prop, err := d.GetProp(ctx, d.propHumidity.siid, d.propHumidity.piid)
|
|
if err != nil { return 0, err }
|
|
return toFloat(prop.Value), nil
|
|
}
|
|
|
|
func (d *tempHumidityDevice) OnStateChanged(handler func(temp, humidity float64)) (string, error) {
|
|
if !d.propTemp.valid && !d.propHumidity.valid { return "", xiaomi.ErrNotSupported }
|
|
return d.SubProp(0, 0, func(did string, prop *xiaomi.PropertyValue) {
|
|
switch {
|
|
case d.propTemp.valid && prop.SIID == d.propTemp.siid && prop.PIID == d.propTemp.piid:
|
|
d.stateCache[0] = toFloat(prop.Value)
|
|
case d.propHumidity.valid && prop.SIID == d.propHumidity.siid && prop.PIID == d.propHumidity.piid:
|
|
d.stateCache[1] = toFloat(prop.Value)
|
|
}
|
|
handler(d.stateCache[0], d.stateCache[1])
|
|
})
|
|
}
|
|
|
|
func (d *tempHumidityDevice) GetState() (float64, float64) { return d.stateCache[0], d.stateCache[1] }
|
|
func (d *tempHumidityDevice) FetchState(ctx context.Context) (float64, float64, error) {
|
|
keys := []xiaomi.PropKey{}
|
|
if d.propTemp.valid { keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: d.propTemp.siid, PIID: d.propTemp.piid}) }
|
|
if d.propHumidity.valid { keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: d.propHumidity.siid, PIID: d.propHumidity.piid}) }
|
|
props, err := d.client.GetProps(ctx, keys)
|
|
if err != nil { return d.stateCache[0], d.stateCache[1], err }
|
|
state := [2]float64{d.stateCache[0], d.stateCache[1]}
|
|
for _, p := range props {
|
|
switch {
|
|
case d.propTemp.valid && p.SIID == d.propTemp.siid && p.PIID == d.propTemp.piid: state[0] = toFloat(p.Value)
|
|
case d.propHumidity.valid && p.SIID == d.propHumidity.siid && p.PIID == d.propHumidity.piid: state[1] = toFloat(p.Value)
|
|
}
|
|
}
|
|
d.stateCache = state
|
|
return state[0], state[1], nil
|
|
}
|