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
2.7 KiB
Go
94 lines
2.7 KiB
Go
package devices
|
|
|
|
import (
|
|
"context"
|
|
"xiaomihome/xiaomi"
|
|
)
|
|
|
|
// Cover 窗帘/晾衣架统一控制接口
|
|
type Cover interface {
|
|
Device
|
|
Open(ctx context.Context) error
|
|
Close(ctx context.Context) error
|
|
Stop(ctx context.Context) error
|
|
|
|
SetPosition(ctx context.Context, pct int) error
|
|
GetPosition(ctx context.Context) (int, error)
|
|
|
|
OnPropsChanged(handler func(position int)) (string, error)
|
|
GetProps() int
|
|
FetchProps(ctx context.Context) (int, error)
|
|
}
|
|
|
|
type coverDevice struct {
|
|
BaseDevice
|
|
propMotor siidPiid
|
|
propPosition siidPiid
|
|
|
|
propsCache int
|
|
}
|
|
|
|
const (
|
|
coverMotorOpen = 1
|
|
coverMotorClose = 0
|
|
coverMotorStop = 2
|
|
)
|
|
|
|
func NewCover(client *xiaomi.Client, info *xiaomi.DeviceInfo) (Cover, error) {
|
|
d := &coverDevice{BaseDevice: NewBaseDevice(client, info)}
|
|
resolver := d.getSpecResolver()
|
|
if resolver == nil {
|
|
return nil, xiaomi.ErrNoSPEC
|
|
}
|
|
siid, piid, ok := resolver.find("motor-control")
|
|
if !ok {
|
|
return nil, xiaomi.ErrNotSupported
|
|
}
|
|
d.propMotor = siidPiid{siid, piid, true}
|
|
if s, p, ok := resolver.find("current-position"); ok {
|
|
d.propPosition = siidPiid{s, p, true}
|
|
}
|
|
return d, nil
|
|
}
|
|
|
|
func (d *coverDevice) Open(ctx context.Context) error {
|
|
if !d.propMotor.valid { return xiaomi.ErrNotSupported }
|
|
return d.SetProp(ctx, d.propMotor.siid, d.propMotor.piid, coverMotorOpen)
|
|
}
|
|
func (d *coverDevice) Close(ctx context.Context) error {
|
|
if !d.propMotor.valid { return xiaomi.ErrNotSupported }
|
|
return d.SetProp(ctx, d.propMotor.siid, d.propMotor.piid, coverMotorClose)
|
|
}
|
|
func (d *coverDevice) Stop(ctx context.Context) error {
|
|
if !d.propMotor.valid { return xiaomi.ErrNotSupported }
|
|
return d.SetProp(ctx, d.propMotor.siid, d.propMotor.piid, coverMotorStop)
|
|
}
|
|
func (d *coverDevice) SetPosition(ctx context.Context, pct int) error {
|
|
if !d.propPosition.valid { return xiaomi.ErrNotSupported }
|
|
return d.SetProp(ctx, d.propPosition.siid, d.propPosition.piid, pct)
|
|
}
|
|
func (d *coverDevice) GetPosition(ctx context.Context) (int, error) {
|
|
if !d.propPosition.valid { return 0, xiaomi.ErrNotSupported }
|
|
prop, err := d.GetProp(ctx, d.propPosition.siid, d.propPosition.piid)
|
|
if err != nil { return 0, err }
|
|
return toInt(prop.Value), nil
|
|
}
|
|
|
|
func (d *coverDevice) OnPropsChanged(handler func(position int)) (string, error) {
|
|
if !d.propPosition.valid { return "", xiaomi.ErrNotSupported }
|
|
return d.SubProp(0, 0, func(did string, prop *xiaomi.PropertyValue) {
|
|
if prop.SIID == d.propPosition.siid && prop.PIID == d.propPosition.piid {
|
|
d.propsCache = toInt(prop.Value)
|
|
handler(d.propsCache)
|
|
}
|
|
})
|
|
}
|
|
|
|
func (d *coverDevice) GetProps() int { return d.propsCache }
|
|
func (d *coverDevice) FetchProps(ctx context.Context) (int, error) {
|
|
pos, err := d.GetPosition(ctx)
|
|
if err != nil { return d.propsCache, err }
|
|
d.propsCache = pos
|
|
return pos, nil
|
|
}
|