golib/xiaomihome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(logger): 日志改用 logrus 全局包级调用，移除 Logger 注入接口

Browse Source 
为什么：并入宿主项目后须与宿主日志体系一致——宿主统一用 pkg/logger 初始化
logrus 全局实例并直接 logrus.Xxx 包级调用；包一层 Logger 接口会让 logrus 的
caller 定位（报告调用文件:行号）失准。

改动：
- 删除 logger 包（Logger 接口 / Default / SetDefault，默认本就是 logrus.StandardLogger）
- 11 个结构体移除 lgr logger.Logger 字段、SetLogger 方法及构造中的 lgr 初始化
- 192 处 lgr.Xxxf 调用改为 logrus.Xxxf，日志消息文本保持不变
- xiaomi.Client 移除 Logger() 访问器，air_conditioner 回读日志去掉判空调用直连 logrus
- miot_i18n.go 两处标准库 log.Printf 改为 logrus.Errorf，统一日志出口
- go.mod：logrus 从 indirect 提升为直接依赖
- goimports/goformat 全树规范化：此前部分文件未 gofmt（单行 if、对齐），本次顺带
  格式化，纯空白/换行变化，无逻辑改动

验证：go build / go vet / go test ./... 全部通过（bridge、miot、xiaomi、devices、specs）
This commit is contained in:
4566704
2026-09-15 20:16:26 +08:00
parent 7ae32bd012
commit 2b7de69403
46 changed files with 1166 additions and 903 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xiaomi/devices/light.go
+29 -13
View File
@@ -38,10 +38,10 @@ type Light interface {
// LightProps 灯光完整状态（字段名对齐 SPEC type）
type LightProps struct {
On bool `json:"on"` // SPEC: "on"
Brightness int `json:"brightness"` // SPEC: "brightness"
ColorTemperature int `json:"colorTemperature"` // SPEC: "color-temperature"
ColorRGB [3]int `json:"colorRgb"` // SPEC: "color"
On bool `json:"on"` // SPEC: "on"
Brightness int `json:"brightness"` // SPEC: "brightness"
ColorTemperature int `json:"colorTemperature"` // SPEC: "color-temperature"
ColorRGB [3]int `json:"colorRgb"` // SPEC: "color"
}
type lightDevice struct {
@@ -252,20 +252,36 @@ func toInt(v interface{}) int {
func (d *lightDevice) GetProps() LightProps { return d.propsCache }
func (d *lightDevice) FetchProps(ctx context.Context) (LightProps, error) {
keys := []xiaomi.PropKey{}
if d.propOn.valid { keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: d.propOn.siid, PIID: d.propOn.piid}) }
if d.propBrightness.valid { keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: d.propBrightness.siid, PIID: d.propBrightness.piid}) }
if d.propColorTemp.valid { keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: d.propColorTemp.siid, PIID: d.propColorTemp.piid}) }
if d.propColor.valid { keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: d.propColor.siid, PIID: d.propColor.piid}) }
if d.propOn.valid {
keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: d.propOn.siid, PIID: d.propOn.piid})
}
if d.propBrightness.valid {
keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: d.propBrightness.siid, PIID: d.propBrightness.piid})
}
if d.propColorTemp.valid {
keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: d.propColorTemp.siid, PIID: d.propColorTemp.piid})
}
if d.propColor.valid {
keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: d.propColor.siid, PIID: d.propColor.piid})
}
props, err := d.client.GetProps(ctx, keys)
if err != nil { return d.propsCache, err }
if err != nil {
return d.propsCache, err
}
result := LightProps{}
for _, p := range props {
switch {
case d.propOn.valid && p.SIID == d.propOn.siid && p.PIID == d.propOn.piid: result.On, _ = p.Value.(bool)
case d.propBrightness.valid && p.SIID == d.propBrightness.siid && p.PIID == d.propBrightness.piid: result.Brightness = toInt(p.Value)
case d.propColorTemp.valid && p.SIID == d.propColorTemp.siid && p.PIID == d.propColorTemp.piid: result.ColorTemperature = toInt(p.Value)
case d.propOn.valid && p.SIID == d.propOn.siid && p.PIID == d.propOn.piid:
result.On, _ = p.Value.(bool)
case d.propBrightness.valid && p.SIID == d.propBrightness.siid && p.PIID == d.propBrightness.piid:
result.Brightness = toInt(p.Value)
case d.propColorTemp.valid && p.SIID == d.propColorTemp.siid && p.PIID == d.propColorTemp.piid:
result.ColorTemperature = toInt(p.Value)
case d.propColor.valid && p.SIID == d.propColor.siid && p.PIID == d.propColor.piid:
if v, ok := p.Value.(float64); ok { c := int(v); result.ColorRGB = [3]int{(c>>16)&0xFF, (c>>8)&0xFF, c&0xFF} }
if v, ok := p.Value.(float64); ok {
c := int(v)
result.ColorRGB = [3]int{(c >> 16) & 0xFF, (c >> 8) & 0xFF, c & 0xFF}
}
}
}
d.propsCache = result