From a2d26f15b940c853faaf6d6959b16a6d919cb800 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 27 十一月 2019 19:26:30 +0800
Subject: [PATCH] 请合并最新的代码（完成门锁功能）
---
ZigbeeApp/Shared/Common/SceneUI.cs | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/SceneUI.cs b/ZigbeeApp/Shared/Common/SceneUI.cs
old mode 100755
new mode 100644
index 364b4bb..5cc089d
--- a/ZigbeeApp/Shared/Common/SceneUI.cs
+++ b/ZigbeeApp/Shared/Common/SceneUI.cs
@@ -107,7 +107,27 @@
public string GetZone()
{
var room = Room.CurrentRoom.GetRoomBySceneId(Id);
- if(room==null)
+ if (room == null)
+ {
+ return null;
+ }
+ var floorName = Shared.Common.Config.Instance.Home.GetFloorNameById(room.FloorId);
+ if (floorName == null)
+ {
+ return room.Name;
+ }
+ return $"{floorName},{room.Name}";
+ }
+
+ /// <summary>
+ /// GetZone
+ /// </summary>
+ /// <param name="id"></param>
+ /// <returns></returns>
+ public static string GetZone(int id)
+ {
+ var room = Room.CurrentRoom.GetRoomBySceneId(id);
+ if (room == null)
{
return null;
}
@@ -145,7 +165,7 @@
if (Shared.Common.Room.AllRoomDeviceUIList.Count == 0)
{
-
+
if (Shared.Common.Room.AllRoomDeviceUIList.Count == 0)
{
CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.ThisSceneHaveNoDevice);
@@ -155,7 +175,7 @@
if (sceneDeviceList.getSceneDeviceListInfo != null)
{
var deviceList = sceneDeviceList.getSceneDeviceListInfo.DeviceList;
-
+
if (deviceList != null && Room.AllRoomDeviceUIList.Count != 0)
{
foreach (var sceneDev in deviceList)
@@ -163,13 +183,14 @@
if (sceneDev.Type == 0)
{
var dev = Room.AllRoomDeviceUIList.Find((obj) => obj.DeviceEpoint == sceneDev.Epoint && obj.DeviceAddr == sceneDev.DeviceAddr);
- if(dev!=null)
+ if (dev != null)
{
- var sceneTargetDevice = new SceneTargetDeviceUI {
+ var sceneTargetDevice = new SceneTargetDeviceUI
+ {
Type = 0,
DeviceUI = dev,
TaskList = sceneDev.TaskList,
- DelayTimeSerialNumber= deviceList.IndexOf(sceneDev) + 1
+ DelayTimeSerialNumber = deviceList.IndexOf(sceneDev) + 1
};
targetList.Add(sceneTargetDevice);
@@ -180,7 +201,8 @@
var localScene = Room.AllRoomSceneUIList.Find((obj) => obj.Id == sceneDev.ElseScenesId);
if (localScene != null)
{
- var sceneTargetDeviceScene = new SceneTargetDeviceUI {
+ var sceneTargetDeviceScene = new SceneTargetDeviceUI
+ {
Type = 1,
ElseScenesId = sceneDev.ElseScenesId,
SceneName = localScene.Name,
@@ -196,7 +218,7 @@
{
Type = 2,
DelayTime = sceneDev.DelayTime,
- DelayTimeSerialNumber = deviceList.IndexOf(sceneDev)+1
+ DelayTimeSerialNumber = deviceList.IndexOf(sceneDev) + 1
};
targetList.Add(sceneTargetDeviceScene);
}
--
Gitblit v1.8.0