**AC 驱动增强** - 支持 thermostat + air-conditioner + air-fresh 多服务三合一设备,属性跨服务合并解析 - 新增 specResolver.findValListInService/findInService/hasService/serviceShortName 方法 - 移除 KindThermostat,heater/electric-blanket/thermostat 重新归类为 KindAirConditioner **Cover 窗帘重构** - CoverProps 结构化:Position/Status/Fault 分离 - SetPosition 优先写 target-position,回退 current-position - OnPropsChanged/FetchProps 支持多属性同步刷新 **新增设备类型** - Plug 驱动:插座/插头,支持开合、在线状态、属性变更订阅 - Gateway 驱动:网关设备类型识别 - miot/miot_errors.go:新增 MIoT 云端错误码定义 **MIoT 客户端健壮性** - SetProp 空结果视为失败;设备被移除或离线时自动刷新设备列表 - GetDevices 的 has_more 改用 parseBool 严格解析 - MIPS SubscribeMany 批量订阅减少往返 - matchURN 改为按段精确匹配,避免 tofan 误匹配 fan **Bridge** - 移除 Thermostat case,Cover 改用结构化 CoverProps - 新增设备创建后自动订阅属性变更 **其他** - 日志整体 Info → Debug 降噪 - .gitignore 忽略 /.codebuddy/memory - 更新 devices_test 与 08_adv_filter_classify 示例
142 lines
4.3 KiB
Go
142 lines
4.3 KiB
Go
package xiaomi
|
|
|
|
import (
|
|
"sort"
|
|
"strings"
|
|
)
|
|
|
|
// deviceTypeToKind maps SPEC URN device types to Kind.
|
|
// URN format: urn:miot-spec-v2:device:{TYPE}:...
|
|
var deviceTypeToKind = map[string]Kind{
|
|
"air-conditioner": KindAirConditioner,
|
|
"air-condition-outlet": KindAirConditioner,
|
|
"air-condition-eco": KindAirConditioner,
|
|
"airer": KindAirConditioner,
|
|
"ac-partner": KindAirConditioner,
|
|
"light": KindLight,
|
|
"lightbulb": KindLight,
|
|
"night-light": KindLight,
|
|
"ceiling-light": KindLight,
|
|
"switch": KindSwitch,
|
|
"powerstrip": KindSwitch,
|
|
"toggle-switch": KindSwitch,
|
|
"wireless-switch": KindSwitch,
|
|
"curtain-switch": KindSwitch,
|
|
"fan": KindFan,
|
|
"ceiling-fan": KindFan,
|
|
"ventilator": KindFan,
|
|
"air-fresh": KindFan,
|
|
"air-purifier": KindFan,
|
|
"curtain": KindCover,
|
|
"airer-rack": KindCover,
|
|
"humidifier": KindHumidifier,
|
|
"dehumidifier": KindHumidifier,
|
|
"humidifier-dehumidifier": KindHumidifier,
|
|
"vacuum": KindVacuum,
|
|
"sweeper": KindVacuum,
|
|
"robot-cleaner": KindVacuum,
|
|
"water-heater": KindWaterHeater,
|
|
"water-cooler": KindWaterHeater,
|
|
"kettle": KindWaterHeater,
|
|
"heater": KindAirConditioner,
|
|
"electric-blanket": KindAirConditioner,
|
|
"thermostat": KindAirConditioner,
|
|
"speaker": KindSpeaker,
|
|
"bluetooth-speaker": KindSpeaker,
|
|
"alarm-clock": KindSpeaker,
|
|
"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_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 {
|
|
if info == nil {
|
|
return KindUnknown
|
|
}
|
|
|
|
// 从 URN 精确解析 device type
|
|
if k := classifyByURN(info.URN); k != KindUnknown {
|
|
return k
|
|
}
|
|
|
|
// 降至 model 匹配
|
|
if k := classifyByModel(info.Model); k != KindUnknown {
|
|
return k
|
|
}
|
|
|
|
return KindUnknown
|
|
}
|
|
|
|
// classifyByURN 从 URN 中提取 device type 并映射 Kind。
|
|
func classifyByURN(urn string) Kind {
|
|
parts := strings.Split(urn, ":")
|
|
if len(parts) >= 4 && parts[2] == "device" {
|
|
if k, ok := deviceTypeToKind[parts[3]]; ok {
|
|
return k
|
|
}
|
|
}
|
|
return KindUnknown
|
|
}
|
|
|
|
// classifyByModel 对 model 字符串做子串匹配(用于无 URN 或 URN 不标准时)。
|
|
// 按 key 长度降序匹配,保证 sensor-occupy 先于 sensor。
|
|
func classifyByModel(model string) Kind {
|
|
model = strings.ToLower(model)
|
|
for _, t := range classifyKeys {
|
|
if strings.Contains(model, t) {
|
|
return deviceTypeToKind[t]
|
|
}
|
|
}
|
|
return KindUnknown
|
|
}
|
|
|
|
// FilterByKind 按设备种类过滤。
|
|
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
|
|
}
|
|
}
|