From 652243206427f35a256400a149a1734085824cb9 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 02 九月 2020 17:35:03 +0800
Subject: [PATCH] 2020-09-02-4
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs | 39 ++++++++++++++++-----------------------
1 files changed, 16 insertions(+), 23 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs
index 4d6893e..aa065e0 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs
@@ -171,19 +171,23 @@
case DeviceType.IASZone:
{
var iASZonedevice = deviceinof as IASZone;
- var intvalue = conditions["AttriButeData1"];
+ //var intvalue = conditions["AttriButeData1"];
+ string if_value = "5";
+ var intvalue = conditions["Range"];
icon = $"ZigeeLogic/sensor{iASZonedevice.IasDeviceType}.png";
switch (iASZonedevice.IasDeviceType)
{
case 13:
{
- if (conditions["Cluster_ID"] == "1024")
+ if (conditions["Cluster_ID"] == "1024")
{
state = Language.StringByID(MyInternationalizationString.ambientLight) + "<" + conditions["AttriButeData1"] + "lux" + Language.StringByID(MyInternationalizationString.hour1);
}
else
{
- if (conditions.ContainsKey("IgnoreTime"))
+
+
+ if (conditions.ContainsKey("IgnoreTime")&& conditions["IgnoreTime"]!="0")
{
int minute = int.Parse(conditions["IgnoreTime"]) / 60;
int second = int.Parse(conditions["IgnoreTime"]) % 60;
@@ -217,9 +221,9 @@
case 21:
case 22:
{
- if (conditions.ContainsKey("IgnoreTime"))
- {
+ if (conditions.ContainsKey("IgnoreTime")&&conditions["IgnoreTime"] != "0")
+ {
int minute = int.Parse(conditions["IgnoreTime"]) / 60;
int second = int.Parse(conditions["IgnoreTime"]) % 60;
if (minute != 0 && second != 0)
@@ -245,7 +249,7 @@
}
else
{
- if (intvalue == "1")
+ if (intvalue == if_value)
{
state = Language.StringByID(MyInternationalizationString.logicopen);
}
@@ -260,7 +264,7 @@
break;
case 40:
{
- if (intvalue == "1")
+ if (intvalue == if_value)
{
state =Language.StringByID(MyInternationalizationString.smokescreen);
}
@@ -269,7 +273,7 @@
break;
case 42:
{
- if (intvalue == "1")
+ if (intvalue == if_value)
{
state =Language.StringByID( MyInternationalizationString.waterleakage);
}
@@ -281,7 +285,7 @@
break;
case 43:
{
- if (intvalue == "1")
+ if (intvalue == if_value)
{
state =Language.StringByID( MyInternationalizationString.gas);
}
@@ -290,7 +294,7 @@
break;
case 277:
{
- if (intvalue == "1")
+ if (intvalue == if_value)
{
state =Language.StringByID( MyInternationalizationString.callthepolice);
}
@@ -299,7 +303,7 @@
break;
default:
{
- if (intvalue == "1")
+ if (intvalue == if_value)
{
state =Language.StringByID(MyInternationalizationString.callthepolice);
}
@@ -537,18 +541,7 @@
alert.ConfirmClickEvent += () =>
{
Common.Logic.CurrentLogic.Conditions.Remove(conditions);
- var exist = Common.Logic.CurrentLogic.Conditions.Find((obj) => obj["Type"] == "7");
- if (exist == null)
- {
- //濡傛灉娌℃湁寮�鍚疓PS鏈嶅姟,鎵撳紑鏈嶅姟骞朵笖淇濆瓨鐘舵�佸湪鏈湴锛�
- Application.StopGPSLocationService();
- Send.SaveLocalFile("GPS_File", "0");
- }
selecteddevice.selecetdFrameLayout.RemoveFromParent();
- //var logicCommunalPage = new LogicCommunalPage();
- //UserView.HomePage.Instance.AddChidren(logicCommunalPage);
- //UserView.HomePage.Instance.PageIndex += 1;
- //logicCommunalPage.Show(() => { });
};
};
@@ -928,7 +921,7 @@
{
var intvalue = int.Parse(tasks["Data1"]);
var colorTemperatureValue = 1000000 / (intvalue * 100);
- state += Language.StringByID(MyInternationalizationString.colorTemperature) + colorTemperatureValue.ToString() + "K";
+ state += Language.StringByID(MyInternationalizationString.colorTemperature) + colorTemperatureValue.ToString() + "00K";
}
break;
}
--
Gitblit v1.8.0