python-aidot 0.3.53__tar.gz → 0.3.54b2__tar.gz

{python_aidot-0.3.53 → python_aidot-0.3.54b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot
-Version: 0.3.53
+Version: 0.3.54b2
 Summary: aidot control wifi lights
 Home-page: https://github.com/Aidot-Development-Team/python-aidot
 Author: aidotdev2024

{python_aidot-0.3.53 → python_aidot-0.3.54b2}/aidot/client.py

@@ -90,6 +90,12 @@ class AidotClient:
                 self._base_url = API_URL_TEMPLATE.format(region=self._region)
                 break
         if token is not None:
+            # ✅ 兼容性处理: v1.0.8 数据结构迁移到 v1.1.3
+            # 旧版本: config_entry.data[CONF_LOGIN_INFO]
+            # 新版本: config_entry.data
+            if token.get(CONF_ID) is None and token.get(CONF_LOGIN_INFO) is not None:
+                token = token.get(CONF_LOGIN_INFO)
+            
             self.login_info = token.copy()
             self.username = token[CONF_USERNAME]
             self.password = token[CONF_PASSWORD]

{python_aidot-0.3.53 → python_aidot-0.3.54b2}/aidot/const.py

@@ -188,6 +188,7 @@ CONF_IS_DEFAULT = "isDefault"
 CONF_TYPE = "type"
 CONF_MODEL_ID = "modelId"
 CONF_MAC = "mac"
+CONF_LOGIN_INFO = "loginInfo"
 CONF_AES_KEY = "aesKey"
 CONF_MODEL_ID = "modelId"
 CONF_HARDWARE_VERSION = "hardwareVersion"
@@ -207,6 +208,8 @@ CONF_RGBW = "RGBW"
 CONF_CCT = "CCT"
 CONF_ACK = "ack"
 CONF_IS_OWNER = "isOwner"
+CONF_GET_DEV_ATTR_REQ = "getDevAttrReq"
+CONF_SET_DEV_ATTR_REQ = "setDevAttrReq"
 
 
 class Identity(StrEnum):

{python_aidot-0.3.53 → python_aidot-0.3.54b2}/aidot/device_client.py

@@ -35,6 +35,8 @@ from .const import (
     CONF_SERVICE_MODULES,
     CONF_ACK,
     CONF_CODE,
+    CONF_GET_DEV_ATTR_REQ,
+    CONF_SET_DEV_ATTR_REQ,
     Identity,
 )
 
@@ -44,10 +46,10 @@ _LOGGER = logging.getLogger(__name__)
 class DeviceStatusData:
     online: bool = False
     on: bool = False
-    rgdb: int = None
-    rgbw: tuple[int, int, int, int] = None
-    cct: int = None
-    dimming: int = None
+    rgdb: int = 0xFF000000
+    rgbw: tuple[int, int, int, int] = (255, 0, 0, 0)
+    cct: int = 2700
+    dimming: int = 100
 
     def update(self, attr: dict[str, Any]) -> None:
         if attr is None:
@@ -57,7 +59,13 @@ class DeviceStatusData:
         if attr.get(CONF_DIMMING) is not None:
             self.dimming = int(attr.get(CONF_DIMMING) * 255 / 100)
         if attr.get(CONF_RGBW) is not None:
-            self.rgdb = attr.get(CONF_RGBW)
+            rgbw_value = attr.get(CONF_RGBW)
+            # If RGBW is 0, set default red color (255, 0, 0, 0)
+            if rgbw_value == 0:
+                self.rgdb = 0xFF000000  # Red in int: 4278190080
+            else:
+                self.rgdb = rgbw_value
+            
             rgbw = ctypes.c_uint32(self.rgdb).value
             r = (rgbw >> 24) & 0xFF
             g = (rgbw >> 16) & 0xFF
@@ -114,6 +122,9 @@ class DeviceClient(object):
     _ping_timer: Any = None
     writer: Any = None
     reader: Any = None
+    syncProperties = [CONF_ON_OFF, CONF_DIMMING, CONF_RGBW, CONF_CCT]
+    heart_time = 10
+    # syncProperties = []
     _TAG: str = "DeviceClient"
     @property
     def connect_and_login(self) -> bool:
@@ -139,7 +150,10 @@ class DeviceClient(object):
         self.password = device.get(CONF_PASSWORD)
         self.device_id = device.get(CONF_ID)
         self._simpleVersion = device.get("simpleVersion")
-        self._TAG = f"{self.device_id}";
+        self._TAG = f"{self.device_id}"
+        # if self.info.model_id == 'lk.WIFI-RGBWLight-D0006':
+        #     self.syncProperties = [CONF_ON_OFF, CONF_DIMMING, CONF_RGBW, CONF_CCT]
+        
         _LOGGER.warning(f"{self._TAG}:{device}")
 
     async def connect(self, ip_address) -> None:
@@ -227,6 +241,7 @@ class DeviceClient(object):
 
             self.ascNumber = json_data[CONF_PAYLOAD][CONF_ASCNUMBER] + 1
             self.status.online = True
+            self._notify_status_update()
             self._receive_task = asyncio.create_task(
                 self.receive_data(),
                 name=f"aidot_receive_{self.device_id}"
@@ -238,7 +253,7 @@ class DeviceClient(object):
                 self._reconnect_handle = None
             self._schedule_ping()
             _LOGGER.warning(f"{self._TAG}:connect success: {self._ip_address}")
-            await self.send_action({}, "getDevAttrReq")
+            await self.send_action(self.syncProperties, CONF_GET_DEV_ATTR_REQ)
         except (BrokenPipeError, ConnectionResetError, Exception) as e:
             _LOGGER.error(f"{self.device_id} login read status error {e}")
 
@@ -281,12 +296,15 @@ class DeviceClient(object):
     def _schedule_ping(self):
         loop = asyncio.get_running_loop()
         loop.create_task(self.send_ping_action())
-        self._ping_timer = loop.call_later(30, self._schedule_ping)
+        self._ping_timer = loop.call_later(self.heart_time, self._schedule_ping)
 
     async def send_dev_attr(self, dev_attr) -> None:
         if not self._connect_and_login:
             raise ConnectionError('Device offline')
-        await self.send_action(dev_attr, "setDevAttrReq")
+        if not self.status.on and not CONF_ON_OFF in dev_attr:
+            self.status.on = True
+            attr[CONF_ON_OFF] = 1
+        await self.send_action(dev_attr, CONF_SET_DEV_ATTR_REQ)
 
     async def async_turn_off(self) -> None:
         await self.send_dev_attr({CONF_ON_OFF: 0})
@@ -309,9 +327,6 @@ class DeviceClient(object):
         current_timestamp_milliseconds = int(time.time() * 1000)
         self.seq_num += 1
         seq = "ha93" + str(self.seq_num).zfill(5)
-        if not self.status.on and not CONF_ON_OFF in attr:
-            self.status.on = True
-            attr[CONF_ON_OFF] = 1
 
         if self._simpleVersion is not None:
             action = {
@@ -320,7 +335,7 @@ class DeviceClient(object):
                 "clientId": "ha-" + self.user_id,
                 "srcAddr": "0." + self.user_id,
                 "seq": "" + seq,
-                "payload": {
+                CONF_PAYLOAD: {
                     "devId": self.device_id,
                     "parentId": self.device_id,
                     "userId": self.user_id,
@@ -338,14 +353,14 @@ class DeviceClient(object):
                 "service": "device",
                 "seq": "" + seq,
                 "srcAddr": "0." + self.user_id,
-                "payload": {
+                CONF_PAYLOAD: {
                     "attr": attr,
                     "ascNumber": self.ascNumber,
                 },
                 "tst": current_timestamp_milliseconds,
                 "deviceId": self.device_id,
             }
-
+        _LOGGER.warning(f"{self.device_id} send_action {action}")
         try:
             self.writer.write(self.get_send_packet(json.dumps(action).encode(), 1))
             await self.writer.drain()
@@ -362,10 +377,10 @@ class DeviceClient(object):
             "service": "test",
             "method": "pingreq",
             "seq": "123456",
-            "srcAddr": "x.xxxxxxx",
+            "srcAddr": "123456",
             CONF_PAYLOAD: {},
         }
-        _LOGGER.info(f"{self.device_id} send_ping_action {ping}")
+        _LOGGER.warning(f"{self.device_id} send_ping_action {ping}")
         try:
             if self.ping_count >= 3:
                 _LOGGER.error(
@@ -375,9 +390,10 @@ class DeviceClient(object):
                 return -1
             if self._connect_and_login is False:
                 return -1
-            self.writer.write(self.get_send_packet(json.dumps(ping).encode(), 2))
-            await self.writer.drain()
+            # self.writer.write(self.get_send_packet(json.dumps(ping).encode(), 2))
+            # await self.writer.drain()
             self.ping_count += 1
+            await self.send_action(self.syncProperties, CONF_GET_DEV_ATTR_REQ)
             return 1
         except Exception as e:
             _LOGGER.error(f"{self.device_id} ping error {e}")
@@ -423,9 +439,5 @@ class DeviceClient(object):
         """延迟重连"""
         _LOGGER.info(f"{self.device_id} _schedule_reconnect")
         loop = asyncio.get_running_loop()
-        # self._reconnect_handle = loop.call_later(
-        #     10,  # 10秒后重连
-        #     lambda: asyncio.create_task(self.async_login())
-        # )
         self._reconnect_handle = loop.call_later(60, self._schedule_reconnect)
         self._login_task = asyncio.create_task(self.async_login())

{python_aidot-0.3.53 → python_aidot-0.3.54b2}/aidot/discover.py

@@ -12,7 +12,7 @@ from .exceptions import AidotOSError
 _LOGGER = logging.getLogger(__name__)
 # _DISCOVER_TIME = 15
 
-_DISCOVER_FAST = 10      # 启动时快速发现
+_DISCOVER_FAST = 6      # 启动时快速发现
 _DISCOVER_SLOW = 120    # 稳定后慢速维持
 
 class BroadcastProtocol:
@@ -111,7 +111,7 @@ class Discover:
 
     def start_repeat_broadcast(self) -> None:
         self._is_close = False
-        self._fast_discover_count = 3  # 前三次快速
+        self._fast_discover_count = 5  # 前5次快速
         self._schedule_broadcast()
 
     def _schedule_broadcast(self) -> None:

{python_aidot-0.3.53 → python_aidot-0.3.54b2}/python_aidot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot
-Version: 0.3.53
+Version: 0.3.54b2
 Summary: aidot control wifi lights
 Home-page: https://github.com/Aidot-Development-Team/python-aidot
 Author: aidotdev2024

{python_aidot-0.3.53 → python_aidot-0.3.54b2}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="python-aidot",
-    version="0.3.53",
+    version="0.3.54b2",
     author="aidotdev2024",
     url='https://github.com/Aidot-Development-Team/python-aidot',
     description="aidot control wifi lights",