device-protocol-sdk 1.2.4__tar.gz → 1.2.5__tar.gz

{device_protocol_sdk-1.2.4 → device_protocol_sdk-1.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: device_protocol_sdk
-Version: 1.2.4
+Version: 1.2.5
 Summary: 无人设备协议开发SDK
 Author: fuhl
 Requires-Python: >=3.8
@@ -10,6 +10,7 @@ Requires-Dist: grpcio-tools>=1.48.2
 Requires-Dist: paho-mqtt>=1.6.1
 Requires-Dist: pydantic>=1.9.0
 Requires-Dist: websockets>=10.0
+Requires-Dist: shapely>=2.1.2
 
 # Device Protocol SDK
 

{device_protocol_sdk-1.2.4 → device_protocol_sdk-1.2.5}/device_protocol_sdk/abstract_device.py

@@ -138,6 +138,11 @@ class AbstractDevice(ABC):
                 is_connect,client = self._create_client(device_key.device_id,device_key.connection_str)
                 if is_connect:
                     self._connection_pool[device_key] = client
+                return is_connect,client
+            else:
+                client = self._connection_pool[device_key]
+                return True,client
+
 
     def disconnect(self, device_key: DeviceKey):
         with self._lock:

{device_protocol_sdk-1.2.4 → device_protocol_sdk-1.2.5}/device_protocol_sdk/pusher.py

@@ -9,6 +9,7 @@ from . import device_pb2
 from . import device_pb2_grpc
 from .model.device_key import DeviceKey
 import math
+from shapely.geometry import Point, Polygon
 
 logger = logging.getLogger(__name__)
 
@@ -222,6 +223,52 @@ class DevicePusher:
             logger.warning("MQTT连接断开，尝试重新连接...")
             return await self.setup_mqtt()
         return True
+
+    def is_in_china_shapely(self,lon, lat):
+        """
+        使用更精确的中国边界判断经纬度是否在中国范围内
+        """
+        # 更精确的中国边界坐标（包含主要陆地和主要岛屿）
+        china_coords = [
+            # 中国大陆主要边界点（逆时针）
+            (121.612, 25.288),  # 台湾东北
+            (123.508, 24.445),  # 钓鱼岛附近
+            (125.341, 24.787),  # 东海
+            (129.664, 32.792),  # 日本海附近
+            (130.667, 42.266),  # 吉林延边
+            (131.283, 44.893),  # 吉林珲春
+            (134.773, 48.446),  # 黑龙江抚远
+            (135.092, 47.733),  # 黑龙江同江
+            (137.437, 53.571),  # 外兴安岭附近
+            (119.931, 52.117),  # 内蒙古满洲里
+            (97.234, 42.812),   # 甘肃敦煌
+            (80.260, 42.215),   # 新疆喀什
+            (75.996, 39.468),   # 新疆塔什库尔干
+            (74.890, 37.235),   # 新疆红其拉甫
+            (78.367, 35.427),   # 新疆和田
+            (79.722, 34.468),   # 西藏阿里
+            (81.111, 32.493),   # 西藏狮泉河
+            (82.567, 31.779),   # 西藏改则
+            (85.152, 28.547),   # 西藏聂拉木
+            (86.827, 27.866),   # 西藏定结
+            (88.916, 27.799),   # 西藏亚东
+            (91.681, 27.498),   # 西藏错那
+            (97.352, 28.262),   # 云南贡山
+            (98.494, 24.846),   # 云南瑞丽
+            (101.152, 21.485),  # 云南西双版纳
+            (105.444, 21.531),  # 广西那坡
+            (108.320, 21.573),  # 广西北海
+            (110.355, 20.098),  # 广东湛江
+            (113.823, 22.448),  # 香港
+            (114.296, 22.808),  # 深圳
+            (117.367, 23.752),  # 台湾海峡
+            (121.612, 25.288),  # 回到起点
+        ]
+
+        china_polygon = Polygon(china_coords)
+        point = Point(lon, lat)
+
+        return china_polygon.contains(point)
     async def _report_status_continuously(self,protocol_name, device: 'AbstractDevice', deviceKey: DeviceKey, report_interval=1):
         """通过MQTT持续上报设备状态"""
         """通过MQTT持续上报设备状态，状态为空时停止并清理"""
@@ -251,14 +298,24 @@ class DevicePusher:
                         if not isinstance(status, (list, tuple)):
                             logger.warning(f"设备 {deviceKey} 状态格式错误: {type(status)}")
                             continue
+
                         #将status中的gps坐标系转换 WGS84坐标转换为GCJ02坐标
                         for st in status:
+                            if device.is_connected:
+                                st['is_connect'] = True
+                            else:
+                                st['is_connect'] = False
                             if st and 'lat' in st and 'lon' in st:
-                                lat_wgs84 = st['lat']
-                                lon_wgs84 = st['lon']
-                                lon_gcj02, lat_gcj02 = self.wgs84_to_gcj02(lon_wgs84, lat_wgs84)
-                                st['lat'] = lat_gcj02
-                                st['lon'] = lon_gcj02
+                                if st:
+                                    lat_wgs84 = st['lat']
+                                    lon_wgs84 = st['lon']
+                                    if self.is_in_china_shapely(lon_wgs84,lat_wgs84):
+                                        lon_gcj02, lat_gcj02 = self.wgs84_to_gcj02(lon_wgs84, lat_wgs84)
+                                        st['lat'] = lat_gcj02
+                                        st['lon'] = lon_gcj02
+                                    else:
+                                        st['lat'] = None
+                                        st['lon'] = None
 
 
                         payload = json.dumps({

{device_protocol_sdk-1.2.4 → device_protocol_sdk-1.2.5}/device_protocol_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: device_protocol_sdk
-Version: 1.2.4
+Version: 1.2.5
 Summary: 无人设备协议开发SDK
 Author: fuhl
 Requires-Python: >=3.8
@@ -10,6 +10,7 @@ Requires-Dist: grpcio-tools>=1.48.2
 Requires-Dist: paho-mqtt>=1.6.1
 Requires-Dist: pydantic>=1.9.0
 Requires-Dist: websockets>=10.0
+Requires-Dist: shapely>=2.1.2
 
 # Device Protocol SDK
 

{device_protocol_sdk-1.2.4 → device_protocol_sdk-1.2.5}/device_protocol_sdk.egg-info/requires.txt

@@ -3,3 +3,4 @@ grpcio-tools>=1.48.2
 paho-mqtt>=1.6.1
 pydantic>=1.9.0
 websockets>=10.0
+shapely>=2.1.2

{device_protocol_sdk-1.2.4 → device_protocol_sdk-1.2.5}/setup.py

@@ -7,7 +7,7 @@ long_description = readme_path.read_text(encoding="utf-8")
 
 setup(
     name="device_protocol_sdk",
-    version="1.2.4",
+    version="1.2.5",
     packages=find_packages(include=["sdk*", "device_protocol_sdk*"]),
     install_requires=[
         "grpcio>=1.48.2",  # gRPC 运行时依赖
@@ -15,6 +15,7 @@ setup(
         "paho-mqtt>=1.6.1",  # MQTT 客户端
         "pydantic>=1.9.0",  # 数据验证和设置管理
         "websockets>=10.0",  # Websocket 支持
+        "shapely>=2.1.2",
     ],
     python_requires=">=3.8",
     author="fuhl",