From 4cc40d883a00869f9aeec20e120d09c14ab427fb Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 08 四月 2022 13:05:18 +0800
Subject: [PATCH] 2022年04月08日13:03:36
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index b58bcf9..942d93a 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -356,6 +356,9 @@
strPath = "LogicIcon/airconditionerlogic.png";
}
break;
+ case SPK.HvacCac:
+ strPath = "FunctionIcon/Icon/hvaccac.png";
+ break;
case SPK.FloorHeatStandard:
case SPK.HvacFloorHeat:
{
@@ -518,6 +521,7 @@
{
functionTypeList.Add(SPK.AcStandard);
functionTypeList.Add(SPK.HvacAC);
+ functionTypeList.Add(SPK.HvacCac);
}
///鍦版殩绫�
else if (deviceType == Language.StringByID(StringId.FloorHeating))
@@ -604,7 +608,7 @@
functionTypeList.Add(SPK.AirSwitch);
functionTypeList.Add(SPK.PanelSocket);
functionTypeList.Add(SPK.ElectricSocket);
-
+ functionTypeList.Add(SPK.HvacCac);
}
@@ -657,6 +661,7 @@
deviceTypeList.Add(SPK.AirSwitch);
deviceTypeList.Add(SPK.PanelSocket);
deviceTypeList.Add(SPK.ElectricSocket);
+ deviceTypeList.Add(SPK.HvacCac);
}
break;
@@ -930,9 +935,9 @@
continue;
}
//鑷姩鍖栭厤缃緭鍏ユ潯浠剁含搴�
- double lat = Convert.ToDouble(logicDate.geo_fence.latitude);
+ double lat = Convert.ToDouble(logicDate.geo_fence.latitude.Replace(",", "."));
//鑷姩鍖栭厤缃緭鍏ユ潯浠剁粡搴�
- double lon = Convert.ToDouble(logicDate.geo_fence.longitude);
+ double lon = Convert.ToDouble(logicDate.geo_fence.longitude.Replace(",", "."));
//鑷姩鍖栭厤缃緭鍏ユ潯浠�<鍦扮悊鍥存爮鍗婂緞><鍗曚綅锛屽叕閲屻�佸崈绫�.绫�>
int radius = int.Parse(logicDate.geo_fence.radius);
//璁＄畻2涓粡绾害涔嬮棿鐨勮窛绂�
--
Gitblit v1.8.0