From 9ed4d6675aa1f0abe20e3f84e92f5ac2da8ab4f4 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期六, 12 十二月 2020 20:02:00 +0800
Subject: [PATCH] 20201212-4
---
HDL_ON/Entity/Room.cs | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/Entity/Room.cs b/HDL_ON/Entity/Room.cs
index bcd9ea2..dcad772 100644
--- a/HDL_ON/Entity/Room.cs
+++ b/HDL_ON/Entity/Room.cs
@@ -247,7 +247,7 @@
/// 澧炲姞妤煎眰
/// </summary>
/// <param name="floor"></param>
- public string AddFloor(SpatialInfo floor)
+ public string AddFloor(SpatialInfo floor, out SpatialInfo newFloor)
{
var pm = new HttpServerRequest();
var revPack = new ResponsePackNew();
@@ -255,17 +255,23 @@
if (revPack.Code == StateCode.SUCCESS)
{
var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SpatialInfo>>(revPack.Data.ToString());
- if(revData.Count>0)
+ if (revData.Count > 0)
{
var addFloor = revData.Find((obj) => obj.uid == floor.uid);
- if(addFloor!= null)
+ if (addFloor != null)
{
CurrentSpatial.FloorList.Add(addFloor);
+ floor = addFloor;
}
}
var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(CurrentSpatial.FloorList));
Common.FileUtlis.Files.WriteFileByBytes(dataSavePath, ssd);
}
+ else
+ {
+ Utlis.ShowTip(Language.StringByID(StringId.AddFloorFail) + "\r\nCode:" + revPack.Code);
+ }
+ newFloor = floor;
return revPack.Code;
}
/// <summary>
@@ -357,7 +363,7 @@
/// 澧炲姞鎴块棿
/// </summary>
/// <param name="room"></param>
- public string AddRoom(Room room)
+ public string AddRoom(Room room,out Room newRoom)
{
var pm = new HttpServerRequest();
var pack = pm.AddRoom(new List<SpatialInfo>() { room });
@@ -372,7 +378,7 @@
var tempRoom = revData.Find((obj) => obj.uid == room.uid);
if (tempRoom != null)
{
- room = tempRoom as Room;
+ room.roomId = tempRoom.roomId;
CurrentSpatial.RoomList.Add(room);
var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(room));
Common.FileUtlis.Files.WriteFileByBytes(dataSavePath, ssd);
@@ -380,6 +386,7 @@
}
}
}
+ newRoom = room;
return pack.Code;
}
/// <summary>
@@ -415,8 +422,14 @@
public void ClearRooms()
{
- floors.Clear();
- rooms.Clear();
+ if (floors != null)
+ {
+ floors.Clear();
+ }
+ if (rooms != null)
+ {
+ rooms.Clear();
+ }
}
/// <summary>
@@ -531,7 +544,7 @@
}
if (functions.Count == 0)
{
- foreach (var f in DB_ResidenceData.functionList.GetAllFunction())
+ foreach (var f in FunctionList.List.GetDeviceFunctionList())
{
if (f.roomIds.Contains(roomId) && roomId != null)
{
@@ -573,7 +586,7 @@
}
if (scenes.Count == 0)
{
- foreach (var s in DB_ResidenceData.functionList.scenes)
+ foreach (var s in FunctionList.List.scenes)
{
if (s.roomIds.Contains(roomId) && roomId != null)
{
--
Gitblit v1.8.0