From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Common/SceneUI.cs | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/SceneUI.cs b/ZigbeeApp/Shared/Common/SceneUI.cs
old mode 100755
new mode 100644
index 364b4bb..3f4cd40
--- a/ZigbeeApp/Shared/Common/SceneUI.cs
+++ b/ZigbeeApp/Shared/Common/SceneUI.cs
@@ -27,7 +27,7 @@
/// <summary>
/// 鍦烘櫙id
/// </summary>
- public int Id = int.MaxValue;
+ public int Id = -1;
/// <summary>
/// 鍦烘櫙鍚�
@@ -39,7 +39,7 @@
/// </summary>
public string IconPath = "Scene/SceneDefault.png";
/// <summary>
- /// 鍥剧墖鏉ユ簮 0--鏈湴鍥惧簱 1--鎷嶇収 2--绯荤粺鍥惧簱
+ /// 鍥剧墖鏉ユ簮 0--鏈湴鍥惧簱 1--鎷嶇収 2--绯荤粺鍥惧簱
/// </summary>
public int IconPathType = 0;
@@ -73,6 +73,12 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
public int SceneDelayTime = 0;
+
+ /// <summary>
+ /// 鍓╀綑瑙﹀彂鏃堕棿锛屽崟浣嶇
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public int RemainTime;
/// <summary>
/// 鍦烘櫙鎵ц鐩爣
@@ -145,7 +151,7 @@
if (Shared.Common.Room.AllRoomDeviceUIList.Count == 0)
{
-
+
if (Shared.Common.Room.AllRoomDeviceUIList.Count == 0)
{
CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.ThisSceneHaveNoDevice);
@@ -155,7 +161,7 @@
if (sceneDeviceList.getSceneDeviceListInfo != null)
{
var deviceList = sceneDeviceList.getSceneDeviceListInfo.DeviceList;
-
+
if (deviceList != null && Room.AllRoomDeviceUIList.Count != 0)
{
foreach (var sceneDev in deviceList)
@@ -226,6 +232,7 @@
}
});
}
+
#endregion
#region 鈼� 淇濆瓨____________________________
--
Gitblit v1.8.0