From 4c6d23a9513a2f67e072ba2596ebdf56265ad573 Mon Sep 17 00:00:00 2001
From: wangfq <wangfq@collectpublish.net>
Date: Wed, 8 Jul 2026 16:54:23 +0800
Subject: [PATCH] =?UTF-8?q?fix(iot=5Fmqtt):=20=E4=BC=A0=E6=84=9F=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=20topic=20=E6=94=B9=E4=B8=BA=20V1.01=20=E5=8F=8C?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98=E5=8D=8F=E8=AE=AE=20dld960/{sn}/dev?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

原 iot_make_topic("dev","data","loop") → dld960/{sn}/dev/data/loop (V1.00)
改为直接用 g_iot_topic.topic_pub → dld960/{sn}/dev (V1.01)
与 report_config 等命令响应共用同一 topic，DBNMQTTool 订阅 dld960/+/dev 可接收到
---
 vd960DBN/BLE/OnlyUpdateApp_Peripheral/APP/iot_mqtt_srv.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/vd960DBN/BLE/OnlyUpdateApp_Peripheral/APP/iot_mqtt_srv.c b/vd960DBN/BLE/OnlyUpdateApp_Peripheral/APP/iot_mqtt_srv.c
index 9dff79c..6b14f3d 100644
--- a/vd960DBN/BLE/OnlyUpdateApp_Peripheral/APP/iot_mqtt_srv.c
+++ b/vd960DBN/BLE/OnlyUpdateApp_Peripheral/APP/iot_mqtt_srv.c
@@ -432,15 +432,14 @@ void iot_mqtt_publish_sensor(void) {
         "{\"msg_id\":%d,\"cmd\":\"loop_data\",\"ts\":%lu,\"data\":%s}",
         ++g_iot_msg_id, mstick() / 1000, data_json);
 
-    char topic[IOT_MQTT_TOPIC_MAX_LEN];
-    iot_make_topic(topic, sizeof(topic), "dev", "data", "loop");
     {
         uint16_t plen = (uint16_t)strlen(payload);
         if (plen > 450) {
             PRINT("IOT: payload too large (%u bytes), skipping\n", plen);
         } else {
-            /* Use net_srv.c mqtt_publish() -- same path as command responses (proven stable) */
-            mqtt_publish(topic, payload, 0);
+            /* V1.01: publish to g_iot_topic.topic_pub = dld960/{sn}/dev */
+            char *pub_topic = (char *)g_iot_topic.topic_pub;
+            mqtt_publish(pub_topic, payload, 0);
         }
     }