feat: State→Props 命名统一 + 新增 Plug/Gateway 设备 + 分类系统重构
**命名统一(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 等迁移文档同步更新
This commit is contained in:
@@ -13,16 +13,25 @@ type OccupancySensor interface {
|
||||
IsOccupied(ctx context.Context) (bool, error)
|
||||
GetIlluminance(ctx context.Context) (float64, error)
|
||||
|
||||
OnStateChanged(handler func(occupied bool, illuminance float64)) (string, error)
|
||||
GetState() (bool, float64)
|
||||
FetchState(ctx context.Context) (bool, float64, error)
|
||||
OnPropsChanged(handler func(occupied bool, illuminance float64)) (string, error)
|
||||
GetProps() (bool, float64)
|
||||
FetchProps(ctx context.Context) (bool, float64, error)
|
||||
}
|
||||
|
||||
type occupancyDevice struct {
|
||||
BaseDevice
|
||||
propOccupancy siidPiid
|
||||
propIlluminance siidPiid
|
||||
stateCache [2]interface{} // [0]=bool occupied, [1]=float64 lux
|
||||
propOccupancy siidPiid // "occupancy" / "occupancy-status"(bool/uint8)
|
||||
propNoMotion siidPiid // "no-motion-duration"(uint16,linp.motion.* 等无 occupancy 属性的设备)
|
||||
propIlluminance siidPiid // "illumination"
|
||||
propsCache [2]interface{} // [0]=bool occupied, [1]=float64 lux
|
||||
}
|
||||
|
||||
// occupied 根据设备支持的属性类型计算有人状态。
|
||||
func (d *occupancyDevice) occupied(v interface{}) bool {
|
||||
if d.propOccupancy.valid {
|
||||
return toBool(v)
|
||||
}
|
||||
return toFloat(v) == 0 // no-motion-duration==0 → 有人
|
||||
}
|
||||
|
||||
func NewOccupancySensor(client *xiaomi.Client, info *xiaomi.DeviceInfo) (OccupancySensor, error) {
|
||||
@@ -35,22 +44,34 @@ func NewOccupancySensor(client *xiaomi.Client, info *xiaomi.DeviceInfo) (Occupan
|
||||
for _, svc := range spec.Services {
|
||||
for _, prop := range svc.Properties {
|
||||
switch propertyShortName(prop.Type) {
|
||||
case "occupancy":
|
||||
case "occupancy", "occupancy-status":
|
||||
if !d.propOccupancy.valid { d.propOccupancy = siidPiid{svc.IID, prop.PIID, true} }
|
||||
case "no-motion-duration":
|
||||
if !d.propNoMotion.valid { d.propNoMotion = siidPiid{svc.IID, prop.PIID, true} }
|
||||
case "illumination":
|
||||
if !d.propIlluminance.valid { d.propIlluminance = siidPiid{svc.IID, prop.PIID, true} }
|
||||
}
|
||||
}
|
||||
}
|
||||
if !d.propOccupancy.valid { return nil, fmt.Errorf("%w: no occupancy property in SPEC", xiaomi.ErrNotSupported) }
|
||||
if !d.propOccupancy.valid && !d.propNoMotion.valid {
|
||||
return nil, fmt.Errorf("%w: no occupancy/no-motion-duration property in SPEC", xiaomi.ErrNotSupported)
|
||||
}
|
||||
return d, nil
|
||||
}
|
||||
|
||||
// occupiedProp 返回判断有人状态所用的属性。
|
||||
func (d *occupancyDevice) occupiedProp() siidPiid {
|
||||
if d.propOccupancy.valid {
|
||||
return d.propOccupancy
|
||||
}
|
||||
return d.propNoMotion
|
||||
}
|
||||
|
||||
func (d *occupancyDevice) IsOccupied(ctx context.Context) (bool, error) {
|
||||
prop, err := d.GetProp(ctx, d.propOccupancy.siid, d.propOccupancy.piid)
|
||||
p := d.occupiedProp()
|
||||
prop, err := d.GetProp(ctx, p.siid, p.piid)
|
||||
if err != nil { return false, err }
|
||||
if b, ok := prop.Value.(bool); ok { return b, nil }
|
||||
return false, nil
|
||||
return d.occupied(prop.Value), nil
|
||||
}
|
||||
func (d *occupancyDevice) GetIlluminance(ctx context.Context) (float64, error) {
|
||||
if !d.propIlluminance.valid { return 0, xiaomi.ErrNotSupported }
|
||||
@@ -59,46 +80,49 @@ func (d *occupancyDevice) GetIlluminance(ctx context.Context) (float64, error) {
|
||||
return toFloat(prop.Value), nil
|
||||
}
|
||||
|
||||
func (d *occupancyDevice) OnStateChanged(handler func(occupied bool, illuminance float64)) (string, error) {
|
||||
if !d.propOccupancy.valid && !d.propIlluminance.valid { return "", xiaomi.ErrNotSupported }
|
||||
func (d *occupancyDevice) OnPropsChanged(handler func(occupied bool, illuminance float64)) (string, error) {
|
||||
if !d.propOccupancy.valid && !d.propNoMotion.valid && !d.propIlluminance.valid { return "", xiaomi.ErrNotSupported }
|
||||
return d.SubProp(0, 0, func(did string, prop *xiaomi.PropertyValue) {
|
||||
switch {
|
||||
case d.propOccupancy.valid && prop.SIID == d.propOccupancy.siid && prop.PIID == d.propOccupancy.piid:
|
||||
if b, ok := prop.Value.(bool); ok { d.stateCache[0] = b }
|
||||
d.propsCache[0] = toBool(prop.Value)
|
||||
case d.propNoMotion.valid && prop.SIID == d.propNoMotion.siid && prop.PIID == d.propNoMotion.piid:
|
||||
d.propsCache[0] = toFloat(prop.Value) == 0
|
||||
case d.propIlluminance.valid && prop.SIID == d.propIlluminance.siid && prop.PIID == d.propIlluminance.piid:
|
||||
d.stateCache[1] = toFloat(prop.Value)
|
||||
d.propsCache[1] = toFloat(prop.Value)
|
||||
}
|
||||
occ, _ := d.stateCache[0].(bool)
|
||||
lux, _ := d.stateCache[1].(float64)
|
||||
occ, _ := d.propsCache[0].(bool)
|
||||
lux, _ := d.propsCache[1].(float64)
|
||||
handler(occ, lux)
|
||||
})
|
||||
}
|
||||
|
||||
func (d *occupancyDevice) GetState() (bool, float64) {
|
||||
b, _ := d.stateCache[0].(bool)
|
||||
f, _ := d.stateCache[1].(float64)
|
||||
func (d *occupancyDevice) GetProps() (bool, float64) {
|
||||
b, _ := d.propsCache[0].(bool)
|
||||
f, _ := d.propsCache[1].(float64)
|
||||
return b, f
|
||||
}
|
||||
func (d *occupancyDevice) FetchState(ctx context.Context) (bool, float64, error) {
|
||||
func (d *occupancyDevice) FetchProps(ctx context.Context) (bool, float64, error) {
|
||||
keys := []xiaomi.PropKey{}
|
||||
if d.propOccupancy.valid { keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: d.propOccupancy.siid, PIID: d.propOccupancy.piid}) }
|
||||
p := d.occupiedProp()
|
||||
if p.valid { keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: p.siid, PIID: p.piid}) }
|
||||
if d.propIlluminance.valid { keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: d.propIlluminance.siid, PIID: d.propIlluminance.piid}) }
|
||||
props, err := d.client.GetProps(ctx, keys)
|
||||
if err != nil {
|
||||
b, _ := d.stateCache[0].(bool)
|
||||
f, _ := d.stateCache[1].(float64)
|
||||
b, _ := d.propsCache[0].(bool)
|
||||
f, _ := d.propsCache[1].(float64)
|
||||
return b, f, err
|
||||
}
|
||||
var occupied bool
|
||||
var illuminance float64
|
||||
for _, p := range props {
|
||||
for _, r := range props {
|
||||
switch {
|
||||
case d.propOccupancy.valid && p.SIID == d.propOccupancy.siid && p.PIID == d.propOccupancy.piid:
|
||||
occupied, _ = p.Value.(bool)
|
||||
case d.propIlluminance.valid && p.SIID == d.propIlluminance.siid && p.PIID == d.propIlluminance.piid:
|
||||
illuminance = toFloat(p.Value)
|
||||
case p.valid && r.SIID == p.siid && r.PIID == p.piid:
|
||||
occupied = d.occupied(r.Value)
|
||||
case d.propIlluminance.valid && r.SIID == d.propIlluminance.siid && r.PIID == d.propIlluminance.piid:
|
||||
illuminance = toFloat(r.Value)
|
||||
}
|
||||
}
|
||||
d.stateCache = [2]interface{}{occupied, illuminance}
|
||||
d.propsCache = [2]interface{}{occupied, illuminance}
|
||||
return occupied, illuminance, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user