pyimouapi 1.2.0__tar.gz → 1.2.2__tar.gz

{pyimouapi-1.2.0 → pyimouapi-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyimouapi
-Version: 1.2.0
+Version: 1.2.2
 Summary: A package for imou open api
 Home-page: https://github.com/Imou-OpenPlatform/Py-Imou-Open-Api
 Author: Imou-OpenPlatform

{pyimouapi-1.2.0 → pyimouapi-1.2.2}/pyimouapi/const.py

@@ -394,7 +394,7 @@ SELECT_TYPE_REF = {
         {
             "ref": "15400",
             "default": "0",
-            "options": ["-1", "0", "1", "2"],
+            "options": ["99", "0", "1", "2"],
             "value_type": "int",
         }
     ],
@@ -493,7 +493,7 @@ TEXT_TYPE_REF = {
             "default": "100",
             "ref_type": "properties",
             "value_type": "int",
-        }
+        },
     ],
 }
 
@@ -503,3 +503,12 @@ BUTTON_TYPE_PARAM_VALUE = {
     "ptz_left": 2,
     "ptz_right": 3,
 }
+
+NIGHT_VISION_MODE_MAP = {
+    "intelligent": "Intelligent",
+    "fullcolor": "FullColor",
+    "infrared": "Infrared",
+    "off": "Off",
+    "lowlight": "LowLight",
+    "smartlowlight": "SmartLowLight"
+}

{pyimouapi-1.2.0 → pyimouapi-1.2.2}/pyimouapi/device.py

@@ -52,7 +52,10 @@ from .const import (
     API_ENDPOINT_GET_IOT_DEVICE_DETAIL_INFO,
     PARAM_ABILITY_REFS,
     PARAM_CHANNELS,
-    PARAM_ACCESS_TYPE, API_ENDPOINT_WAKE_UP_DEVICE, PARAM_URL,
+    PARAM_ACCESS_TYPE,
+    API_ENDPOINT_WAKE_UP_DEVICE,
+    PARAM_URL,
+    NIGHT_VISION_MODE_MAP,
 )
 from .openapi import ImouOpenApiClient
 
@@ -357,6 +360,8 @@ class ImouDeviceManager:
         self, device_id: str, channel_id: str, night_vision_mode: str
     ) -> None:
         """set device night vision mode"""
+        if night_vision_mode in NIGHT_VISION_MODE_MAP:
+            night_vision_mode = NIGHT_VISION_MODE_MAP[night_vision_mode]
         params = {
             PARAM_DEVICE_ID: device_id,
             PARAM_CHANNEL_ID: channel_id,

{pyimouapi-1.2.0 → pyimouapi-1.2.2}/pyimouapi/ha_device.py

@@ -526,6 +526,9 @@ class ImouHaDeviceManager(object):
         if device.selects[select_type].get(PARAM_REF):
             ref_id = device.selects[select_type].get(PARAM_REF)
             value_type = device.selects[select_type].get(PARAM_VALUE_TYPE)
+            # 兼容下音量15400值为-1的情况
+            if ref_id == "15400" and option == "99":
+                option = "-1"
             await self._async_select_option_by_ref(device, option, ref_id, value_type)
         elif PARAM_NIGHT_VISION_MODE == select_type:
             await self.delegate.async_set_device_night_vision_mode(
@@ -575,9 +578,9 @@ class ImouHaDeviceManager(object):
         if data[PARAM_MODE] is not None:
             device.selects[PARAM_NIGHT_VISION_MODE][PARAM_CURRENT_OPTION] = data[
                 PARAM_MODE
-            ]
+            ].lower()
         if data[PARAM_MODES] is not None:
-            device.selects[PARAM_NIGHT_VISION_MODE][PARAM_OPTIONS] = data[PARAM_MODES]
+            device.selects[PARAM_NIGHT_VISION_MODE][PARAM_OPTIONS] = [item.lower() for item in data[PARAM_MODES]]
 
     @staticmethod
     def configure_device_by_ability(
@@ -964,7 +967,7 @@ class ImouHaDeviceManager(object):
             )
             if ref in data[PARAM_PROPERTIES]:
                 device.switches[switch_type][PARAM_STATE] = (
-                        data[PARAM_PROPERTIES][ref] == 1
+                    data[PARAM_PROPERTIES][ref] == 1
                 )
         except Exception as e:
             _LOGGER.error(f"_async_update_device_switch_status_by_ref fail:{e}")
@@ -986,11 +989,16 @@ class ImouHaDeviceManager(object):
                 device_id, device.channel_id, device.product_id, [ref]
             )
             if ref in data[PARAM_PROPERTIES]:
-                device.selects[select_type][PARAM_CURRENT_OPTION] = (
+                value=(
                     str(data[PARAM_PROPERTIES][ref])
                     if isinstance(data[PARAM_PROPERTIES][ref], int)
                     else data[PARAM_PROPERTIES][ref]
                 )
+                device.selects[select_type][PARAM_CURRENT_OPTION] = value
+                # 兼容音量值为-1的情况
+                if ref == "15400" and value == "-1":
+                    device.selects[select_type][PARAM_CURRENT_OPTION] = "99"
+
         except Exception as e:
             _LOGGER.error(f"Error while updating device select status: {e}")
 

{pyimouapi-1.2.0 → pyimouapi-1.2.2}/pyimouapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyimouapi
-Version: 1.2.0
+Version: 1.2.2
 Summary: A package for imou open api
 Home-page: https://github.com/Imou-OpenPlatform/Py-Imou-Open-Api
 Author: Imou-OpenPlatform

{pyimouapi-1.2.0 → pyimouapi-1.2.2}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="pyimouapi",
-    version="1.2.0",
+    version="1.2.2",
     packages=find_packages(),
     description="A package for imou open api",
     long_description=open("README.md", encoding="utf-8").read(),