feat(vd960DBN)+fix(DBNMQTTool): log_query 改 hex 原始字节上报 (2026-08-18)

背景: MQTT 快照流实测 MQTTSerialize_publish failed — JSON 化快照记录 ~810B/条超 800B 发送缓冲方案(用户拍板): 对齐 BLE 通道, 原始字节 hex 上报固件 (V4.3): - offlog.c/h: 新增 offlog_evt_to_hex() (32B→64 hex) - snapshot.c/h: 新增 snap_rec_to_hex() (64B→128 hex); 删 SNAP_MAX_QUERY_JSON, 恢复 count=2 - tcp_json_srv.c / iot_mqtt_srv.c: log_query 改 {"seq":N,"hex":"..."}; SEND_BUF 保持 800 - 2 条快照 hex 响应 406B < 800B 文档: TCP JSON V1.03 / MQTT V1.07 §4.17 records 改 hex + 解析表引用 BLE §6.4/§7 工具: parse_offlog_hex/parse_snap_hex/offlog_payload_desc + hex 展示; 验证: gcc 9 断言 + 工具解析全过 + offscreen UI
2026-08-18 14:04:26 +08:00
parent 5e9b188c6a
commit 5a1893cd1c
15 changed files with 331 additions and 180 deletions
@@ -8,6 +8,7 @@ DLD960 IoT MQTT 协议定义

 import json
 import time
+import struct
 from typing import Optional, Any
 from dataclasses import dataclass, field, asdict

