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:
2026-08-05 17:54:08 +08:00
parent b808e51b3e
commit 04333750ab
37 changed files with 916 additions and 536 deletions
+29 -24
View File
@@ -2,6 +2,8 @@ package devices
import (
"context"
"strconv"
"xiaomihome/xiaomi"
)
@@ -29,13 +31,13 @@ type Light interface {
SetColor(ctx context.Context, r, g, b int) error
GetColor(ctx context.Context) (r, g, b int, err error)
OnStateChanged(handler func(state LightState, changed string)) (string, error)
GetState() LightState
FetchState(ctx context.Context) (LightState, error)
OnPropsChanged(handler func(props LightProps, changed string)) (string, error)
GetProps() LightProps
FetchProps(ctx context.Context) (LightProps, error)
}
// LightState 灯光完整状态(字段名对齐 SPEC type)
type LightState struct {
// LightProps 灯光完整状态(字段名对齐 SPEC type)
type LightProps struct {
On bool `json:"on"` // SPEC: "on"
Brightness int `json:"brightness"` // SPEC: "brightness"
ColorTemperature int `json:"colorTemperature"` // SPEC: "color-temperature"
@@ -49,7 +51,7 @@ type lightDevice struct {
propColorTemp siidPiid // "color-temperature"
propColor siidPiid // "color"
stateCache LightState // MQTT 推送维护的本地缓存
propsCache LightProps // MQTT 推送维护的本地缓存
}
// NewLight creates a Light control for the given device.
@@ -183,28 +185,28 @@ func (d *lightDevice) GetColor(ctx context.Context) (r, g, b int, err error) {
return r, g, b, nil
}
func (d *lightDevice) OnStateChanged(handler func(state LightState, changed string)) (string, error) {
func (d *lightDevice) OnPropsChanged(handler func(props LightProps, changed string)) (string, error) {
type field struct {
siid, piid int
name string
fill func(*LightState, interface{})
fill func(*LightProps, interface{})
}
var fields []field
if d.propOn.valid {
fields = append(fields, field{d.propOn.siid, d.propOn.piid, "on",
func(s *LightState, v interface{}) { s.On, _ = v.(bool) }})
func(s *LightProps, v interface{}) { s.On, _ = v.(bool) }})
}
if d.propBrightness.valid {
fields = append(fields, field{d.propBrightness.siid, d.propBrightness.piid, "brightness",
func(s *LightState, v interface{}) { s.Brightness = toInt(v) }})
func(s *LightProps, v interface{}) { s.Brightness = toInt(v) }})
}
if d.propColorTemp.valid {
fields = append(fields, field{d.propColorTemp.siid, d.propColorTemp.piid, "color-temperature",
func(s *LightState, v interface{}) { s.ColorTemperature = toInt(v) }})
func(s *LightProps, v interface{}) { s.ColorTemperature = toInt(v) }})
}
if d.propColor.valid {
fields = append(fields, field{d.propColor.siid, d.propColor.piid, "color",
func(s *LightState, v interface{}) {
func(s *LightProps, v interface{}) {
if v, ok := v.(float64); ok {
c := int(v)
s.ColorRGB = [3]int{(c >> 16) & 0xFF, (c >> 8) & 0xFF, c & 0xFF}
@@ -217,8 +219,8 @@ func (d *lightDevice) OnStateChanged(handler func(state LightState, changed stri
return d.SubProp(0, 0, func(did string, prop *xiaomi.PropertyValue) {
for _, f := range fields {
if f.siid == prop.SIID && f.piid == prop.PIID {
f.fill(&d.stateCache, prop.Value)
handler(d.stateCache, f.name)
f.fill(&d.propsCache, prop.Value)
handler(d.propsCache, f.name)
return
}
}
@@ -240,29 +242,32 @@ func toInt(v interface{}) int {
return int(n)
case uint32:
return int(n)
case string:
i, _ := strconv.Atoi(n)
return i
}
return 0
}
func (d *lightDevice) GetState() LightState { return d.stateCache }
func (d *lightDevice) FetchState(ctx context.Context) (LightState, error) {
func (d *lightDevice) GetProps() LightProps { return d.propsCache }
func (d *lightDevice) FetchProps(ctx context.Context) (LightProps, error) {
keys := []xiaomi.PropKey{}
if d.propOn.valid { keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: d.propOn.siid, PIID: d.propOn.piid}) }
if d.propBrightness.valid { keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: d.propBrightness.siid, PIID: d.propBrightness.piid}) }
if d.propColorTemp.valid { keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: d.propColorTemp.siid, PIID: d.propColorTemp.piid}) }
if d.propColor.valid { keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: d.propColor.siid, PIID: d.propColor.piid}) }
props, err := d.client.GetProps(ctx, keys)
if err != nil { return d.stateCache, err }
state := LightState{}
if err != nil { return d.propsCache, err }
result := LightProps{}
for _, p := range props {
switch {
case d.propOn.valid && p.SIID == d.propOn.siid && p.PIID == d.propOn.piid: state.On, _ = p.Value.(bool)
case d.propBrightness.valid && p.SIID == d.propBrightness.siid && p.PIID == d.propBrightness.piid: state.Brightness = toInt(p.Value)
case d.propColorTemp.valid && p.SIID == d.propColorTemp.siid && p.PIID == d.propColorTemp.piid: state.ColorTemperature = toInt(p.Value)
case d.propOn.valid && p.SIID == d.propOn.siid && p.PIID == d.propOn.piid: result.On, _ = p.Value.(bool)
case d.propBrightness.valid && p.SIID == d.propBrightness.siid && p.PIID == d.propBrightness.piid: result.Brightness = toInt(p.Value)
case d.propColorTemp.valid && p.SIID == d.propColorTemp.siid && p.PIID == d.propColorTemp.piid: result.ColorTemperature = toInt(p.Value)
case d.propColor.valid && p.SIID == d.propColor.siid && p.PIID == d.propColor.piid:
if v, ok := p.Value.(float64); ok { c := int(v); state.ColorRGB = [3]int{(c>>16)&0xFF, (c>>8)&0xFF, c&0xFF} }
if v, ok := p.Value.(float64); ok { c := int(v); result.ColorRGB = [3]int{(c>>16)&0xFF, (c>>8)&0xFF, c&0xFF} }
}
}
d.stateCache = state
return state, nil
d.propsCache = result
return result, nil
}