feat: State→Props 命名统一 + 新增 Plug/Gateway 设备 + 分类系统重构
**命名统一(State → Props)** - 所有设备类型:XxxState → XxxProps,GetState() → GetProps(),FetchState() → FetchProps() - 回调接口:OnStateChanged → OnPropsChanged - Bridge 层类型别名、示例代码、文档同步更名 **新增设备类型** - KindPlug + Plug 驱动:智能插座/插头(TurnOn/TurnOff/IsOn/OnPropsChanged) - KindGateway + Gateway 驱动:网关设备类型识别 - KindOccupancySensor 从 KindSensor 独立,添加 OccupancyProps **设备分类系统改进** - classifyByModel 改为按 key 长度降序匹配(防止 sensor 先于 sensor-occupy) - 新增下划线变体识别(sensor_occupy、sensor_temp 等) - outlet 重新归类为 Plug(非 Switch) - 新增 Or() 组合过滤器 **连接桥增强** - 设备创建成功后自动订阅属性变更 - 新增 nil 防护检查 - 支持 Plug/Speaker/Gateway/Occupancy 类型的 FetchProps 刷新 - 日志级别 Info → Debug **AC 驱动增强** - 新增 HasPower()、GetElectricPower()、GetPowerConsumption() 功率接口 - ACProps 新增 ElectricPower、PowerConsumption 字段 - valMapper:Desc 为空时 fallback 用 Name,key 统一小写 **MIoT 核心** - 设备列表刷新改用 reflect.DeepEqual 全字段变更检测 - 移除 BLE/代理设备默认在线 hack - RefreshDeviceAllProps 增加离线检查 - 新增 miot_errors.go:MIoT 错误码定义 - 全局日志级别 Info→Debug/Warn(降低噪音) **示例与文档** - 所有示例代码同步 API 变更 - 传感器示例改用 Or 组合过滤器 - ARCH_PLAN 等迁移文档同步更新
This commit is contained in:
+17
-13
@@ -21,6 +21,9 @@ func (c *MIoTClient) RefreshDeviceAllProps(did string) error {
|
||||
if !exists {
|
||||
return fmt.Errorf("device %s not found in cache", did)
|
||||
}
|
||||
if !getOnline(info) {
|
||||
return fmt.Errorf("device %s is offline", did)
|
||||
}
|
||||
|
||||
device := c.getOrCreateDevice(did, info)
|
||||
if device == nil {
|
||||
@@ -41,7 +44,7 @@ func (c *MIoTClient) RefreshDeviceAllProps(did string) error {
|
||||
}
|
||||
}
|
||||
|
||||
c.lgr.Infof("[MIoTClient] RefreshDeviceAllProps: %s → %d props enqueued\n", did, count)
|
||||
c.lgr.Debugf("[MIoTClient] RefreshDeviceAllProps: %s → %d props enqueued\n", did, count)
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -59,7 +62,7 @@ func (c *MIoTClient) RequestRefreshProp(did string, siid, piid int) {
|
||||
|
||||
// Check if already in refresh list
|
||||
if _, exists := c.refreshPropsList[key]; exists {
|
||||
c.lgr.Infof("[MIoTClient] RequestRefreshProp: SKIPPED (already queued) %s\n", key)
|
||||
c.lgr.Debugf("[MIoTClient] RequestRefreshProp: SKIPPED (already queued) %s\n", key)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -71,7 +74,7 @@ func (c *MIoTClient) RequestRefreshProp(did string, siid, piid int) {
|
||||
|
||||
// Schedule refresh if not already scheduled
|
||||
if c.refreshPropsTimer == nil {
|
||||
c.lgr.Infof("[MIoTClient] RequestRefreshProp: Scheduling refresh timer for %s\n", key)
|
||||
c.lgr.Debugf("[MIoTClient] RequestRefreshProp: Scheduling refresh timer for %s\n", key)
|
||||
// Reset retry count for new batch
|
||||
c.refreshRetryCount = 0
|
||||
|
||||
@@ -80,14 +83,14 @@ func (c *MIoTClient) RequestRefreshProp(did string, siid, piid int) {
|
||||
c.refreshPropsTimer = nil
|
||||
c.mu.Unlock()
|
||||
|
||||
c.lgr.Infof("[MIoTClient] RequestRefreshProp: Timer fired, calling refreshPropsHandler()\n")
|
||||
c.lgr.Debugf("[MIoTClient] RequestRefreshProp: Timer fired, calling refreshPropsHandler()\n")
|
||||
c.refreshPropsHandler()
|
||||
})
|
||||
} else {
|
||||
c.lgr.Infof("[MIoTClient] RequestRefreshProp: Timer already scheduled, added to queue: %s\n", key)
|
||||
c.lgr.Debugf("[MIoTClient] RequestRefreshProp: Timer already scheduled, added to queue: %s\n", key)
|
||||
}
|
||||
|
||||
c.lgr.Infof("[MIoTClient] RequestRefreshProp: QUEUED %s (queue size: %d)\n", key, len(c.refreshPropsList))
|
||||
c.lgr.Debugf("[MIoTClient] RequestRefreshProp: QUEUED %s (queue size: %d)\n", key, len(c.refreshPropsList))
|
||||
}
|
||||
|
||||
// refreshPropsHandler handles property refresh from cloud.
|
||||
@@ -107,7 +110,7 @@ func (c *MIoTClient) refreshPropsHandler() {
|
||||
c.refreshPropsList = make(map[string]map[string]interface{})
|
||||
c.mu.Unlock()
|
||||
|
||||
c.lgr.Infof("[MIoTClient] refreshPropsHandler: START, %d props to refresh\n", len(propsToRefresh))
|
||||
c.lgr.Debugf("[MIoTClient] refreshPropsHandler: START, %d props to refresh\n", len(propsToRefresh))
|
||||
|
||||
// Group props by source (cloud / gateway / lan)
|
||||
cloudParams := make([]PropParam, 0)
|
||||
@@ -192,7 +195,7 @@ func (c *MIoTClient) refreshPropsHandler() {
|
||||
return
|
||||
}
|
||||
allResults = append(allResults, results...)
|
||||
c.lgr.Infof("[MIoTClient] refreshPropsHandler: cloud batch %d returned %d results\n", i/150+1, len(results))
|
||||
c.lgr.Debugf("[MIoTClient] refreshPropsHandler: cloud batch %d returned %d results\n", i/150+1, len(results))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -223,7 +226,7 @@ func (c *MIoTClient) refreshPropsHandler() {
|
||||
continue
|
||||
}
|
||||
allResults = append(allResults, results...)
|
||||
c.lgr.Infof("[MIoTClient] refreshPropsHandler: gateway %s returned %d results\n", groupID, len(results))
|
||||
c.lgr.Debugf("[MIoTClient] refreshPropsHandler: gateway %s returned %d results\n", groupID, len(results))
|
||||
}
|
||||
|
||||
// LAN source
|
||||
@@ -242,7 +245,7 @@ func (c *MIoTClient) refreshPropsHandler() {
|
||||
}
|
||||
} else {
|
||||
allResults = append(allResults, results...)
|
||||
c.lgr.Infof("[MIoTClient] refreshPropsHandler: LAN returned %d results\n", len(results))
|
||||
c.lgr.Debugf("[MIoTClient] refreshPropsHandler: LAN returned %d results\n", len(results))
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -252,16 +255,17 @@ func (c *MIoTClient) refreshPropsHandler() {
|
||||
c.refreshRetryCount = 0
|
||||
c.mu.Unlock()
|
||||
|
||||
c.lgr.Infof("[MIoTClient] refreshPropsHandler: total %d results\n", len(allResults))
|
||||
c.lgr.Debugf("[MIoTClient] refreshPropsHandler: total %d results\n", len(allResults))
|
||||
|
||||
// Dispatch results to subscribers
|
||||
for _, result := range allResults {
|
||||
if result.Code != 0 {
|
||||
c.lgr.Errorf("[MIoTClient] refreshPropsHandler: FAILED %s/%d/%d, code=%d\n", result.DID, result.Siid, result.Piid, result.Code)
|
||||
c.lgr.Errorf("[MIoTClient] refreshPropsHandler: FAILED %s/%d/%d, code=%d (%s)\n",
|
||||
result.DID, result.Siid, result.Piid, result.Code, ErrDesc(result.Code))
|
||||
continue
|
||||
}
|
||||
|
||||
c.lgr.Infof("[MIoTClient] refreshPropsHandler: SUCCESS %s/%d/%d = %v\n", result.DID, result.Siid, result.Piid, result.Value)
|
||||
c.lgr.Debugf("[MIoTClient] refreshPropsHandler: SUCCESS %s/%d/%d = %v\n", result.DID, result.Siid, result.Piid, result.Value)
|
||||
params := map[string]interface{}{
|
||||
"did": result.DID,
|
||||
"siid": result.Siid,
|
||||
|
||||
Reference in New Issue
Block a user