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:
@@ -0,0 +1,185 @@
|
||||
// 示例 14:多用户业务场景
|
||||
//
|
||||
// 场景:管理后台控制空调 → 状态变化 → 存数据库 → 推 WebSocket
|
||||
// 核心展示 bridge.Pool 用法,DB/WS 只是桩方法。
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"log"
|
||||
"os"
|
||||
"os/signal"
|
||||
"time"
|
||||
|
||||
"xiaomihome/bridge"
|
||||
"xiaomihome/xiaomi"
|
||||
"xiaomihome/xiaomi/devices"
|
||||
)
|
||||
|
||||
// ── 业务桩方法:type-switch 拿到类型化字段(类型来自 bridge 包) ──
|
||||
|
||||
func saveToDB(id int64, did, deviceType, changed string, state interface{}) {
|
||||
// 用 devices 包的常量判断变更字段,deviceType 区分设备类型
|
||||
var propLabel string
|
||||
switch changed {
|
||||
case devices.PropTargetTemperature:
|
||||
propLabel = "目标温度"
|
||||
case devices.PropTemperature:
|
||||
propLabel = "当前温度"
|
||||
case devices.PropBrightness:
|
||||
propLabel = "亮度"
|
||||
default:
|
||||
propLabel = changed
|
||||
}
|
||||
if propLabel != "" {
|
||||
log.Printf("[DB] %s changed=%s(%s)", did, propLabel, changed)
|
||||
}
|
||||
|
||||
// 同类化 state 拿到完整 State 结构体
|
||||
switch s := state.(type) {
|
||||
case bridge.ACState:
|
||||
log.Printf("[DB] 空调 %d/%s changed=%s: on=%v mode=%s target=%.1f current=%.1f",
|
||||
id, did, changed, s.On, s.Mode, s.TargetTemperature, s.Temperature)
|
||||
case bridge.LightState:
|
||||
log.Printf("[DB] 灯 %d/%s changed=%s: on=%v brightness=%d colorTemp=%d",
|
||||
id, did, changed, s.On, s.Brightness, s.ColorTemperature)
|
||||
default:
|
||||
log.Printf("[DB] %d/%s changed=%s: %+v", id, did, changed, s)
|
||||
}
|
||||
}
|
||||
|
||||
func pushWS(id int64, did, deviceType, changed string, state interface{}) {
|
||||
switch s := state.(type) {
|
||||
case bridge.ACState:
|
||||
log.Printf("[WS→%d] 空调 %s changed=%s: on=%v mode=%s target=%.1f current=%.1f",
|
||||
id, did, changed, s.On, s.Mode, s.TargetTemperature, s.Temperature)
|
||||
case bridge.LightState:
|
||||
log.Printf("[WS→%d] 灯 %s changed=%s: on=%v brightness=%d",
|
||||
id, did, changed, s.On, s.Brightness)
|
||||
default:
|
||||
log.Printf("[WS→%d] %s changed=%s: %+v", id, did, changed, s)
|
||||
}
|
||||
}
|
||||
|
||||
// ── 用户配置 ──
|
||||
|
||||
type UserCfg struct {
|
||||
UID int64 `json:"uid,string"`
|
||||
UUID string `json:"uuid"`
|
||||
Auth xiaomi.AuthInfo `json:"auth"`
|
||||
DataDir string `json:"data_dir"`
|
||||
HomeIDs []int64 `json:"home_ids,omitempty"`
|
||||
}
|
||||
|
||||
func loadUsers(path string) ([]UserCfg, error) {
|
||||
data, _ := os.ReadFile(path)
|
||||
var users []UserCfg
|
||||
if err := json.Unmarshal(data, &users); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return users, nil
|
||||
}
|
||||
|
||||
// ── 业务初始化 ──
|
||||
|
||||
func initBridge(ctx context.Context, pool *bridge.Pool, cfg UserCfg) error {
|
||||
b, err := pool.Add(ctx, cfg.UID, cfg.UUID, cfg.Auth, cfg.DataDir, cfg.HomeIDs)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// 注册回调:MQTT 推送 → DB + WS
|
||||
b.OnStateChanged(func(id int64, did, deviceType, changed string, state interface{}) {
|
||||
saveToDB(id, did, deviceType, changed, state)
|
||||
pushWS(id, did, deviceType, changed, state)
|
||||
})
|
||||
|
||||
b.StartReceiving()
|
||||
log.Printf("[Init] %d: %d 台设备", cfg.UID, len(b.Devices()))
|
||||
return nil
|
||||
}
|
||||
|
||||
// ── 业务操作 ──
|
||||
|
||||
func controlAC(ctx context.Context, pool *bridge.Pool, id int64, did string) error {
|
||||
b, ok := pool.Get(id)
|
||||
if !ok {
|
||||
return fmt.Errorf("id %d 不存在", id)
|
||||
}
|
||||
|
||||
ac, err := b.AC(did)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// 读缓存
|
||||
state := ac.GetState()
|
||||
fmt.Printf("\n空调 %s:", did)
|
||||
fmt.Printf(" on=%v mode=%s target=%.1f current=%.1f\n",
|
||||
state.On, state.Mode, state.TargetTemperature, state.Temperature)
|
||||
|
||||
// 云端刷新
|
||||
if s, err := ac.FetchState(ctx); err == nil {
|
||||
fmt.Printf(" 云端: on=%v mode=%s target=%.1f current=%.1f\n",
|
||||
s.On, s.Mode, s.TargetTemperature, s.Temperature)
|
||||
}
|
||||
|
||||
// 控制
|
||||
fmt.Println("\n管理后台操作:开机制冷 26°C")
|
||||
ac.TurnOn(ctx)
|
||||
time.Sleep(300 * time.Millisecond)
|
||||
ac.SetMode(ctx, devices.ACModeCool)
|
||||
ac.SetTargetTemp(ctx, 26)
|
||||
time.Sleep(1 * time.Second)
|
||||
|
||||
// 最终状态
|
||||
final := ac.GetState()
|
||||
fmt.Printf("操作后: on=%v mode=%s target=%.1f current=%.1f\n",
|
||||
final.On, final.Mode, final.TargetTemperature, final.Temperature)
|
||||
return nil
|
||||
}
|
||||
|
||||
// ── 主流程 ──
|
||||
|
||||
func main() {
|
||||
allUsers, err := loadUsers("users.json")
|
||||
if err != nil || len(allUsers) == 0 {
|
||||
log.Fatalf("请创建 users.json: %v", err)
|
||||
}
|
||||
|
||||
ctx := context.Background()
|
||||
pool := bridge.NewPool()
|
||||
|
||||
for _, u := range allUsers {
|
||||
if err := initBridge(ctx, pool, u); err != nil {
|
||||
log.Printf("id %d 失败: %v", u.UID, err)
|
||||
}
|
||||
}
|
||||
|
||||
log.Printf("\n%d 个就绪\n", len(allUsers))
|
||||
|
||||
// 找第一台空调演示
|
||||
id := allUsers[0].UID
|
||||
b, ok := pool.Get(id)
|
||||
if !ok || b == nil {
|
||||
log.Fatal("没有设备初始化成功")
|
||||
}
|
||||
var targetDID string
|
||||
for did, typ := range b.Devices() {
|
||||
if typ == "air_conditioner" {
|
||||
targetDID = did
|
||||
break
|
||||
}
|
||||
}
|
||||
if targetDID != "" {
|
||||
controlAC(ctx, pool, id, targetDID)
|
||||
}
|
||||
|
||||
fmt.Println("\nCtrl+C 退出...")
|
||||
ch := make(chan os.Signal, 1)
|
||||
signal.Notify(ch, os.Interrupt)
|
||||
<-ch
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
[
|
||||
{
|
||||
"uid": "2897121707",
|
||||
"uuid": "2882aa541cfc47b78ed178bb42b43302",
|
||||
"data_dir": "./data/2897121707",
|
||||
"auth": {
|
||||
"access_token": "V3_iTf6riwKt698wtjY8tvu1o6kX1Izsid-XHKCJK1RNZXscm3htdWXCV6lUj8nwncsk58pjy3Vmnu93Ggfa1mYUNe-839wtyCAGyND-Q-diRcC4LbVO_tUDyvNXPAN2VknYKfY7tzUGYzEzOzSFq_Feo_vhZsPEJ6oHnY58s2xtqQOxPAJRa8B3mZrggi2TNkm",
|
||||
"refresh_token": "R3_9Z2sYiFbiOWSRTTUBmVOTlSXnyqOpIpY2IJ0oadNpJqrcrPPKKbvGrADaadudLjaF3VIYJTY2mM9HgXlnr3eoRQCbNETOoEsAS04zxJa9K8YH8pkJT9voDDTPEuhpXdATv5SOrzyZgDxn-gJKMUHzxotwAyfaTlxuA6Dtv80uoyYZuHresy-zqfiiABVCwUVY0saSa1fayXCeUYzRfEgng",
|
||||
"expires_ts": 1783080922,
|
||||
"expires_in": 259200
|
||||
}
|
||||
}
|
||||
]
|
||||
Reference in New Issue
Block a user