golib/xiaomihome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: State→Props 命名统一 + 新增 Plug/Gateway 设备 + 分类系统重构

Browse Source 
**命名统一（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:
4566704
2026-08-05 17:54:08 +08:00
parent b808e51b3e
commit 04333750ab
37 changed files with 916 additions and 536 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xiaomi/examples/04_light_control/main.go
+3 -3
View File
@@ -93,11 +93,11 @@ func main() {
log.Printf("当前颜色: R=%d G=%d B=%d", r, g, b)
}
subID, err := lt.OnStateChanged(func(state devices.LightState, changed string) {
subID, err := lt.OnPropsChanged(func(props devices.LightProps, changed string) {
log.Printf("灯光状态变化: %s → on=%v brightness=%d colorTemp=%dK rgb=[%d,%d,%d]",
changed,
state.On, state.Brightness, state.ColorTemperature,
state.ColorRGB[0], state.ColorRGB[1], state.ColorRGB[2])
props.On, props.Brightness, props.ColorTemperature,
props.ColorRGB[0], props.ColorRGB[1], props.ColorRGB[2])
})
if err != nil {
log.Printf("订阅状态失败: %v", err)
xiaomi/examples/05_ac_control/main.go
+3 -3
View File
@@ -101,10 +101,10 @@ func main() {
log.Println("开启节能模式...")
ac.SetEco(ctx, true)
subID, err := ac.OnStateChanged(func(state devices.ACState, changed string) {
subID, err := ac.OnPropsChanged(func(props devices.ACProps, changed string) {
log.Printf("空调状态变化: %s → on=%v mode=%s target=%.1f current=%.1f fan=%s swing=%s",
changed, state.On, state.Mode, state.TargetTemperature, state.Temperature,
state.FanLevel, state.Swing)
changed, props.On, props.Mode, props.TargetTemperature, props.Temperature,
props.FanLevel, props.Swing)
})
if err != nil {
log.Printf("订阅状态失败: %v", err)
xiaomi/examples/11_sensor_control/main.go
+5 -1
View File
@@ -37,7 +37,11 @@ func main() {
defer client.Close()
// 获取所有传感器
sensorList, err := client.GetDevices(ctx, xiaomi.FilterByKind(xiaomi.KindSensor))
filterSensor := xiaomi.Or(
xiaomi.FilterByKind(xiaomi.KindOccupancySensor),
xiaomi.FilterByKind(xiaomi.KindSensor),
)
sensorList, err := client.GetDevices(ctx, filterSensor)
if err != nil {
log.Fatalf("获取传感器列表失败: %v", err)
}
xiaomi/examples/12_ac_subscribe/main.go
+4 -4
View File
@@ -1,4 +1,4 @@
// Package main demonstrates AirConditioner.OnStateChanged subscription.
// Package main demonstrates AirConditioner.OnPropsChanged subscription.
// 运行后等待状态变化，Ctrl+C 退出。
package main
@@ -52,10 +52,10 @@ func main() {
log.Printf("初始状态: on=%v", on)
// 订阅状态变化
subID, err := ac.OnStateChanged(func(state devices.ACState, changed string) {
subID, err := ac.OnPropsChanged(func(props devices.ACProps, changed string) {
log.Printf("[%s] on=%v mode=%s target=%.1f current=%.1f fan=%s swing=%s",
changed, state.On, state.Mode, state.TargetTemperature, state.Temperature,
state.FanLevel, state.Swing)
changed, props.On, props.Mode, props.TargetTemperature, props.Temperature,
props.FanLevel, props.Swing)
})
if err != nil {
log.Printf("订阅失败: %v", err)
xiaomi/examples/13_multi_user/main.go
+3 -3
View File
@@ -51,7 +51,7 @@ func main() {
}
// 注册全局回调 → 推送到 NATS / WebSocket / 数据库
b.OnStateChanged(func(id int64, did, deviceType, changed string, state interface{}) {
b.OnPropsChanged(func(id int64, did, deviceType, changed string, state interface{}) {
log.Printf("[%d] %s/%s changed=%s → %+v", id, did, deviceType, changed, state)
})
@@ -89,12 +89,12 @@ func demoControl(ctx context.Context, pool *bridge.Pool, id int64, did string) {
}
// 读缓存
state := ac.GetState()
state := ac.GetProps()
fmt.Printf("[demo] 缓存: on=%v mode=%s target=%.1f current=%.1f\n",
state.On, state.Mode, state.TargetTemperature, state.Temperature)
// 云端刷新
state2, err := ac.FetchState(ctx)
state2, err := ac.FetchProps(ctx)
if err != nil {
log.Printf("[demo] 云端刷新失败: %v", err)
return
xiaomi/examples/14_business_scenario/main.go
+8 -8
View File
@@ -40,10 +40,10 @@ func saveToDB(id int64, did, deviceType, changed string, state interface{}) {
// 同类化 state 拿到完整 State 结构体
switch s := state.(type) {
case bridge.ACState:
case bridge.ACProps:
log.Printf("[DB] 空调 %d/%s changed=%s: on=%v mode=%s target=%.1f current=%.1f",
id, did, changed, s.On, s.Mode, s.TargetTemperature, s.Temperature)
case bridge.LightState:
case bridge.LightProps:
log.Printf("[DB] 灯 %d/%s changed=%s: on=%v brightness=%d colorTemp=%d",
id, did, changed, s.On, s.Brightness, s.ColorTemperature)
default:
@@ -53,10 +53,10 @@ func saveToDB(id int64, did, deviceType, changed string, state interface{}) {
func pushWS(id int64, did, deviceType, changed string, state interface{}) {
switch s := state.(type) {
case bridge.ACState:
case bridge.ACProps:
log.Printf("[WS→%d] 空调 %s changed=%s: on=%v mode=%s target=%.1f current=%.1f",
id, did, changed, s.On, s.Mode, s.TargetTemperature, s.Temperature)
case bridge.LightState:
case bridge.LightProps:
log.Printf("[WS→%d] 灯 %s changed=%s: on=%v brightness=%d",
id, did, changed, s.On, s.Brightness)
default:
@@ -92,7 +92,7 @@ func initBridge(ctx context.Context, pool *bridge.Pool, cfg UserCfg) error {
}
// 注册回调：MQTT 推送 → DB + WS
b.OnStateChanged(func(id int64, did, deviceType, changed string, state interface{}) {
b.OnPropsChanged(func(id int64, did, deviceType, changed string, state interface{}) {
saveToDB(id, did, deviceType, changed, state)
pushWS(id, did, deviceType, changed, state)
})
@@ -116,13 +116,13 @@ func controlAC(ctx context.Context, pool *bridge.Pool, id int64, did string) err
}
// 读缓存
state := ac.GetState()
state := ac.GetProps()
fmt.Printf("\n空调 %s:", did)
fmt.Printf(" on=%v mode=%s target=%.1f current=%.1f\n",
state.On, state.Mode, state.TargetTemperature, state.Temperature)
// 云端刷新
if s, err := ac.FetchState(ctx); err == nil {
if s, err := ac.FetchProps(ctx); err == nil {
fmt.Printf(" 云端: on=%v mode=%s target=%.1f current=%.1f\n",
s.On, s.Mode, s.TargetTemperature, s.Temperature)
}
@@ -136,7 +136,7 @@ func controlAC(ctx context.Context, pool *bridge.Pool, id int64, did string) err
time.Sleep(1 * time.Second)
// 最终状态
final := ac.GetState()
final := ac.GetProps()
fmt.Printf("操作后: on=%v mode=%s target=%.1f current=%.1f\n",
final.On, final.Mode, final.TargetTemperature, final.Temperature)
return nil