From 94e4e5b9fd3da964c44b7b14227d6fe2bbb426d7 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 02 四月 2020 13:56:39 +0800
Subject: [PATCH] 2020-04-02-2
---
ZigbeeApp/Shared/Common/SceneRoomUI.cs | 134 ++------------------------------------------
1 files changed, 7 insertions(+), 127 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/SceneRoomUI.cs b/ZigbeeApp/Shared/Common/SceneRoomUI.cs
index 8bdc70d..b6e5613 100755
--- a/ZigbeeApp/Shared/Common/SceneRoomUI.cs
+++ b/ZigbeeApp/Shared/Common/SceneRoomUI.cs
@@ -26,15 +26,17 @@
{
//閫夋嫨鍦烘櫙--鎵�鏈夋埧闂寸殑鎵�鏈夊満鏅�
AllSceneRoomUIList.Clear();
- List<int> sceneIdList = new List<int> { };
- foreach (var r in Shared.Common.Room.Lists)
+ List<int> sceneIdList = new List<int> { };
+ var listAllRoom = Phone.UserCenter.HdlRoomLogic.Current.GetAllListRooms();
+ foreach (var r in listAllRoom)
{
- if (r.SceneUIList.Count == 0)
+ if (r.ListSceneId.Count == 0)
{
continue;
}
- foreach (var scene in r.SceneUIList)
+ foreach (var sceneId in r.ListSceneId)
{
+ var scene = Phone.UserCenter.HdlSceneLogic.Current.GetSceneUIBySceneId(sceneId);
if (scene == null)
{
continue;
@@ -55,128 +57,6 @@
[Newtonsoft.Json.JsonIgnore]
public static List<SceneRoomUI> AllSceneRoomUIList = new List<SceneRoomUI> { };
- /// <summary>
- /// 缂栬緫鍦烘櫙
- /// </summary>
- /// <param name="sceneUI">sceneUI</param>
- /// <param name="room">Room.</param>
- public static void EditScene(SceneUI sceneUI,Room room)
- {
- Application.RunOnMainThread(async () =>
- {
- try
- {
- CommonPage.Loading.Start();
- //浠庣綉鍏充腑鍙嶅簭鍒楀寲鍑哄搴旂殑鎴块棿璁惧
- var sceneDeviceList = await ZigBee.Device.Scene.GetSceneDeviceListAsync(sceneUI.Id);
- if (sceneDeviceList == null)
- {
- CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.TheMainGatewayIsNotOnLine);
- //CommonPage.Instance.FailureToServer();
- return;
- }
-
- if (Shared.Common.Room.AllRoomDeviceUIList.Count == 0)
- {
- Shared.Common.Room.GetAllRoomDeviceUIList();
- if (Shared.Common.Room.AllRoomDeviceUIList.Count == 0)
- {
- CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.ThisSceneHaveNoDevice);
- }
- //return;
- }
- if (sceneDeviceList.getSceneDeviceListInfo != null)
- {
- var deviceList = sceneDeviceList.getSceneDeviceListInfo.DeviceList;
- CategoryAddScene.sceneTargetDevicesList?.Clear();
- CategoryAddScene.beforeSceneTargetDevicesList?.Clear();
- //绱姞寤舵椂
- int AddedDelayTime = 0;
- if (deviceList != null && Shared.Common.Room.AllRoomDeviceUIList.Count != 0)
- {
- foreach (var sceneDev in deviceList)
- {
- if (sceneDev.Type == 0)
- {
- foreach (var dev in Shared.Common.Room.AllRoomDeviceUIList)
- {
- if (dev == null || dev.CommonDevice == null)
- {
- continue;
- }
- if (dev.CommonDevice.DeviceAddr == sceneDev.DeviceAddr && dev.CommonDevice.DeviceEpoint == sceneDev.Epoint)
- {
- if (sceneDev.DelayTime - AddedDelayTime > 0)
- {
- var sceneTargetDeviceTime = new SceneTargetDeviceUI { Type = 1, DelayTime = sceneDev.DelayTime - AddedDelayTime };
- 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);
- AddedDelayTime = sceneDev.DelayTime;
- }
- else
- {
- var sceneTargetDevice = new SceneTargetDeviceUI { Type = 0, DeviceUI = dev, TaskList = sceneDev.TaskList };
- CategoryAddScene.sceneTargetDevicesList.Add(sceneTargetDevice);
- CategoryAddScene.beforeSceneTargetDevicesList.Add(sceneTargetDevice);
- }
- }
- }
- }
- else if (sceneDev.Type == 1)
- {
- string localSceneName = string.Empty;
- var localScene = SceneRoomUI.AllSceneRoomUIList.Find((obj) => obj.sceneUI.Id == sceneDev.ElseScenesId);
- if (localScene != null)
- {
- localSceneName = localScene.sceneUI.Name;
- }
- if (sceneDev.DelayTime - AddedDelayTime > 0)
- {
- var sceneTargetDeviceTime = new SceneTargetDeviceUI { Type = 1, DelayTime = sceneDev.DelayTime - AddedDelayTime };
- 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);
- AddedDelayTime = sceneDev.DelayTime;
- }
- else
- {
- var sceneTargetDeviceScene = new SceneTargetDeviceUI { Type = 2, ElseScenesId = sceneDev.ElseScenesId, SceneName = localSceneName };
- CategoryAddScene.sceneTargetDevicesList.Add(sceneTargetDeviceScene);
- CategoryAddScene.beforeSceneTargetDevicesList.Add(sceneTargetDeviceScene);
- }
- }
- }
- }
- }
- else
- {
- CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.FailedPleaseTryAgain);
- }
- 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;
- scene.Show();
- }
- catch (Exception ex)
- {
- System.Console.WriteLine($"缂栬緫鍦烘櫙鍑洪敊---{ex.Message}");
- }
- finally
- {
- CommonPage.Loading.Hide();
- }
- });
- }
+
}
}
--
Gitblit v1.8.0