From d7ad5a3953a8cd001659092ebde204b881f94b9d Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 31 十月 2019 10:47:13 +0800
Subject: [PATCH] 2019-10-31-1
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
old mode 100755
new mode 100644
index f0a810c..4f954b9
--- 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 };
@@ -719,6 +718,7 @@
break;
case DeviceType.DoorLock:
{
+ conditionIcon.UnSelectedImagePath = "ZigeeLogic/doorlock.png";
for (int a = 0; a < Common.Logic.CurrentLogic.Accounts.Count; a++)
{
if (Common.Logic.CurrentLogic.Accounts[a]["Type"] == "1")
@@ -732,6 +732,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;
@@ -1166,13 +1185,6 @@
///缂栬緫鐐瑰嚮浜嬩欢
deviceedit.MouseUpEventHandler += (sender, e) =>
{
- //var deviceStatePage = new DeviceStatePage();
- //UserView.HomePage.Instance.AddChidren(deviceStatePage);
- //UserView.HomePage.Instance.PageIndex += 1;
- //deviceStatePage.IsDeviceEditor = true;
- //deviceStatePage.Show(deviceinof);
-
- //ActionModifyDeviceStateView(deviceinof);
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
this.AddChidren(flMain);
LogicDevicePage.CurrentDeviceStateView(flMain, deviceinof, true);
--
Gitblit v1.8.0