From 0bf9e65bc3ba98391e7835c922b15baab3c77876 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 01 六月 2020 14:59:39 +0800
Subject: [PATCH] 上传一个合并的版本
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs | 75 +++++++++++++++++++------------------
1 files changed, 39 insertions(+), 36 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
index 97b170b..57bd780 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
@@ -312,11 +312,7 @@
{
case 13:
{
- if (intvalue == "1")
- {
- state=Language.StringByID( MyInternationalizationString.someone);
- }
- else
+ if (conditions.ContainsKey("IgnoreTime"))
{
int minute = int.Parse(conditions["IgnoreTime"]) / 60;
int second = int.Parse(conditions["IgnoreTime"]) % 60;
@@ -340,48 +336,55 @@
}
}
+ else
+ {
+ state = Language.StringByID(MyInternationalizationString.someone);
+ }
+
}
break;
case 21:
case 22:
{
- if (intvalue == "1")
+ if (conditions.ContainsKey("IgnoreTime"))
{
- state =Language.StringByID( MyInternationalizationString.logicopen);
- }
- else
- {
- if (conditions.ContainsKey("IgnoreTime"))
+
+ int minute = int.Parse(conditions["IgnoreTime"]) / 60;
+ int second = int.Parse(conditions["IgnoreTime"]) % 60;
+ if (minute != 0 && second != 0)
{
-
- int minute = int.Parse(conditions["IgnoreTime"]) / 60;
- int second = int.Parse(conditions["IgnoreTime"]) % 60;
- if (minute != 0 && second != 0)
- {
- state = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
-
- }
- else
- {
- if (minute == 0 && second != 0)
- {
- state = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
-
- }
- if (minute != 0 && second == 0)
- {
- state = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.closetime);
-
- }
-
- }
+ state = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
}
else
{
- state =Language.StringByID(MyInternationalizationString.logicclose);
+ if (minute == 0 && second != 0)
+ {
+ state = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
+
+ }
+ if (minute != 0 && second == 0)
+ {
+ state = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.closetime);
+
+ }
+
}
+
}
+ else
+ {
+ if (intvalue == "1")
+ {
+ state = Language.StringByID(MyInternationalizationString.logicopen);
+ }
+ else
+ {
+ state = Language.StringByID(MyInternationalizationString.logicclose);
+ }
+
+ }
+
}
break;
case 40:
@@ -563,11 +566,11 @@
{
if (conditions["AtHome"] == "1")
{
- state = Language.StringByID(MyInternationalizationString.athome) + radius["Radius"] + "绫�";
+ state = Language.StringByID(MyInternationalizationString.athome) + radius["Radius"] + Language.StringByID(MyInternationalizationString.mi);
}
else
{
- state = Language.StringByID(MyInternationalizationString.leavehome) + radius["Radius"] + "绫�";
+ state = Language.StringByID(MyInternationalizationString.leavehome) + radius["Radius"] + Language.StringByID(MyInternationalizationString.mi);
}
}
}
--
Gitblit v1.8.0