4566704
b808e51b3e
主要变更： **类型系统重构** - 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 敏感配置
89 lines
2.1 KiB
Go
89 lines
2.1 KiB
Go
package bridge
|
|
|
|
import (
|
|
"context"
|
|
"strconv"
|
|
|
|
"xiaomihome/xiaomi"
|
|
"xiaomihome/xiaomi/devices"
|
|
)
|
|
|
|
// ── 账号 / Token / 家庭 ──
|
|
|
|
func (b *Bridge) RefreshToken(ctx context.Context) (*xiaomi.TokenResult, error) {
|
|
return b.client.RefreshToken(ctx)
|
|
}
|
|
|
|
func (b *Bridge) GetUserInfo(ctx context.Context) (*xiaomi.UserInfo, error) {
|
|
return b.client.GetUserInfo(ctx)
|
|
}
|
|
|
|
func (b *Bridge) GetHomeList(ctx context.Context) ([]*xiaomi.HomeInfo, error) {
|
|
return b.client.GetHomeList(ctx)
|
|
}
|
|
|
|
func (b *Bridge) GetHomeDevices(ctx context.Context, homeID int64) ([]*xiaomi.DeviceInfo, error) {
|
|
return b.client.GetDevices(ctx, xiaomi.FilterByHome(strconv.FormatInt(homeID, 10)))
|
|
}
|
|
|
|
func (b *Bridge) GetHome(ctx context.Context, homeID int64) (*xiaomi.HomeInfo, error) {
|
|
return b.client.GetHome(ctx, homeID)
|
|
}
|
|
|
|
func (b *Bridge) GetRooms(ctx context.Context, homeID int64) ([]*xiaomi.RoomInfo, error) {
|
|
return b.client.GetRooms(ctx, homeID)
|
|
}
|
|
|
|
func (b *Bridge) GetRoomDevices(ctx context.Context, homeID, roomID int64) ([]string, error) {
|
|
return b.client.GetRoomDevices(ctx, homeID, roomID)
|
|
}
|
|
|
|
func (b *Bridge) RefreshDevices(ctx context.Context, homeIDs ...int64) error {
|
|
var ids []string
|
|
if len(homeIDs) > 0 {
|
|
ids = make([]string, len(homeIDs))
|
|
for i, v := range homeIDs {
|
|
ids[i] = strconv.FormatInt(v, 10)
|
|
}
|
|
}
|
|
err := b.client.RefreshDevices(ctx, ids...)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// 获取设备列表：指定家庭则只取家庭设备，否则全量
|
|
b.mu.Lock()
|
|
defer b.mu.Unlock()
|
|
|
|
if len(homeIDs) > 0 {
|
|
for _, hid := range homeIDs {
|
|
devs, err := b.client.GetDevices(ctx, xiaomi.FilterByHome(strconv.FormatInt(hid, 10)))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
for _, info := range devs {
|
|
if _, exists := b.dv[info.DID]; !exists {
|
|
if d, createErr := devices.Create(b.client, info); createErr == nil {
|
|
b.dv[info.DID] = d
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// 全量
|
|
devList, err := b.client.GetDevices(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
for _, info := range devList {
|
|
if _, exists := b.dv[info.DID]; !exists {
|
|
if d, createErr := devices.Create(b.client, info); createErr == nil {
|
|
b.dv[info.DID] = d
|
|
}
|
|
}
|
|
}
|
|
return nil
|
|
}
|