From adb12dcdbb2ddaeac687c3aa9e57bb7ed459ab7e Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 24 六月 2020 15:26:46 +0800
Subject: [PATCH] 2020.06.24.01
---
ZigbeeApp/Shared/Phone/Device/Logic/Method.cs | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
index cb77e0c..7ee3967 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);
+ var lightjosn = devicelist.Find((device) => device.Type == DeviceType.DimmableLight || device.Type == DeviceType.OnOffOutput || device.Type == DeviceType.ColorDimmableLight);
if (lightjosn != null)
{
devicetypelist.Add(Language.StringByID(MyInternationalizationString.Lights));
@@ -166,6 +166,7 @@
{
DeviceTypeList.Add(DeviceType.OnOffOutput);//0x0101鍗佽繘鍒�257
DeviceTypeList.Add(DeviceType.DimmableLight);
+ DeviceTypeList.Add(DeviceType.ColorDimmableLight);
}
else if (devicetype == Language.StringByID(MyInternationalizationString.Curtains))
{
@@ -350,6 +351,7 @@
deviceTypeList.Add(DeviceType.WindowCoveringDevice);
deviceTypeList.Add(DeviceType.Thermostat);
deviceTypeList.Add(DeviceType.AirSwitch);
+ deviceTypeList.Add(DeviceType.ColorTemperatureLight);
///闂ㄩ攣鐗规畩
// deviceTypeList.Add(DeviceType.DoorLock);
}
@@ -833,7 +835,7 @@
}
if (LogicView.IfString._SoneLogic == if_logic)
{
- //Sone闂ㄩ攣鑱斿姩浜嬩欢閫昏緫鍒楄〃
+ //Sone闂ㄩ攣甯稿紑妯″紡閫昏緫鍒楄〃
Common.Logic.SoneLogicList.Add(CurrentLogic);
}
@@ -882,11 +884,13 @@
else if (LogicView.IfString._SoneLogic == if_logic)
{
//璺冲埌Sone闂ㄩ攣鑱斿姩浜嬩欢鍒楄〃鐣岄潰
- UserView.HomePage.Instance.RemoveViewByTag("SoneLogic");//绉婚櫎鎵�鏈夋爣璁癓ockListView鐣岄潰
- var soneLogicList = new SoneLogicList();
- UserView.HomePage.Instance.AddChidren(soneLogicList);
- UserView.HomePage.Instance.PageIndex += 1;
- soneLogicList.Show();
+ //UserView.HomePage.Instance.RemoveViewByTag("SoneLogic");//绉婚櫎鎵�鏈夋爣璁癓ockListView鐣岄潰
+ //var soneLogicList = new SoneLogicList();
+ //UserView.HomePage.Instance.AddChidren(soneLogicList);
+ //UserView.HomePage.Instance.PageIndex += 1;
+ //soneLogicList.Show();
+
+ SoneLogicList.soneLogicList?.RefreshView();
}
}
--
Gitblit v1.8.0