feat: AC 三合一设备支持 + 新增 Plug/Gateway 驱动 + Cover 结构化重构
**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 示例
This commit is contained in:
@@ -1,6 +1,8 @@
|
||||
package devices
|
||||
|
||||
import (
|
||||
"strings"
|
||||
|
||||
"xiaomihome/xiaomi"
|
||||
)
|
||||
|
||||
@@ -84,7 +86,7 @@ func createImpl(client *xiaomi.Client, info *xiaomi.DeviceInfo) (interface{}, er
|
||||
case matchURN(urn, "water-heater", "water-cooler", "kettle"):
|
||||
ctrl, err = NewWaterHeater(client, info)
|
||||
case matchURN(urn, "heater", "electric-blanket", "thermostat"):
|
||||
ctrl, err = NewThermostat(client, info)
|
||||
ctrl, err = NewAirConditioner(client, info)
|
||||
case matchURN(urn, "sensor-occupy", "sensor_occupy", "occupancy-sensor", "occupancy_sensor", "motion-sensor", "motion_sensor", "magnet"):
|
||||
ctrl, err = NewOccupancySensor(client, info)
|
||||
case matchURN(urn, "sensor-temp", "sensor_temp", "sensor-humidity", "sensor_humidity", "sensor-ht", "sensor_ht", "sensor-smoke", "sensor-gasm", "illumination"):
|
||||
@@ -105,17 +107,50 @@ func createImpl(client *xiaomi.Client, info *xiaomi.DeviceInfo) (interface{}, er
|
||||
return ctrl, nil
|
||||
}
|
||||
|
||||
// matchURN checks if the device URN contains any of the given type strings.
|
||||
// matchURN 匹配 URN 的 device 类型段。
|
||||
// 标准格式 urn:miot-spec-v2:device:{TYPE}:... 做精确段匹配(避免 "tofan" 撞 "fan" 这类子串误判);
|
||||
// 非标准 URN 回退到边界子串匹配。
|
||||
func matchURN(urn string, types ...string) bool {
|
||||
for _, t := range types {
|
||||
if len(urn) >= len(t) {
|
||||
// Simple substring match — URN format: urn:miot-spec-v2:device:TYPE:...
|
||||
for i := 0; i <= len(urn)-len(t); i++ {
|
||||
if urn[i:i+len(t)] == t {
|
||||
return true
|
||||
}
|
||||
parts := strings.Split(urn, ":")
|
||||
if len(parts) >= 4 && parts[2] == "device" {
|
||||
devType := parts[3]
|
||||
for _, t := range types {
|
||||
if devType == t {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
// 非标准 URN:按边界匹配,前后必须是分隔符,避免误撞
|
||||
for _, t := range types {
|
||||
if boundaryContains(urn, t) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// boundaryContains 检查 sub 是否在 s 中出现且前后是分隔符或边界。
|
||||
func boundaryContains(s, sub string) bool {
|
||||
for i := 0; i+len(sub) <= len(s); i++ {
|
||||
if s[i:i+len(sub)] != sub {
|
||||
continue
|
||||
}
|
||||
beforeOK := i == 0
|
||||
if !beforeOK {
|
||||
beforeOK = isBoundary(s[i-1])
|
||||
}
|
||||
afterOK := i+len(sub) == len(s)
|
||||
if !afterOK {
|
||||
afterOK = isBoundary(s[i+len(sub)])
|
||||
}
|
||||
if beforeOK && afterOK {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func isBoundary(c byte) bool {
|
||||
return c == ':' || c == '-' || c == '.' || c == '_' || c == '/'
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user