feat: AC 三合一设备支持 + 新增 Plug/Gateway 驱动 + Cover 结构化重构

**AC 驱动增强**
- 支持 thermostat + air-conditioner + air-fresh 多服务三合一设备,属性跨服务合并解析
- 新增 specResolver.findValListInService/findInService/hasService/serviceShortName 方法
- 移除 KindThermostat,heater/electric-blanket/thermostat 重新归类为 KindAirConditioner

**Cover 窗帘重构**
- CoverProps 结构化:Position/Status/Fault 分离
- SetPosition 优先写 target-position,回退 current-position
- OnPropsChanged/FetchProps 支持多属性同步刷新

**新增设备类型**
- Plug 驱动:插座/插头,支持开合、在线状态、属性变更订阅
- Gateway 驱动:网关设备类型识别
- miot/miot_errors.go:新增 MIoT 云端错误码定义

**MIoT 客户端健壮性**
- SetProp 空结果视为失败;设备被移除或离线时自动刷新设备列表
- GetDevices 的 has_more 改用 parseBool 严格解析
- MIPS SubscribeMany 批量订阅减少往返
- matchURN 改为按段精确匹配,避免 tofan 误匹配 fan

**Bridge**
- 移除 Thermostat case,Cover 改用结构化 CoverProps
- 新增设备创建后自动订阅属性变更

**其他**
- 日志整体 Info → Debug 降噪
- .gitignore 忽略 /.codebuddy/memory
- 更新 devices_test 与 08_adv_filter_classify 示例
This commit is contained in:
2026-08-23 19:42:55 +08:00
parent 04333750ab
commit 86c21ce91c
25 changed files with 1129 additions and 155 deletions
+75 -19
View File
@@ -5,6 +5,13 @@ import (
"xiaomihome/xiaomi"
)
// CoverProps 窗帘完整状态。
type CoverProps struct {
Position int `json:"position"` // 当前位置 0-100
Status int `json:"status"` // 运动状态:0=停止 1=开启中 2=关闭中
Fault int `json:"fault"` // 故障码,0=无故障
}
// Cover 窗帘/晾衣架统一控制接口
type Cover interface {
Device
@@ -15,17 +22,20 @@ type Cover interface {
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)
OnPropsChanged(handler func(props CoverProps)) (string, error)
GetProps() CoverProps
FetchProps(ctx context.Context) (CoverProps, error)
}
type coverDevice struct {
BaseDevice
propMotor siidPiid
propPosition siidPiid
propMotor siidPiid // motor-control(write)
propPosition siidPiid // current-position(read)
propTarget siidPiid // target-position(write,SetPosition 用)
propStatus siidPiid // status(read)
propFault siidPiid // fault(read)
propsCache int
propsCache CoverProps
}
const (
@@ -48,6 +58,15 @@ func NewCover(client *xiaomi.Client, info *xiaomi.DeviceInfo) (Cover, error) {
if s, p, ok := resolver.find("current-position"); ok {
d.propPosition = siidPiid{s, p, true}
}
if s, p, ok := resolver.find("target-position"); ok {
d.propTarget = siidPiid{s, p, true}
}
if s, p, ok := resolver.find("status"); ok {
d.propStatus = siidPiid{s, p, true}
}
if s, p, ok := resolver.find("fault"); ok {
d.propFault = siidPiid{s, p, true}
}
return d, nil
}
@@ -63,10 +82,19 @@ 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)
}
// SetPosition 设定目标位置,写 target-position(可写属性)。
// 老设备无 target-position 时回退写 current-position。
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)
if d.propTarget.valid {
return d.SetProp(ctx, d.propTarget.siid, d.propTarget.piid, pct)
}
if d.propPosition.valid {
return d.SetProp(ctx, d.propPosition.siid, d.propPosition.piid, pct)
}
return xiaomi.ErrNotSupported
}
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)
@@ -74,20 +102,48 @@ func (d *coverDevice) GetPosition(ctx context.Context) (int, error) {
return toInt(prop.Value), nil
}
func (d *coverDevice) OnPropsChanged(handler func(position int)) (string, error) {
if !d.propPosition.valid { return "", xiaomi.ErrNotSupported }
func (d *coverDevice) OnPropsChanged(handler func(props CoverProps)) (string, error) {
if !d.propPosition.valid && !d.propStatus.valid && !d.propFault.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)
switch {
case d.propPosition.valid && prop.SIID == d.propPosition.siid && prop.PIID == d.propPosition.piid:
d.propsCache.Position = toInt(prop.Value)
case d.propStatus.valid && prop.SIID == d.propStatus.siid && prop.PIID == d.propStatus.piid:
d.propsCache.Status = toInt(prop.Value)
case d.propFault.valid && prop.SIID == d.propFault.siid && prop.PIID == d.propFault.piid:
d.propsCache.Fault = toInt(prop.Value)
default:
return // 其他属性不触发回调
}
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
func (d *coverDevice) GetProps() CoverProps { return d.propsCache }
func (d *coverDevice) FetchProps(ctx context.Context) (CoverProps, error) {
keys := []xiaomi.PropKey{}
if d.propPosition.valid { keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: d.propPosition.siid, PIID: d.propPosition.piid}) }
if d.propStatus.valid { keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: d.propStatus.siid, PIID: d.propStatus.piid}) }
if d.propFault.valid { keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: d.propFault.siid, PIID: d.propFault.piid}) }
if len(keys) == 0 {
return d.propsCache, xiaomi.ErrNotSupported
}
props, err := d.client.GetProps(ctx, keys)
if err != nil {
return d.propsCache, err
}
for _, p := range props {
switch {
case d.propPosition.valid && p.SIID == d.propPosition.siid && p.PIID == d.propPosition.piid:
d.propsCache.Position = toInt(p.Value)
case d.propStatus.valid && p.SIID == d.propStatus.siid && p.PIID == d.propStatus.piid:
d.propsCache.Status = toInt(p.Value)
case d.propFault.valid && p.SIID == d.propFault.siid && p.PIID == d.propFault.piid:
d.propsCache.Fault = toInt(p.Value)
}
}
return d.propsCache, nil
}