4566704
04333750ab
**命名统一（State → Props）** - 所有设备类型：XxxState → XxxProps，GetState() → GetProps()，FetchState() → FetchProps() - 回调接口：OnStateChanged → OnPropsChanged - Bridge 层类型别名、示例代码、文档同步更名 **新增设备类型** - KindPlug + Plug 驱动：智能插座/插头（TurnOn/TurnOff/IsOn/OnPropsChanged） - KindGateway + Gateway 驱动：网关设备类型识别 - KindOccupancySensor 从 KindSensor 独立，添加 OccupancyProps **设备分类系统改进** - classifyByModel 改为按 key 长度降序匹配（防止 sensor 先于 sensor-occupy） - 新增下划线变体识别（sensor_occupy、sensor_temp 等） - outlet 重新归类为 Plug（非 Switch） - 新增 Or() 组合过滤器 **连接桥增强** - 设备创建成功后自动订阅属性变更 - 新增 nil 防护检查 - 支持 Plug/Speaker/Gateway/Occupancy 类型的 FetchProps 刷新 - 日志级别 Info → Debug **AC 驱动增强** - 新增 HasPower()、GetElectricPower()、GetPowerConsumption() 功率接口 - ACProps 新增 ElectricPower、PowerConsumption 字段 - valMapper：Desc 为空时 fallback 用 Name，key 统一小写 **MIoT 核心** - 设备列表刷新改用 reflect.DeepEqual 全字段变更检测 - 移除 BLE/代理设备默认在线 hack - RefreshDeviceAllProps 增加离线检查 - 新增 miot_errors.go：MIoT 错误码定义 - 全局日志级别 Info→Debug/Warn（降低噪音） **示例与文档** - 所有示例代码同步 API 变更 - 传感器示例改用 Or 组合过滤器 - ARCH_PLAN 等迁移文档同步更新
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)
|
|
|
|
OnPropsChanged(handler func(temp, humidity float64)) (string, error)
|
|
GetProps() (float64, float64)
|
|
FetchProps(ctx context.Context) (float64, float64, error)
|
|
}
|
|
|
|
type tempHumidityDevice struct {
|
|
BaseDevice
|
|
propTemp siidPiid
|
|
propHumidity siidPiid
|
|
propsCache [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) OnPropsChanged(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.propsCache[0] = toFloat(prop.Value)
|
|
case d.propHumidity.valid && prop.SIID == d.propHumidity.siid && prop.PIID == d.propHumidity.piid:
|
|
d.propsCache[1] = toFloat(prop.Value)
|
|
}
|
|
handler(d.propsCache[0], d.propsCache[1])
|
|
})
|
|
}
|
|
|
|
func (d *tempHumidityDevice) GetProps() (float64, float64) { return d.propsCache[0], d.propsCache[1] }
|
|
func (d *tempHumidityDevice) FetchProps(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.propsCache[0], d.propsCache[1], err }
|
|
state := [2]float64{d.propsCache[0], d.propsCache[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.propsCache = state
|
|
return state[0], state[1], nil
|
|
}
|