From 679fc4bd770a6f11bb44526301e7df7f32da52e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E6=B1=82=E5=9C=A3=E5=89=91?=
 <suyulingxm@hotmail.com>
Date: Tue, 18 Nov 2025 15:04:16 +0800
Subject: [PATCH] fix: update MQTT broker address and correct data topic
 structure

- Changed MQTT broker address from 192.168.0.101 to 192.168.1.100 in delete.py.
- Updated meter serial number mappings in sensor.py to use string types for consistency.
- Adjusted data topic paths in sensor.py for improved clarity and functionality.
---
 custom_components/JackeryHome/sensor.py | 32 ++++++++++++-------------
 delete.py                               |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/custom_components/JackeryHome/sensor.py b/custom_components/JackeryHome/sensor.py
index 529363f..46b9831 100644
--- a/custom_components/JackeryHome/sensor.py
+++ b/custom_components/JackeryHome/sensor.py
@@ -23,19 +23,19 @@ _LOGGER = logging.getLogger(__name__)
 
 # Meter SN 映射（传感器ID到meter_sn的映射）
 METER_SN_MAP = {
-    "battery_soc": 21548033,
-    "solar_energy": 16961537,
-    "home_energy": 16936961,
-    "grid_import_energy": 16959489,
-    "grid_export_energy": 16960513,
-    "battery_charge_energy": 16952321,
-    "battery_discharge_energy": 16953345,
-    "solar_power": 1026001,
-    "home_power": 21171201,
-    "grid_import_power": 16930817,
-    "grid_export_power": 16930817,
-    "battery_charge_power": 16931841,
-    "battery_discharge_power": 16931841,
+    "battery_soc": "21548033",
+    "solar_energy": "16961537",
+    "home_energy": "16936961",
+    "grid_import_energy": "16959489",
+    "grid_export_energy": "16960513",
+    "battery_charge_energy": "16952321",
+    "battery_discharge_energy": "16953345",
+    "solar_power": "1026001",
+    "home_power": "21171201",
+    "grid_import_power": "16930817",
+    "grid_export_power": "16930817",
+    "battery_charge_power": "16931841",
+    "battery_discharge_power": "16931841",
 }
 
 # 传感器配置
@@ -199,9 +199,9 @@ class JackeryHomeSensor(SensorEntity):
             "sw_version": "1.0.5",
         }
         self._topic = f"{topic_prefix}/{sensor_id}/state"
-        self._data_topic = "v1/iot_gw/cloud/data/#"  # 接收设备响应数据的主题
+        self._data_topic = "v1/iot_gw/gw/data"  # 接收设备响应数据的主题
         self._data_get_topic = "v1/iot_gw/cloud/data"  # 发送数据请求的基础主题（需要加上 device_sn）
-        self._gw_lwt_topic = "v1/iot_gw/gw_lwt/#"
+        self._gw_lwt_topic = "v1/iot_gw/gw_lwt"
         self._attr_native_value = None
         self._attr_available = False
         self._data_task = None
@@ -441,7 +441,7 @@ class JackeryHomeSensor(SensorEntity):
                 request_data = self._construct_data_get_request()
                 
                 # 发送数据获取请求
-                topic = f"{self._data_get_topic}/{self._device_sn}" if self._device_sn else self._data_get_topic
+                topic = f"{self._data_get_topic}" if self._device_sn else self._data_get_topic
                 await ha_mqtt.async_publish(
                     self.hass,
                     topic,
diff --git a/delete.py b/delete.py
index 7d72591..d90df4b 100644
--- a/delete.py
+++ b/delete.py
@@ -1,7 +1,7 @@
 import json
 import paho.mqtt.client as mqtt
 
-MQTT_BROKER = "192.168.0.101"
+MQTT_BROKER = "192.168.1.100"
 MQTT_PORT = 1883
 MQTT_USERNAME = ""
 MQTT_PASSWORD = ""