From ac909072af41b3dcb05d4a7df3d27a8e85e4e7e2 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期日, 28 六月 2020 17:43:18 +0800
Subject: [PATCH] 2020-06-28-1
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs | 94 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 91 insertions(+), 3 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 57bd780..dd716fd
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
@@ -987,6 +987,84 @@
}
}
break;
+ case DeviceType.ColorTemperatureLight:
+ {
+ icon = "ZigeeLogic/nightLight.png";
+ var taskList = actions["TaskList"] as List<Dictionary<string, string>>;
+ if (taskList == null)
+ {
+ continue;
+ }
+ foreach (var tasks in taskList)
+ {
+ switch (tasks["TaskType"])
+ {
+ case "1":
+ {
+ if (tasks["Data1"] == "0")
+ {
+ state = Language.StringByID(MyInternationalizationString.close) + ";";
+ }
+ else
+ {
+ state = Language.StringByID(MyInternationalizationString.open) + ";";
+ }
+ }
+ break;
+
+ }
+ }
+ foreach (var tasks in taskList)
+ {
+ switch (tasks["TaskType"])
+ {
+
+ case "3":
+ {
+ var intvalue = int.Parse(tasks["Data1"]);
+ var lightbrightnessvalue = (intvalue * 100) / 254;
+ state += Language.StringByID(MyInternationalizationString.brightness) + lightbrightnessvalue.ToString() + "%;";
+ }
+ break;
+
+ }
+ }
+ foreach (var tasks in taskList)
+ {
+ switch (tasks["TaskType"])
+ {
+
+ case "7":
+ {
+ if (tasks["Data1"] == "0")
+ {
+ state += Language.StringByID(MyInternationalizationString.buzzer) + MyInternationalizationString.close + ";";
+ }
+ else
+ {
+ state += Language.StringByID(MyInternationalizationString.buzzer) + MyInternationalizationString.open + ";";
+ }
+ }
+ break;
+
+ }
+ }
+ foreach (var tasks in taskList)
+ {
+ switch (tasks["TaskType"])
+ {
+
+ case "8":
+ {
+ var intvalue = int.Parse(tasks["Data1"]);
+ var lightbrightnessvalue = intvalue / 100;
+ state += Language.StringByID(MyInternationalizationString.colorTemperature) + lightbrightnessvalue.ToString() + "K";
+ }
+ break;
+ }
+ }
+ }
+ break;
}
}
@@ -1121,9 +1199,19 @@
case 0:
{
var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
- var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
- this.AddChidren(flMain);
- CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "action_logic");
+ if (deviceinof.Type != DeviceType.ColorTemperatureLight)
+ {
+ var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+ this.AddChidren(flMain);
+ CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "action_logic");
+ }
+ else
+ {
+ var nightlight = new Nightlight();
+ UserView.HomePage.Instance.AddChidren(nightlight);
+ UserView.HomePage.Instance.PageIndex += 1;
+ nightlight.Show(deviceinof, true, actions);
+ }
}
break;
case 6:
--
Gitblit v1.8.0