@@ -250,7 +251,7 @@ def data_report_config(sensor_type: int = 12, enable: bool = True,
 def data_log_query(start_seq: int = 1, count: int = 4, stream: str = STREAM_EVENT) -> dict:
    """V1.07 log_query 分页拉取脱机日志
    stream=event:    事件流, count 上限 4 (设备侧超限按 4 处理)
-    stream=snapshot: 快照流, count 上限 2 (64B×2 记录); 显式传 stream 字段
+    stream=snapshot: 快照流, count 上限 2 (hex 原始字节上报); 显式传 stream 字段
    """
    d: dict[str, Any] = {
        "start_seq": max(1, int(start_seq)),
@@ -282,3 +283,91 @@ def parse_topic_dev_serial(topic: str) -> Optional[str]:
    if len(parts) >= 2 and parts[0] == "dld960":
        return parts[1]
    return None
+
+
+# ============================================================
+# 脱机日志 hex 解析 (V1.07: log_query 响应 records[].hex 原始字节)
+# 字段表与《DLD960 BLE 协议》§6.4 (SnapRec) / §7 (OfflogEvt) 一致
+# ============================================================
+
+# OfflogEvt 事件类型 (BLE 协议 §7 事件类型表)
+OFFLOG_TYPE_NAMES = {
+    0x01: "boot", 0x10: "iot_connect", 0x11: "iot_ready", 0x12: "iot_disconnect",
+    0x13: "iot_reconn", 0x30: "evt_retry", 0x31: "evt_giveup", 0x40: "coil",
+    0x50: "time_anchor", 0x70: "log_clear",
+}
+_OFFLOG_SUB_NAMES = {1: "car_enter", 2: "car_leave", 3: "loop_cut", 4: "loop_restore"}
+_OFFLOG_DISC_REASONS = {1: "断开", 2: "超时", 3: "CONNACK拒绝", 4: "连接超时"}
+
+
+def parse_offlog_hex(h: str) -> dict:
+    """OfflogEvt 32B hex → dict (magic/type/seq/ts_ms/unix_ts/boot_seq/payload)"""
+    b = bytes.fromhex(h)
+    if len(b) != 32:
+        return {"error": f"bad len {len(b)}"}
+    magic, etype, elen, flags, seq, ts_ms, unix_ts, boot_seq, rsvd, payload = \
+        struct.unpack('<BBBBIIIHH12s', b)
+    return {"magic": magic, "type": etype, "len": elen, "flags": flags, "seq": seq,
+            "ts_ms": ts_ms, "unix_ts": unix_ts, "boot_seq": boot_seq, "payload": payload}
+
+
+def offlog_payload_desc(etype: int, payload: bytes) -> str:
+    """事件 payload 人类可读描述 (BLE 协议 §7 payload 定义, 大端)"""
+    if etype == 0x01:  # boot: 复位原因寄存器
+        rst = int.from_bytes(payload[0:4], 'big') if len(payload) >= 4 else 0
+        bits = [n for n, b in [("LPWR", 31), ("WWDG", 30), ("IWDG", 29),
+                               ("SFT", 28), ("POR", 27), ("NRST", 26)] if rst & (1 << b)]
+        return f"rst=0x{rst:08X} ({'+'.join(bits) if bits else 'none'})"
+    if etype == 0x12:  # iot_disconnect
+        r = payload[0] if payload else 0
+        return f"reason={r} ({_OFFLOG_DISC_REASONS.get(r, '?')})"
+    if etype == 0x13:  # iot_reconn
+        return f"backoff_ms={int.from_bytes(payload[0:4], 'big')}" if len(payload) >= 4 else ""
+    if etype == 0x30:  # evt_retry
+        mid = int.from_bytes(payload[0:4], 'big') if len(payload) >= 4 else 0
+        retry = payload[4] if len(payload) >= 5 else 0
+        return f"msg_id={mid} retry={retry}"
+    if etype == 0x31:  # evt_giveup
+        mid = int.from_bytes(payload[0:4], 'big') if len(payload) >= 4 else 0
+        return f"msg_id={mid}"
+    if etype == 0x40:  # coil
+        sub = _OFFLOG_SUB_NAMES.get(payload[0], payload[0]) if payload else "?"
+        ch = payload[1] if len(payload) >= 2 else 0
+        val = int.from_bytes(payload[2:6], 'big') if len(payload) >= 6 else 0
+        return f"sub={sub} ch={ch} value={val}"
+    if etype in (0x10, 0x11, 0x50, 0x70):  # 无 payload
+        return ""
+    return payload.hex() if payload else ""
+
+
+def parse_snap_hex(h: str) -> dict:
+    """SnapRec 64B hex → dict (seq/boot_seq/ts_ms/coil_count/channels[])"""
+    b = bytes.fromhex(h)
+    if len(b) != 64:
+        return {"error": f"bad len {len(b)}"}
+    magic, slen, flags, rsvd, seq, ts_ms, boot_seq, rsvd2, coils = \
+        struct.unpack('<BBBBIIHH48s', b)
+    coil_count = min(slen // 12, 4)
+    channels = []
+    for c in range(coil_count):
+        p = coils[c * 12:(c + 1) * 12]
+        cfg, cond = p[0], p[1]
+        freq = p[2] | (p[3] << 8) | (p[4] << 16)
+        var = p[5] | (p[6] << 8) | (p[7] << 16)
+        if var & 0x800000:
+            var -= 0x1000000
+        misc = int.from_bytes(p[8:12], 'little')
+        channels.append({
+            "ch": c + 1,
+            "freq_level": ("high", "mid_high", "mid_low", "low")[(cfg >> 6) & 3],
+            "direction": (cfg >> 5) & 1,
+            "freq_type": (cfg >> 4) & 1,
+            "sensitivity": cfg & 0x0F,
+            "condition": (cond >> 4) & 0x0F,
+            "loop_ok": not ((cond >> 3) & 1),
+            "has_car": bool((cond >> 2) & 1),
+            "misc_type": ("time", "cut_count", "flow_count", "relay_count")[cond & 3],
+            "freq": freq, "variation": var, "misc": misc,
+        })
+    return {"seq": seq, "boot_seq": boot_seq, "ts_ms": ts_ms,
+            "coil_count": coil_count, "channels": channels}
@@ -6,6 +6,26 @@

 ---

+## 2026-08-18 — log_query 响应改 hex 原始字节解析展示（协议 V1.07 修订）
+
+### 背景
+
+MQTT 快照流实测 `MQTTSerialize_publish failed`——JSON 化快照记录超 800B 发送缓冲。协议修订为**原始字节 hex 上报**（与 BLE 通道同语义），工具同步改为 hex 解析。
+
+### 变更
+
+- **protocol.py**：新增 `parse_offlog_hex`（OfflogEvt 32B，`<BBBBIIIHH12s`）、`parse_snap_hex`（SnapRec 64B，`<BBBBIIHH48s`）、`offlog_payload_desc`（boot 复位位/coil/evt_retry/evt_giveup/iot_disconnect/reconn）、`OFFLOG_TYPE_NAMES`——字段表与 BLE 协议 §6.4/§7 一致
+- `data_log_query` snapshot count 恢复 **2**（hex 体积可控）
+- **main.py**：`_apply_log_query_data` 解析 `records[].hex`（hex 长度 128=快照 / 64=事件）；事件流展示 type 描述 + payload 可读化，快照流逐通道字段
+
+### 验证
+
+- 构造事件/快照二进制→hex→解析回断言全过（POR/SFT 复位位、coil payload、evt_retry、快照 4ch、负 variation 符号扩展）
+- 2 条快照 hex 响应 payload = 406B < 800B
+- offscreen UI：事件流（上电/复位、线圈事件、event 重发）+ 快照流（4ch/2ch）展示 + 翻页正常
+
+---
+
 ## 2026-08-18 — 脱机日志翻页：上一页/下一页 + 自动填充起始序号

 ### 变更
@@ -34,6 +34,7 @@ from dbn_mqtt_tool.protocol import (
    CMD_LOG_STAT, CMD_LOG_QUERY, CMD_LOG_CLEAR,
    STREAM_EVENT, STREAM_SNAPSHOT,
    ERROR_MSGS, FREQ_LEVELS, OUTPUT_MODES, EVENT_TYPES, LOG_EVENT_TYPE_DESC, SNAP_MISC_TYPE_DESC,
+    OFFLOG_TYPE_NAMES, parse_offlog_hex, offlog_payload_desc, parse_snap_hex,
    data_ssc_net_set, data_iot_net_set, data_iot_topic_set,
    data_pwd_verify, data_pwd_set, data_report_config, data_log_query, data_log_clear,
    build_request, next_msg_id,
@@ -1219,43 +1220,48 @@ class MainWindow(QMainWindow):
    def _apply_log_query_data(self, data: dict):
        records = data.get("records", [])
        start_seq = data.get("start_seq", 0)
-        # 快照记录带 coil_count/channels 字段, 事件记录带 type 字段
-        is_snap = bool(records) and ("coil_count" in records[0] or "channels" in records[0])
+        # V1.07: 记录为 {"seq":N,"hex":"..."} 原始字节; hex 长度 128=快照(64B) / 64=事件(32B)
+        is_snap = bool(records) and len(records[0].get("hex", "")) == 128
        stream_name = "传感快照" if is_snap else "事件日志"
        lines = [f"log_query[{stream_name}] start_seq={start_seq} → 返回 {len(records)} 条:"]
        for rec in records:
-            ts_ms = rec.get("ts_ms", 0)
+            hex_str = rec.get("hex", "")
            if is_snap:
-                coil_count = rec.get("coil_count", 0)
+                s = parse_snap_hex(hex_str)
+                if "error" in s:
+                    lines.append(f"  seq={rec.get('seq', 0)} 解析失败: {s['error']}")
+                    continue
                lines.append(
-                    f"  seq={rec.get('seq', 0)} boot={rec.get('boot_seq', 0)} "
-                    f"boot+{ts_ms}ms ({coil_count}ch)"
+                    f"  seq={s['seq']} boot={s['boot_seq']} "
+                    f"boot+{s['ts_ms']}ms ({s['coil_count']}ch)"
                )
-                for ch in rec.get("channels", []):
-                    mt = ch.get("misc_type", "?")
+                for ch in s["channels"]:
+                    mt = ch["misc_type"]
                    misc_desc = SNAP_MISC_TYPE_DESC.get(mt, mt)
                    lines.append(
-                        f"    ch{ch.get('ch', 0)}: {ch.get('freq_level', '?')} "
-                        f"dir={ch.get('direction', 0)} ftype={ch.get('freq_type', 0)} "
-                        f"sens={ch.get('sensitivity', 0)} cond={ch.get('condition', 0)} "
-                        f"loop={'OK' if ch.get('loop_ok') else '断'} "
-                        f"car={'有' if ch.get('has_car') else '无'} "
-                        f"freq={ch.get('freq', 0)}Hz Δ={ch.get('variation', 0)} "
-                        f"[{misc_desc}] misc={ch.get('misc', 0)}"
+                        f"    ch{ch['ch']}: {ch['freq_level']} "
+                        f"dir={ch['direction']} ftype={ch['freq_type']} "
+                        f"sens={ch['sensitivity']} cond={ch['condition']} "
+                        f"loop={'OK' if ch['loop_ok'] else '断'} "
+                        f"car={'有' if ch['has_car'] else '无'} "
+                        f"freq={ch['freq']}Hz Δ={ch['variation']} "
+                        f"[{misc_desc}] misc={ch['misc']}"
                    )
            else:
-                rtype = rec.get("type", "?")
-                desc = LOG_EVENT_TYPE_DESC.get(rtype, rtype)
-                unix_ts = rec.get("unix_ts", 0)
-                if unix_ts:
-                    ts_str = datetime.fromtimestamp(unix_ts).strftime("%Y-%m-%d %H:%M:%S")
+                e = parse_offlog_hex(hex_str)
+                if "error" in e:
+                    lines.append(f"  seq={rec.get('seq', 0)} 解析失败: {e['error']}")
+                    continue
+                tname = OFFLOG_TYPE_NAMES.get(e["type"], f"0x{e['type']:02x}")
+                desc = LOG_EVENT_TYPE_DESC.get(tname, tname)
+                if e["unix_ts"]:
+                    ts_str = datetime.fromtimestamp(e["unix_ts"]).strftime("%Y-%m-%d %H:%M:%S")
                else:
-                    ts_str = f"boot+{ts_ms}ms (未同步)"
-                rdata = rec.get("data")
-                data_str = json.dumps(rdata, ensure_ascii=False) if rdata else ""
+                    ts_str = f"boot+{e['ts_ms']}ms (未同步)"
+                pdesc = offlog_payload_desc(e["type"], e["payload"])
                lines.append(
-                    f"  seq={rec.get('seq', 0)} boot={rec.get('boot_seq', 0)} "
-                    f"{ts_str} [{desc}] {data_str}"
+                    f"  seq={e['seq']} boot={e['boot_seq']} "
+                    f"{ts_str} [{desc}] {pdesc}"
                )
        if not records:
            lines.append("  (无记录 / 起始序号越界, 可先用 log_stat 确认范围)")