From 9b3b40e8f334714a1e22181f3c9ee7083302b7eb Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 23 十一月 2021 09:11:27 +0800
Subject: [PATCH] 2021-11-23-01
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 41 +++++++++++++++++++-
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 12 +++---
HDL_ON/UI/UI2/3-Intelligence/Automation/AirQuality.cs | 6 +-
HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs | 6 +-
4 files changed, 50 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AirQuality.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AirQuality.cs
index 5734dfa..92d1584 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AirQuality.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AirQuality.cs
@@ -57,17 +57,17 @@
if (text == Language.StringByID(StringId.kongqiyou))
{
//浼�
- value = "excellent";
+ value = "Excellent";
}
else if (text == Language.StringByID(StringId.kongqiliang))
{
//鑹�
- value = "good";
+ value = "Good";
}
else if (text == Language.StringByID(StringId.kongqicha))
{
//宸�
- value = "poor";
+ value = "Poor";
}
AddDic(value);
};
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index f616e2c..e6fc71d 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -490,20 +490,20 @@
strtext = Language.StringByID(StringId.tianqibianhua);
switch (value)
{
- case "sunny":
+ case "Sunny":
{
strtext = Language.StringByID(StringId.clearday);
}
break;
- case "cloudy":
+ case "Cloudy":
{
strtext = Language.StringByID(StringId.cloudy);
}
break;
- case "rainy":
+ case "Rain":
{
strtext = Language.StringByID(StringId.rain);
}
@@ -518,20 +518,20 @@
strtext = Language.StringByID(StringId.kongqizhiliang);
switch (value)
{
- case "excellent":
+ case "Excellent":
{
strtext = Language.StringByID(StringId.kongqiyou);
}
break;
- case "good":
+ case "Good":
{
strtext = Language.StringByID(StringId.kongqiliang);
}
break;
- case "poor":
+ case "Poor":
{
strtext = Language.StringByID(StringId.kongqicha);
}
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 7b289d7..0461a5c 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -867,9 +867,9 @@
//缁忕含搴︿负绌�,璁や负鑷姩鍖栨病鏈夐厤缃湴鐞嗗洿鏍忥紝涓嶅鐞�;
continue;
}
- //鑷姩鍖栫含搴�
+ //鑷姩鍖栭厤缃緭鍏ユ潯浠剁含搴�
double lat = Convert.ToDouble(logicDate.geo_fence.latitude);
- //鑷姩鍖栫粡搴�
+ //鑷姩鍖栭厤缃緭鍏ユ潯浠剁粡搴�
double lon = Convert.ToDouble(logicDate.geo_fence.longitude);
//鑷姩鍖栭厤缃緭鍏ユ潯浠�<鍦扮悊鍥存爮鍗婂緞><鍗曚綅锛屽叕閲屻�佸崈绫�.绫�>
int radius = int.Parse(logicDate.geo_fence.radius);
@@ -885,7 +885,8 @@
//绂诲紑
direction = "leave";
}
- bool f= Send.GeoFenceStateReport(logicDate.userLogicId,logicDate.sid, direction);
+ //鎺ㄩ�佺粰浜戠鏄惁鎴愬姛
+ bool f= Send.GeoFenceStateReport(logicDate.userLogicId,logicDate.sid, direction);
//if () { }
//Common.FileUtlis.Files.WriteFileByBytes(savePath, ssd);
}
@@ -894,5 +895,39 @@
}
+
+
+ }
+ public class DD {
+
+ /// <summary>
+ /// 浜戠鍞竴id
+ /// </summary>
+ public string userLogicId = "";
+ /// <summary>
+ /// 缃戝叧id
+ /// </summary>
+ public string gatewayId = "";
+ /// <summary>
+ /// 閫昏緫鍞竴鏍囪瘑
+ /// </summary>
+ public string sid = "";
+ /// <summary>
+ /// 浣忓畢id
+ /// </summary>
+ public string homeId = "";
+ /// <summary>
+ /// 鏄惁鎺ㄩ�佽繃锛坱rue锛氬凡缁忔帹閫侊紝false锛氭病鏈変笉鎺ㄩ�侊級
+ /// </summary>
+ public bool IsPush;
+ /// <summary>
+ /// 鍒拌揪鏌愬湴
+ /// </summary>
+ public string arrive = "";
+ /// <summary>
+ /// 绂诲紑
+ /// </summary>
+ public string leave = "";
+
}
}
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs
index 1c7ba43..1c683eb 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs
@@ -56,15 +56,15 @@
string text = view.btnClick.Tag.ToString();
if (text == Language.StringByID(StringId.clearday))
{
- value = "sunny";
+ value = "Sunny";
}
else if (text == Language.StringByID(StringId.cloudy))
{
- value = "cloudy";
+ value = "Cloudy";
}
else if (text == Language.StringByID(StringId.rain))
{
- value = "rainy";
+ value = "Rain";
}
AddDic(value);
};
--
Gitblit v1.8.0