From 6c5cc2e8072742e318c9db8008e9f7d3f609863a Mon Sep 17 00:00:00 2001
From: H Vs <vson.iwork@outlook.com>
Date: Fri, 31 May 2024 17:43:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AC=AC=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E6=8E=A8=E9=80=81=E6=94=B9=E4=B8=BA=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E5=88=B0topic.push.position?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../appsettings.test.json                      |  2 +-
 .../Resolver/Property/GpsPositionResolver.cs   | 16 ++++++++--------
 .../Property/WifiPlus2PositionResolver.cs      | 16 ++++++++--------
 .../Resolver/Property/WifiPositionResolver.cs  | 18 +++++++++---------
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/GpsCardGatewayPosition.Postion/appsettings.test.json b/GpsCardGatewayPosition.Postion/appsettings.test.json
index 598c24f..50fecb8 100644
--- a/GpsCardGatewayPosition.Postion/appsettings.test.json
+++ b/GpsCardGatewayPosition.Postion/appsettings.test.json
@@ -19,7 +19,7 @@
 		"EnablePushPosition": true,
 		"EnablePushHealthy": true,
 		"EnablePushFast": true, // 快速通道
-		"EnablePushFence": true,
+		"EnablePushFence": false,
 		"EnableLocationMonitor": true, //定位监测（非法区域定位检测）
 		"EnablePushIotPosition": true
 	},
diff --git a/GpsCardGatewayPosition.Service/Resolver/Property/GpsPositionResolver.cs b/GpsCardGatewayPosition.Service/Resolver/Property/GpsPositionResolver.cs
index bf38471..0f7e940 100644
--- a/GpsCardGatewayPosition.Service/Resolver/Property/GpsPositionResolver.cs
+++ b/GpsCardGatewayPosition.Service/Resolver/Property/GpsPositionResolver.cs
@@ -249,14 +249,14 @@ namespace GpsCardGatewayPosition.Service.Resolver.Property
 
             #region 处理围栏
             //过滤历史定位消息
-            if (!hisResult.IsHistoryLocation)
-            {
-                _serviceLocation.ProcessGeofence(loc, messageId);
-            }
-            else
-            {
-                _logger.LogInformation($"设备{serialno}，收到历史定位");
-            }
+            //if (!hisResult.IsHistoryLocation)
+            //{
+            //    _serviceLocation.ProcessGeofence(loc, messageId);
+            //}
+            //else
+            //{
+            //    _logger.LogInformation($"设备{serialno}，收到历史定位");
+            //}
             #endregion
 
             #region 保存最后位置信息
diff --git a/GpsCardGatewayPosition.Service/Resolver/Property/WifiPlus2PositionResolver.cs b/GpsCardGatewayPosition.Service/Resolver/Property/WifiPlus2PositionResolver.cs
index 5bb73da..65e689e 100644
--- a/GpsCardGatewayPosition.Service/Resolver/Property/WifiPlus2PositionResolver.cs
+++ b/GpsCardGatewayPosition.Service/Resolver/Property/WifiPlus2PositionResolver.cs
@@ -683,14 +683,14 @@ namespace GpsCardGatewayPosition.Service.Resolver.Property
                     {
                         #region 处理围栏
                         //过滤历史定位
-                        if (!result.IsHistoryLocation)
-                        {
-                            _serviceLocation.ProcessGeofence(loc, messageId);
-                        }
-                        else
-                        {
-                            _logger.LogInformation($"设备{serialno}，收到历史定位");
-                        }
+                        //if (!result.IsHistoryLocation)
+                        //{
+                        //    _serviceLocation.ProcessGeofence(loc, messageId);
+                        //}
+                        //else
+                        //{
+                        //    _logger.LogInformation($"设备{serialno}，收到历史定位");
+                        //}
                         #endregion
                     }
 
diff --git a/GpsCardGatewayPosition.Service/Resolver/Property/WifiPositionResolver.cs b/GpsCardGatewayPosition.Service/Resolver/Property/WifiPositionResolver.cs
index 94895c2..2c9bd16 100644
--- a/GpsCardGatewayPosition.Service/Resolver/Property/WifiPositionResolver.cs
+++ b/GpsCardGatewayPosition.Service/Resolver/Property/WifiPositionResolver.cs
@@ -387,15 +387,15 @@ namespace GpsCardGatewayPosition.Service.Resolver.Property
 
             #region 处理围栏
             //过滤历史定位消息
-            if (!hisResult.IsHistoryLocation)
-            {
-                //_serviceLocation.ProcessGeofence(loc, messageId);
-               await _serviceLocation.ProcessGeofenceAsync(loc, messageId);
-            }
-            else
-            {
-                _logger.LogInformation($"设备{serialno}，收到历史定位");
-            }
+            //if (!hisResult.IsHistoryLocation)
+            //{
+            //    //_serviceLocation.ProcessGeofence(loc, messageId);
+            //   await _serviceLocation.ProcessGeofenceAsync(loc, messageId);
+            //}
+            //else
+            //{
+            //    _logger.LogInformation($"设备{serialno}，收到历史定位");
+            //}
             #endregion
 
             #region 保存最后位置信息