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:
+45
-9
@@ -1,6 +1,9 @@
|
||||
package xiaomi
|
||||
|
||||
import "strings"
|
||||
import (
|
||||
"sort"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// deviceTypeToKind maps SPEC URN device types to Kind.
|
||||
// URN format: urn:miot-spec-v2:device:{TYPE}:...
|
||||
@@ -15,7 +18,6 @@ var deviceTypeToKind = map[string]Kind{
|
||||
"night-light": KindLight,
|
||||
"ceiling-light": KindLight,
|
||||
"switch": KindSwitch,
|
||||
"outlet": KindSwitch,
|
||||
"powerstrip": KindSwitch,
|
||||
"toggle-switch": KindSwitch,
|
||||
"wireless-switch": KindSwitch,
|
||||
@@ -45,18 +47,39 @@ var deviceTypeToKind = map[string]Kind{
|
||||
"media-player": KindSpeaker,
|
||||
"playback": KindSpeaker,
|
||||
"music": KindSpeaker,
|
||||
"gateway": KindGateway,
|
||||
"plug": KindPlug,
|
||||
"outlet": KindPlug,
|
||||
"sensor-occupy": KindOccupancySensor,
|
||||
"sensor_occupy": KindOccupancySensor,
|
||||
"occupancy-sensor": KindOccupancySensor,
|
||||
"occupancy_sensor": KindOccupancySensor,
|
||||
"motion-sensor": KindOccupancySensor,
|
||||
"motion_sensor": KindOccupancySensor,
|
||||
"magnet": KindOccupancySensor,
|
||||
"sensor": KindSensor,
|
||||
"sensor-ht": KindSensor,
|
||||
"sensor-occupy": KindSensor,
|
||||
"motion-sensor": KindSensor,
|
||||
"magnet": KindSensor,
|
||||
"sensor-smoke": KindSensor,
|
||||
"sensor-gasm": KindSensor,
|
||||
"sensor_ht": KindSensor,
|
||||
"sensor-temp": KindSensor,
|
||||
"sensor_temp": KindSensor,
|
||||
"sensor-humidity": KindSensor,
|
||||
"sensor_humidity": KindSensor,
|
||||
"illumination": KindSensor,
|
||||
"sensor-smoke": KindSensor,
|
||||
"sensor_gasm": KindSensor,
|
||||
"sensor-gasm": KindSensor,
|
||||
}
|
||||
|
||||
// classifyKeys 按长度降序排列的 key,保证长/具体 key 先匹配(如 sensor-occupy 先于 sensor)。
|
||||
var classifyKeys = func() []string {
|
||||
keys := make([]string, 0, len(deviceTypeToKind))
|
||||
for k := range deviceTypeToKind {
|
||||
keys = append(keys, k)
|
||||
}
|
||||
sort.Slice(keys, func(i, j int) bool { return len(keys[i]) > len(keys[j]) })
|
||||
return keys
|
||||
}()
|
||||
|
||||
// Classify 从 DeviceInfo 判断设备种类。
|
||||
// 优先从 URN 的 device type 段精确提取,降至 model 子串匹配。
|
||||
func Classify(info *DeviceInfo) Kind {
|
||||
@@ -89,11 +112,12 @@ func classifyByURN(urn string) Kind {
|
||||
}
|
||||
|
||||
// classifyByModel 对 model 字符串做子串匹配(用于无 URN 或 URN 不标准时)。
|
||||
// 按 key 长度降序匹配,保证 sensor-occupy 先于 sensor。
|
||||
func classifyByModel(model string) Kind {
|
||||
model = strings.ToLower(model)
|
||||
for t, k := range deviceTypeToKind {
|
||||
for _, t := range classifyKeys {
|
||||
if strings.Contains(model, t) {
|
||||
return k
|
||||
return deviceTypeToKind[t]
|
||||
}
|
||||
}
|
||||
return KindUnknown
|
||||
@@ -103,3 +127,15 @@ func classifyByModel(model string) Kind {
|
||||
func FilterByKind(kind Kind) DeviceFilter {
|
||||
return func(d *DeviceInfo) bool { return d.DeviceKind() == kind }
|
||||
}
|
||||
|
||||
// Or 返回任意一个 filter 满足即通过的组合过滤器。
|
||||
func Or(filters ...DeviceFilter) DeviceFilter {
|
||||
return func(d *DeviceInfo) bool {
|
||||
for _, f := range filters {
|
||||
if f(d) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user