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
+38 -20
View File
@@ -9,7 +9,7 @@
// b, _ := pool.Get(id)
// ac, _ := b.AC("did")
// ac.TurnOn(ctx)
// state := ac.GetState()
// state := ac.GetProps()
package bridge
import (
@@ -25,14 +25,22 @@ import (
// ── 类型别名:业务层不需要 import devices ──
type (
ACState = devices.ACState
LightState = devices.LightState
FanState = devices.FanState
HumidifierState = devices.HumidifierState
HeaterState = devices.HeaterState
VacuumStatus = devices.VacuumStatus
ACProps = devices.ACProps
LightProps = devices.LightProps
FanProps = devices.FanProps
HumidifierProps = devices.HumidifierProps
HeaterProps = devices.HeaterProps
VacuumProps = devices.VacuumProps
SwitchProps = devices.SwitchProps
SpeakerProps = devices.SpeakerProps
PlugProps = devices.PlugProps
)
// OccupancyProps 人体传感器状态(有人/无人)。
type OccupancyProps struct {
Occupied bool `json:"occupied"`
}
// ── Pool ──
// Pool 全局路由:id → Bridge。
@@ -103,7 +111,8 @@ type Bridge struct {
mu sync.RWMutex
dv map[string]interface{} // DID → devices.Xxx interface
onStateChanged func(id int64, did, deviceType, changed string, state interface{})
onPropsChanged func(id int64, did, deviceType, changed string, props interface{})
onOnlineChanged func(id int64, did string, online bool)
}
func newBridge(ctx context.Context, id int64, uuid string, auth xiaomi.AuthInfo, dataDir string, homeIDs []int64) (*Bridge, error) {
@@ -162,18 +171,20 @@ func (b *Bridge) Devices() map[string]string {
func deviceTypeName(d interface{}) string {
switch d.(type) {
case devices.AirConditioner: return "air_conditioner"
case devices.Light: return "light"
case devices.Switch: return "switch"
case devices.Fan: return "fan"
case devices.Cover: return "cover"
case devices.Humidifier: return "humidifier"
case devices.Vacuum: return "vacuum"
case devices.WaterHeater: return "water_heater"
case devices.Thermostat: return "thermostat"
case devices.TempHumiditySensor: return "temp_humidity_sensor"
case devices.OccupancySensor: return "occupancy_sensor"
case devices.Speaker: return "speaker"
case devices.AirConditioner: return devices.TypeAirConditioner
case devices.Light: return devices.TypeLight
case devices.Switch: return devices.TypeSwitch
case devices.Fan: return devices.TypeFan
case devices.Cover: return devices.TypeCover
case devices.Humidifier: return devices.TypeHumidifier
case devices.Vacuum: return devices.TypeVacuum
case devices.WaterHeater: return devices.TypeWaterHeater
case devices.Thermostat: return devices.TypeThermostat
case devices.TempHumiditySensor: return devices.TypeTempHumidSensor
case devices.OccupancySensor: return devices.TypeOccupancySensor
case devices.Speaker: return devices.TypeSpeaker
case devices.Gateway: return devices.TypeGateway
case devices.Plug: return devices.TypePlug
default: return "unknown"
}
}
@@ -257,6 +268,13 @@ func (b *Bridge) Occupancy(did string) (devices.OccupancySensor, error) {
if !ok { return nil, fmt.Errorf("bridge: device %s is not an OccupancySensor", did) }
return s, nil
}
func (b *Bridge) Plug(did string) (devices.Plug, error) {
d, ok := b.dv[did]
if !ok { return nil, fmt.Errorf("bridge: device %s not found", did) }
pg, ok := d.(devices.Plug)
if !ok { return nil, fmt.Errorf("bridge: device %s is not a Plug", did) }
return pg, nil
}
func (b *Bridge) Speaker(did string) (devices.Speaker, error) {
d, ok := b.dv[did]
if !ok { return nil, fmt.Errorf("bridge: device %s not found", did) }