Files
xiaomihome/xiaomi/devices/cover.go
T
4566704 2b7de69403 refactor(logger): 日志改用 logrus 全局包级调用,移除 Logger 注入接口
为什么:并入宿主项目后须与宿主日志体系一致——宿主统一用 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)
2026-09-15 20:16:26 +08:00

166 lines
5.1 KiB
Go
Raw Blame History

This file contains ambiguous Unicode characters
This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
package devices
import (
"context"
"xiaomihome/xiaomi"
)
// CoverProps 窗帘完整状态。
type CoverProps struct {
Position int `json:"position"` // 当前位置 0-100
Status int `json:"status"` // 运动状态:0=停止 1=开启中 2=关闭中
Fault int `json:"fault"` // 故障码,0=无故障
}
// Cover 窗帘/晾衣架统一控制接口
type Cover interface {
Device
Open(ctx context.Context) error
Close(ctx context.Context) error
Stop(ctx context.Context) error
SetPosition(ctx context.Context, pct int) error
GetPosition(ctx context.Context) (int, error)
OnPropsChanged(handler func(props CoverProps)) (string, error)
GetProps() CoverProps
FetchProps(ctx context.Context) (CoverProps, error)
}
type coverDevice struct {
BaseDevice
propMotor siidPiid // motor-control(write)
propPosition siidPiid // current-position(read)
propTarget siidPiid // target-position(write,SetPosition 用)
propStatus siidPiid // status(read)
propFault siidPiid // fault(read)
propsCache CoverProps
}
const (
coverMotorOpen = 1
coverMotorClose = 0
coverMotorStop = 2
)
func NewCover(client *xiaomi.Client, info *xiaomi.DeviceInfo) (Cover, error) {
d := &coverDevice{BaseDevice: NewBaseDevice(client, info)}
resolver := d.getSpecResolver()
if resolver == nil {
return nil, xiaomi.ErrNoSPEC
}
siid, piid, ok := resolver.find("motor-control")
if !ok {
return nil, xiaomi.ErrNotSupported
}
d.propMotor = siidPiid{siid, piid, true}
if s, p, ok := resolver.find("current-position"); ok {
d.propPosition = siidPiid{s, p, true}
}
if s, p, ok := resolver.find("target-position"); ok {
d.propTarget = siidPiid{s, p, true}
}
if s, p, ok := resolver.find("status"); ok {
d.propStatus = siidPiid{s, p, true}
}
if s, p, ok := resolver.find("fault"); ok {
d.propFault = siidPiid{s, p, true}
}
return d, nil
}
func (d *coverDevice) Open(ctx context.Context) error {
if !d.propMotor.valid {
return xiaomi.ErrNotSupported
}
return d.SetProp(ctx, d.propMotor.siid, d.propMotor.piid, coverMotorOpen)
}
func (d *coverDevice) Close(ctx context.Context) error {
if !d.propMotor.valid {
return xiaomi.ErrNotSupported
}
return d.SetProp(ctx, d.propMotor.siid, d.propMotor.piid, coverMotorClose)
}
func (d *coverDevice) Stop(ctx context.Context) error {
if !d.propMotor.valid {
return xiaomi.ErrNotSupported
}
return d.SetProp(ctx, d.propMotor.siid, d.propMotor.piid, coverMotorStop)
}
// SetPosition 设定目标位置,写 target-position(可写属性)。
// 老设备无 target-position 时回退写 current-position。
func (d *coverDevice) SetPosition(ctx context.Context, pct int) error {
if d.propTarget.valid {
return d.SetProp(ctx, d.propTarget.siid, d.propTarget.piid, pct)
}
if d.propPosition.valid {
return d.SetProp(ctx, d.propPosition.siid, d.propPosition.piid, pct)
}
return xiaomi.ErrNotSupported
}
func (d *coverDevice) GetPosition(ctx context.Context) (int, error) {
if !d.propPosition.valid {
return 0, xiaomi.ErrNotSupported
}
prop, err := d.GetProp(ctx, d.propPosition.siid, d.propPosition.piid)
if err != nil {
return 0, err
}
return toInt(prop.Value), nil
}
func (d *coverDevice) OnPropsChanged(handler func(props CoverProps)) (string, error) {
if !d.propPosition.valid && !d.propStatus.valid && !d.propFault.valid {
return "", xiaomi.ErrNotSupported
}
return d.SubProp(0, 0, func(did string, prop *xiaomi.PropertyValue) {
switch {
case d.propPosition.valid && prop.SIID == d.propPosition.siid && prop.PIID == d.propPosition.piid:
d.propsCache.Position = toInt(prop.Value)
case d.propStatus.valid && prop.SIID == d.propStatus.siid && prop.PIID == d.propStatus.piid:
d.propsCache.Status = toInt(prop.Value)
case d.propFault.valid && prop.SIID == d.propFault.siid && prop.PIID == d.propFault.piid:
d.propsCache.Fault = toInt(prop.Value)
default:
return // 其他属性不触发回调
}
handler(d.propsCache)
})
}
func (d *coverDevice) GetProps() CoverProps { return d.propsCache }
func (d *coverDevice) FetchProps(ctx context.Context) (CoverProps, error) {
keys := []xiaomi.PropKey{}
if d.propPosition.valid {
keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: d.propPosition.siid, PIID: d.propPosition.piid})
}
if d.propStatus.valid {
keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: d.propStatus.siid, PIID: d.propStatus.piid})
}
if d.propFault.valid {
keys = append(keys, xiaomi.PropKey{DID: d.info.DID, SIID: d.propFault.siid, PIID: d.propFault.piid})
}
if len(keys) == 0 {
return d.propsCache, xiaomi.ErrNotSupported
}
props, err := d.client.GetProps(ctx, keys)
if err != nil {
return d.propsCache, err
}
for _, p := range props {
switch {
case d.propPosition.valid && p.SIID == d.propPosition.siid && p.PIID == d.propPosition.piid:
d.propsCache.Position = toInt(p.Value)
case d.propStatus.valid && p.SIID == d.propStatus.siid && p.PIID == d.propStatus.piid:
d.propsCache.Status = toInt(p.Value)
case d.propFault.valid && p.SIID == d.propFault.siid && p.PIID == d.propFault.piid:
d.propsCache.Fault = toInt(p.Value)
}
}
return d.propsCache, nil
}