From 47239ae675902655eab03a115e05116b0b227d4f Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 24 七月 2020 11:50:27 +0800
Subject: [PATCH] 2020-07-24-1
---
ZigbeeApp/Shared/Phone/Device/Logic/Method.cs | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
index 7ee3967..9629046 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
@@ -108,7 +108,7 @@
List<string> devicetypelist = new List<string>();
devicetypelist.Clear();
- var lightjosn = devicelist.Find((device) => device.Type == DeviceType.DimmableLight || device.Type == DeviceType.OnOffOutput || device.Type == DeviceType.ColorDimmableLight);
+ var lightjosn = devicelist.Find((device) => device.Type == DeviceType.DimmableLight || device.Type == DeviceType.OnOffOutput || device.Type == DeviceType.ColorTemperatureLight);
if (lightjosn != null)
{
devicetypelist.Add(Language.StringByID(MyInternationalizationString.Lights));
@@ -166,7 +166,7 @@
{
DeviceTypeList.Add(DeviceType.OnOffOutput);//0x0101鍗佽繘鍒�257
DeviceTypeList.Add(DeviceType.DimmableLight);
- DeviceTypeList.Add(DeviceType.ColorDimmableLight);
+ DeviceTypeList.Add(DeviceType.ColorTemperatureLight);
}
else if (devicetype == Language.StringByID(MyInternationalizationString.Curtains))
{
@@ -261,8 +261,17 @@
{
break;
}
- patm = $"ZigeeLogic/sensor{iASZonedevice.IasDeviceType}.png";
- selectedpatm = $"ZigeeLogic/selectedsensor{iASZonedevice.IasDeviceType}.png";
+
+ if (device.ModelIdentifier == "MSPIRB-ZB.10")
+ {
+ patm = $"ZigeeLogic/sensor541.png";
+ selectedpatm = $"ZigeeLogic/selectedsensor541.png";
+ }
+ else
+ {
+ patm = $"ZigeeLogic/sensor{iASZonedevice.IasDeviceType}.png";
+ selectedpatm = $"ZigeeLogic/selectedsensor{iASZonedevice.IasDeviceType}.png";
+ }
}
break;
case DeviceType.TemperatureSensor:
@@ -315,6 +324,12 @@
{
patm = "ZigeeLogic/airswitch.png";
selectedpatm = "ZigeeLogic/selectedairswitch.png";
+ }
+ break;
+ case DeviceType.ColorTemperatureLight:
+ {
+ patm = "ZigeeLogic/nightLight.png";
+ selectedpatm = "ZigeeLogic/nightLightSelected.png";
}
break;
}
@@ -374,6 +389,7 @@
deviceTypeList.Add(DeviceType.WindowCoveringDevice);
deviceTypeList.Add(DeviceType.Thermostat);
deviceTypeList.Add(DeviceType.AirSwitch);
+ deviceTypeList.Add(DeviceType.ColorTemperatureLight);
///闂ㄩ攣鐗规畩
// deviceTypeList.Add(DeviceType.DoorLock);
}
@@ -911,5 +927,8 @@
/// 鐣岄潰楂樺害
/// </summary>
public static int H = 1922;
+
+
+
}
}
--
Gitblit v1.8.0