From 31497bb69602433d94c8a28ea01c3ee3c7cc8576 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 24 十月 2019 14:32:30 +0800
Subject: [PATCH] 完全合并了Wjc，Xm 的 代码
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
index f0a810c..d6f3727 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
@@ -529,7 +529,6 @@
deviceedit.MouseUpEventHandler += (sender, e) =>
{
-
if (deviceinof.Type != DeviceType.DoorLock)
{
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
@@ -734,6 +733,25 @@
}
}
break;
+ case DeviceType.TemperatureSensor:
+ // conditionIcon.UnSelectedImagePath = "ZigeeLogic/temperature.png";
+ var dev = deviceinof as TemperatureSensor;
+ if (conditions["Cluster_ID"]=="1026") {
+ dev.SensorDiv = 1;
+ } else {
+ dev.SensorDiv = 2;
+ }
+ if (conditions["Cluster_ID"] == "1026")
+ {
+ conditionIcon.UnSelectedImagePath = "ZigeeLogic/temperature.png";
+ devicestatus.Text = ">" + conditions["AttriButeData1"] + "鈩�";
+ }
+ else
+ {
+ conditionIcon.UnSelectedImagePath = "ZigeeLogic/humidity.png";
+ devicestatus.Text = "<" + conditions["AttriButeData1"] + "%";
+ }
+ break;
}
--
Gitblit v1.8.0