From 0058d3fd5cf6052016ae744aeca2272623bfb6c8 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 28 十月 2019 17:49:52 +0800
Subject: [PATCH] 2019-10-28-2
---
ZigbeeApp/Shared/Common/SceneRoomUI.cs | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/SceneRoomUI.cs b/ZigbeeApp/Shared/Common/SceneRoomUI.cs
old mode 100644
new mode 100755
index 8bdc70d..3692d3f
--- a/ZigbeeApp/Shared/Common/SceneRoomUI.cs
+++ b/ZigbeeApp/Shared/Common/SceneRoomUI.cs
@@ -88,8 +88,7 @@
if (sceneDeviceList.getSceneDeviceListInfo != null)
{
var deviceList = sceneDeviceList.getSceneDeviceListInfo.DeviceList;
- CategoryAddScene.sceneTargetDevicesList?.Clear();
- CategoryAddScene.beforeSceneTargetDevicesList?.Clear();
+ //CategoryAddScene.sceneTargetDevicesList?.Clear();
//绱姞寤舵椂
int AddedDelayTime = 0;
if (deviceList != null && Shared.Common.Room.AllRoomDeviceUIList.Count != 0)
@@ -109,19 +108,19 @@
if (sceneDev.DelayTime - AddedDelayTime > 0)
{
var sceneTargetDeviceTime = new SceneTargetDeviceUI { Type = 1, DelayTime = sceneDev.DelayTime - AddedDelayTime };
- CategoryAddScene.sceneTargetDevicesList.Add(sceneTargetDeviceTime);
- CategoryAddScene.beforeSceneTargetDevicesList.Add(sceneTargetDeviceTime);
+ //CategoryAddScene.sceneTargetDevicesList.Add(sceneTargetDeviceTime);
+ //CategoryAddScene.beforeSceneTargetDevicesList.Add(sceneTargetDeviceTime);
var sceneTargetDevice = new SceneTargetDeviceUI { Type = 0, DeviceUI = dev, TaskList = sceneDev.TaskList };
- CategoryAddScene.sceneTargetDevicesList.Add(sceneTargetDevice);
- CategoryAddScene.beforeSceneTargetDevicesList.Add(sceneTargetDevice);
+ //CategoryAddScene.sceneTargetDevicesList.Add(sceneTargetDevice);
+ //CategoryAddScene.beforeSceneTargetDevicesList.Add(sceneTargetDevice);
AddedDelayTime = sceneDev.DelayTime;
}
else
{
var sceneTargetDevice = new SceneTargetDeviceUI { Type = 0, DeviceUI = dev, TaskList = sceneDev.TaskList };
- CategoryAddScene.sceneTargetDevicesList.Add(sceneTargetDevice);
- CategoryAddScene.beforeSceneTargetDevicesList.Add(sceneTargetDevice);
+ //CategoryAddScene.sceneTargetDevicesList.Add(sceneTargetDevice);
+ //CategoryAddScene.beforeSceneTargetDevicesList.Add(sceneTargetDevice);
}
}
}
@@ -137,18 +136,18 @@
if (sceneDev.DelayTime - AddedDelayTime > 0)
{
var sceneTargetDeviceTime = new SceneTargetDeviceUI { Type = 1, DelayTime = sceneDev.DelayTime - AddedDelayTime };
- CategoryAddScene.sceneTargetDevicesList.Add(sceneTargetDeviceTime);
- CategoryAddScene.beforeSceneTargetDevicesList.Add(sceneTargetDeviceTime);
+ //CategoryAddScene.sceneTargetDevicesList.Add(sceneTargetDeviceTime);
+ //CategoryAddScene.beforeSceneTargetDevicesList.Add(sceneTargetDeviceTime);
var sceneTargetDeviceScene = new SceneTargetDeviceUI { Type = 2, ElseScenesId = sceneDev.ElseScenesId, SceneName = localSceneName };
- CategoryAddScene.sceneTargetDevicesList.Add(sceneTargetDeviceScene);
- CategoryAddScene.beforeSceneTargetDevicesList.Add(sceneTargetDeviceScene);
+ //CategoryAddScene.sceneTargetDevicesList.Add(sceneTargetDeviceScene);
+ //CategoryAddScene.beforeSceneTargetDevicesList.Add(sceneTargetDeviceScene);
AddedDelayTime = sceneDev.DelayTime;
}
else
{
var sceneTargetDeviceScene = new SceneTargetDeviceUI { Type = 2, ElseScenesId = sceneDev.ElseScenesId, SceneName = localSceneName };
- CategoryAddScene.sceneTargetDevicesList.Add(sceneTargetDeviceScene);
- CategoryAddScene.beforeSceneTargetDevicesList.Add(sceneTargetDeviceScene);
+ //CategoryAddScene.sceneTargetDevicesList.Add(sceneTargetDeviceScene);
+ //CategoryAddScene.beforeSceneTargetDevicesList.Add(sceneTargetDeviceScene);
}
}
}
@@ -161,11 +160,11 @@
var scene = new CategoryAddScene();
Phone.UserView.HomePage.Instance.AddChidren(scene);
Phone.UserView.HomePage.Instance.PageIndex += 1;
- CategoryAddScene.SceneText = sceneUI.Name;
- CategoryAddScene.CurrentRoom = room;
- CategoryAddScene.ModifySceneUI = sceneUI;
- CategoryAddScene.Modify = true;
- CategoryAddScene.ImagePath = sceneUI.IconPath;
+ //CategoryAddScene.SceneText = sceneUI.Name;
+ //scene.curRoom = room;
+ //CategoryAddScene.ModifySceneUI = sceneUI;
+ //CategoryAddScene.Modify = true;
+ //CategoryAddScene.ImagePath = sceneUI.IconPath;
scene.Show();
}
catch (Exception ex)
--
Gitblit v1.8.0