refactor: 重大架构升级 — HomeID/RoomID int64化 + 设备驱动重构 + 结构化日志
主要变更: **类型系统重构** - HomeInfo.ID/RoomInfo.ID/HomeID 从 string 改为 int64,json tag 使用 ,string - GetHome/GetRooms/GetRoomDevices 接口同步修改 - 新增 int64FromStr 工具函数,更新 parseHomeInfo 解析逻辑 **新增 Speaker 设备** - 新增 KindSpeaker 类型 - classify 映射覆盖 speaker/bluetooth-speaker/alarm-clock/media-player/playback/music **设备驱动重构** - AC 驱动彻底重写:从硬编码常量改为基于 SPEC ValueList 的动态 valMapper - 所有设备(Fan/Humidifier/Light/OccupancySensor/Switch/TempHumiditySensor/Thermostat/Vacuum/WaterHeater/Cover)新增 GetState() 和 FetchState(ctx) 接口 - base.go 新增 specResolver.format() 方法 **MIoT 模块增强** - MIoTClient 新增 homeIDs 字段,支持按家庭过滤设备 - RefreshDevices 支持 homeIDs 参数 - SpecStdLib 引入 logger.Logger,log.Printf 全部迁移为结构化日志 **其他** - Config 新增 RedirectURL 和 HomeIDs 字段 - AuthInfo.ExpiresIn 类型从 int 改为 int32 - UUID 生成简化为 hex.EncodeToString - 新增 github.com/sirupsen/logrus 依赖 - .gitignore 新增 examples/*/data/ 忽略规则 - 删除已提交的 config.json 敏感配置
This commit is contained in:
@@ -14,6 +14,8 @@ type OccupancySensor interface {
|
||||
GetIlluminance(ctx context.Context) (float64, error)
|
||||
|
||||
OnStateChanged(handler func(occupied bool, illuminance float64)) (string, error)
|
||||
GetState() (bool, float64)
|
||||
FetchState(ctx context.Context) (bool, float64, error)
|
||||
}
|
||||
|
||||
type occupancyDevice struct {
|
||||
@@ -71,3 +73,32 @@ func (d *occupancyDevice) OnStateChanged(handler func(occupied bool, illuminance
|
||||
handler(occ, lux)
|
||||
})
|
||||
}
|
||||
|
||||
func (d *occupancyDevice) GetState() (bool, float64) {
|
||||
b, _ := d.stateCache[0].(bool)
|
||||
f, _ := d.stateCache[1].(float64)
|
||||
return b, f
|
||||
}
|
||||
func (d *occupancyDevice) FetchState(ctx context.Context) (bool, float64, error) {
|
||||
keys := []xiaomi.PropKey{}
|
||||
if d.propOccupancy.valid { keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: d.propOccupancy.siid, PIID: d.propOccupancy.piid}) }
|
||||
if d.propIlluminance.valid { keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: d.propIlluminance.siid, PIID: d.propIlluminance.piid}) }
|
||||
props, err := d.client.GetProps(ctx, keys)
|
||||
if err != nil {
|
||||
b, _ := d.stateCache[0].(bool)
|
||||
f, _ := d.stateCache[1].(float64)
|
||||
return b, f, err
|
||||
}
|
||||
var occupied bool
|
||||
var illuminance float64
|
||||
for _, p := range props {
|
||||
switch {
|
||||
case d.propOccupancy.valid && p.SIID == d.propOccupancy.siid && p.PIID == d.propOccupancy.piid:
|
||||
occupied, _ = p.Value.(bool)
|
||||
case d.propIlluminance.valid && p.SIID == d.propIlluminance.siid && p.PIID == d.propIlluminance.piid:
|
||||
illuminance = toFloat(p.Value)
|
||||
}
|
||||
}
|
||||
d.stateCache = [2]interface{}{occupied, illuminance}
|
||||
return occupied, illuminance, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user