From 67ab9b89a19b117800424c253427b0dd961b2574 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 十一月 2022 13:51:00 +0800
Subject: [PATCH] Merge branch 'dev--wxr'
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index ab8885b..09792f4 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -187,7 +187,7 @@
var list2 = this.GetVideoDeviceList();
list.AddRange(list1);
list.AddRange(list2);
- GetTestDevice(ref list, true);
+ GetTestDevice(ref list, false);
return list;
}
/// <summary>
@@ -416,6 +416,7 @@
case SPK.SensorPir:
case SPK.SensorDoorWindow:
case SPK.SensorUtrasonic:
+ case SPK.SensorMmvPose:
case SPK.SenesorMegahealth:
case SPK.SenesorMegahealth2:
case SPK.SensorEnvironment:
@@ -508,6 +509,7 @@
|| device.spk == SPK.SensorPir
|| device.spk == SPK.SensorDoorWindow
|| device.spk == SPK.SensorUtrasonic
+ || device.spk == SPK.SensorMmvPose
|| device.spk == SPK.SenesorMegahealth
|| device.spk == SPK.SenesorMegahealth2
|| device.spk == SPK.SensorEnvironment
@@ -613,6 +615,7 @@
functionTypeList.Add(SPK.SensorPir);
functionTypeList.Add(SPK.SensorDoorWindow);
functionTypeList.Add(SPK.SensorUtrasonic);
+ functionTypeList.Add(SPK.SensorMmvPose);
functionTypeList.Add(SPK.SenesorMegahealth);
functionTypeList.Add(SPK.SenesorMegahealth2);
functionTypeList.Add(SPK.SensorEnvironment);
@@ -681,6 +684,7 @@
functionTypeList.Add(SPK.SensorPir);
functionTypeList.Add(SPK.SensorDoorWindow);
functionTypeList.Add(SPK.SensorUtrasonic);
+ functionTypeList.Add(SPK.SensorMmvPose);
functionTypeList.Add(SPK.SenesorMegahealth);
functionTypeList.Add(SPK.SenesorMegahealth2);
functionTypeList.Add(SPK.SensorEnvironment);
@@ -740,6 +744,7 @@
deviceTypeList.Add(SPK.SensorPir);
deviceTypeList.Add(SPK.SensorDoorWindow);
deviceTypeList.Add(SPK.SensorUtrasonic);
+ deviceTypeList.Add(SPK.SensorMmvPose);
deviceTypeList.Add(SPK.SenesorMegahealth);
deviceTypeList.Add(SPK.SenesorMegahealth2);
deviceTypeList.Add(SPK.SensorEnvironment);
@@ -1044,7 +1049,7 @@
//瀹氫箟涓�涓眬閮ㄥ彉閲�
string direction = string.Empty;
//涓ょ偣璺濈灏忎簬閰嶇疆璺濈<鏃㈣嚜鍔ㄥ寲閰嶇疆杈撳叆鏉′欢鍦扮悊鍥存爮鍗婂緞>,璇存槑杩涘叆鍖哄煙
- if (r < radius)
+ if (r*1000< radius)
{
//鍒拌揪鏌愬湴
direction = "arrive";
--
Gitblit v1.8.0