From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/Entity/Room.cs | 548 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 405 insertions(+), 143 deletions(-)
diff --git a/HDL_ON/Entity/Room.cs b/HDL_ON/Entity/Room.cs
index 5c0cdcb..609e788 100644
--- a/HDL_ON/Entity/Room.cs
+++ b/HDL_ON/Entity/Room.cs
@@ -1,12 +1,14 @@
锘縰sing System;
using System.Collections.Generic;
+using HDL_ON.DAL.Server;
+using Shared;
namespace HDL_ON.Entity
{
/// <summary>
/// 璇诲彇鏈嶅姟鍣ㄧ┖闂翠俊鎭繑鍥炲埌鏁版嵁鍖�
/// </summary>
- public class RoomApiPack
+ public class SpatialApiPack
{
public List<SpatialInfo> list = new List<SpatialInfo>();
@@ -25,154 +27,411 @@
/// </summary>
public class SpatialInfo
{
- public string roomId = "";
- public string roomName = "";
- public string roomImage = "";
- public string roomType = "";
- public string parentId = "";
- public string uid = Guid.NewGuid().ToString();
-
- public string createTime = "";
- public string modifyTime = "";
-
- protected void SaveSpatialInfo()
- {
- var pm = new DAL.Server.HttpServerRequest();
- if (string.IsNullOrEmpty(createTime) && string.IsNullOrEmpty(modifyTime))
- {
- pm.AddRoom(new List<SpatialInfo>() { this });
- }
- else if (string.IsNullOrEmpty(createTime) && !string.IsNullOrEmpty(modifyTime))
- {
- pm.DeleteRoom(new List<string>() { roomId });
- }
- else if (!string.IsNullOrEmpty(createTime) && !string.IsNullOrEmpty(modifyTime))
- {
- pm.UpdateRoom(new List<SpatialInfo>() { this });
- }
- }
-
- /// <summary>
- /// 鏇存柊妤煎眰淇℃伅
- /// </summary>
- public void UpdateSpatialInfoData()
- {
- if (roomType == "ROOM")
- {
-
- }
- else if (roomType == "FLOOR")
- {
- var tempFloor = Floor.InsFloor.Floors.Find((obj) => obj.roomId == roomId);
- if (tempFloor == null)
- {
- Floor.InsFloor.Floors.Add(this as Floor);
- }
- else
- {
- tempFloor = this as Floor;
- }
- var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(Floor.InsFloor.Floors));
- FileUtils.WriteFileByBytes(Floor.InsFloor.FloorDataSavePath, ssd);
- MainPage.Log("鏇存柊妤煎眰淇℃伅");
- }
- }
- }
-
- /// <summary>
- /// 鎴块棿瀵硅薄
- /// </summary>
- [Serializable]
- public class Floor : SpatialInfo
- {
- #region 妤煎眰鏁版嵁鐩稿叧
- static Floor ins_Floor ;
- public static Floor InsFloor {
- get {
- if(ins_Floor== null)
- {
- ins_Floor = new Floor();
- }
- return ins_Floor;
- }
- }
- public string FloorDataSavePath = "FloorsData";
- /// <summary>
- /// 妤煎眰鍒楄〃
- /// </summary>
- List<Floor> floors;
- public List<Floor> Floors
+ static SpatialInfo _currentSpatial;
+ public static SpatialInfo CurrentSpatial
{
get
{
+ if (_currentSpatial == null)
+ {
+ _currentSpatial = new SpatialInfo();
+ }
+ return _currentSpatial;
+ }
+ }
+ public SpatialInfo()
+ {
+ }
+
+ public SpatialInfo(string spatialType)
+ {
+ roomType = "FLOOR";
+ parentId = DB_ResidenceData.Instance.CurrentRegion.id;
+ }
+
+ public string homeId = "";
+ public string roomId = "";
+ public string roomName = "";
+ //public string roomImage = "";
+ public string roomImage = "Classification/Room/Roombg.png";
+ public string roomType = "";
+ public string parentId = "";
+ public string uid = Guid.NewGuid().ToString();
+ public string floorRoomName = "";
+ public string createTime = "";
+ public string modifyTime = "";
+ ///// <summary>
+ ///// 鍒犻櫎鏍囪 20201208锛氬彲娆�:APP鐨勫湪绾垮拰绂荤嚎闂锛屽垰鍒氱‘瀹氫簡锛岀绾挎棤娉曠紪杈戯紝鍙兘鎺у埗
+ ///// 闇�瑕佸垹闄ゆ暟鎹椂锛屾爣璁颁负锛歵rue
+ ///// 鐢变簯绔垹闄ゆ垚鍔熶箣鍚庯紝杩斿洖鏁版嵁鍐嶆竻闄ゆ湰鍦版暟鎹�
+ ///// </summary>
+ //public bool DeleteSign = false;
+
+ /// <summary>
+ /// 鏇存柊绌洪棿淇℃伅
+ /// </summary>
+ /// <param name="spatials">绌洪棿淇℃伅</param>
+ /// <param name="optionType">鎿嶄綔绫诲瀷锛欰DD/UPDATE/DELETE</param>
+ public void UpdateSpatialList(List<SpatialInfo> spatials)
+ {
+ var roomUpdateList = spatials.FindAll((obj) => obj.roomType == "ROOM");
+ var floorUpdateList = spatials.FindAll((obj) => obj.roomType == "FLOOR");
+ CurrentSpatial.DeleteAllRoom();
+ FloorList.Clear();
+ //澶勭悊鎴块棿鍒楄〃
+ if (roomUpdateList != null && roomUpdateList.Count > 0)
+ {
+ foreach (var newRoom in roomUpdateList)
+ {
+ newRoom.SaveRoomFile();
+ RoomList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Room>(
+ Newtonsoft.Json.JsonConvert.SerializeObject(newRoom)));
+ }
+ }
+ //妤煎眰鎴块棿鍒楄〃
+ if (floorUpdateList != null && floorUpdateList.Count > 0)
+ {
+ foreach (var updateTemp in floorUpdateList)
+ {
+ FloorList.Add(updateTemp);
+ }
+ var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(FloorList));
+ Common.FileUtlis.Files.WriteFileByBytes(dataSavePath, ssd);
+ }
+ }
+
+ #region 妤煎眰鍒楄〃
+ /// <summary>
+ /// 妤煎眰鍒楄〃
+ /// </summary>
+ List<SpatialInfo> floors;
+ /// <summary>
+ /// 妤煎眰鍒楄〃
+ /// </summary>
+ public List<SpatialInfo> FloorList
+ {
+ get
+ {
+ if (MainPage.NoLoginMode)
+ {
+ if (floors == null)
+ {
+ floors = new List<SpatialInfo>();
+ }
+ return floors;
+ }
+
if (floors == null)
{
try
{
- var floorsDataBytes = FileUtils.ReadFile(FloorDataSavePath);
+ var floorsDataBytes = Common.FileUtlis.Files.ReadFile("FloorsData");
if (floorsDataBytes != null)
{
var floorsDataString = System.Text.Encoding.UTF8.GetString(floorsDataBytes);
MainPage.Log(floorsDataString);
- floors = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Floor>>(floorsDataString);
- if (floors == null)
- {
- floors = new List<Floor>();
- }
+ floors = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SpatialInfo>>(floorsDataString);
+ }
+ if(floors == null)
+ {
+ floors = new List<SpatialInfo>();
}
}
catch (Exception ex)
{
+ floors = new List<SpatialInfo>();
MainPage.Log($"妤煎眰鏁版嵁鍒濆鍖栧け璐ワ細{ex.Message}");
}
}
return floors;
}
}
-
+ /// <summary>
+ /// 鏁版嵁淇濆瓨璺緞
+ /// </summary>
+ string dataSavePath
+ {
+ get
+ {
+ if(roomType == "ROOM")
+ {
+ return "RoomPath_" + uid;
+ }
+ if(roomType == "FLOOR")
+ {
+ return "FloorsData";
+ }
+ else
+ {
+ return "SpatialInfo_"+uid;
+ }
+ }
+ }
/// <summary>
/// 澧炲姞妤煎眰
/// </summary>
/// <param name="floor"></param>
- public void AddFloor(Floor floor)
+ public string AddFloor(SpatialInfo floor, out SpatialInfo newFloor)
{
- ins_Floor.floors.Add(floor);
- floor.SaveFloorData();
+ var pm = new HttpServerRequest();
+ var revPack = new ResponsePackNew();
+ revPack = pm.AddRoom(new List<SpatialInfo>() { floor });
+ if (revPack.Code == StateCode.SUCCESS)
+ {
+ var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SpatialInfo>>(revPack.Data.ToString());
+ if (revData.Count > 0)
+ {
+ var addFloor = revData.Find((obj) => obj.uid == floor.uid);
+ 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>
+ /// 鏇存柊妤煎眰淇℃伅
+ /// </summary>
+ /// <param name="floor"></param>
+ public string UpdateFloor(SpatialInfo floor)
+ {
+ var pm = new HttpServerRequest();
+ var revPack = pm.UpdateRoom(new List<SpatialInfo>() { floor });
+ if (revPack.Code == StateCode.SUCCESS)
+ {
+ var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(FloorList));
+ Common.FileUtlis.Files.WriteFileByBytes(dataSavePath, ssd);
+ }
+ return revPack.Code;
}
/// <summary>
/// 鍒犻櫎妤煎眰
/// </summary>
/// <param name="floor"></param>
- public void DelFloor(Floor floor)
+ public string DelFloor(string floorId)
{
- var tRoom = ins_Floor.floors.Find((obj) => obj.uid == floor.uid);
- if (tRoom != null)
+ if (string.IsNullOrEmpty( floorId))
+ return "";
+ var pm = new HttpServerRequest();
+ var code = pm.DeleteRoom(new List<string>() { floorId }).Code;
+ if (code == StateCode.SUCCESS)
{
- ins_Floor.floors.Remove(floor);
- floor.modifyTime = "";
+ var tRoom = CurrentSpatial.FloorList.Find((obj) => obj.roomId == floorId);
+ if (tRoom != null)
+ {
+ CurrentSpatial.FloorList.Remove(tRoom);
+ }
+ var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(FloorList));
+ Common.FileUtlis.Files.WriteFileByBytes(dataSavePath, ssd);
}
- SaveFloorData();
+ else
+ {
+ Utlis.ShowTip(Language.StringByID(StringId.DeleteFloorFail) + "\r\nCode:" + code);
+ }
+ return code;
}
#endregion
- public Floor()
+ #region 鎴块棿鍒楄〃
+ /// <summary>
+ /// 鎴块棿鍒楄〃
+ /// </summary>
+ List<Room> rooms;
+ /// <summary>
+ /// 鎴块棿鍒楄〃
+ /// </summary>
+ public List<Room> RoomList
{
- roomType = "FLOOR";
- parentId = DB_ResidenceData.residenceData.CurReginID;
+ get
+ {
+ if(MainPage.NoLoginMode )
+ {
+ if (rooms == null)
+ {
+ rooms = new List<Room>();
+ }
+ return rooms;
+ }
+ if (rooms == null)
+ {
+ try
+ {
+ rooms = new List<Room> { };
+ var filePathList = Common.FileUtlis.Files.ReadFiles();
+
+ foreach (var filePath in filePathList)
+ {
+ if (filePath.StartsWith("RoomData_"))
+ {
+ var roomDataBytes = Common.FileUtlis.Files.ReadFile(filePath);
+ var roomDataString = System.Text.Encoding.UTF8.GetString(roomDataBytes);
+ var room = Newtonsoft.Json.JsonConvert.DeserializeObject<Room>(roomDataString);
+ if (room != null)
+ {
+ rooms.Add(room);
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"鍔熻兘鏁版嵁鍒濆鍖栧け璐ワ細{ex.Message}");
+ }
+ }
+ return rooms;
+ }
}
/// <summary>
- /// 淇濆瓨妤煎眰鏁版嵁
+ /// 澧炲姞鎴块棿
/// </summary>
- public void SaveFloorData()
+ /// <param name="room"></param>
+ public string AddRoom(Room room,out Room newRoom)
{
- var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(ins_Floor.floors));
- FileUtils.WriteFileByBytes(FloorDataSavePath, ssd);
- MainPage.Log($"Save floor Data");
- base.SaveSpatialInfo();
+ var pm = new HttpServerRequest();
+ var pack = pm.AddRoom(new List<SpatialInfo>() { room });
+
+ if (pack.Code == StateCode.SUCCESS)
+ {
+ var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SpatialInfo>>(pack.Data.ToString());
+ if (revData != null)
+ {
+ if (revData.Count > 0)
+ {
+ var tempRoom = revData.Find((obj) => obj.uid == room.uid);
+ if (tempRoom != null)
+ {
+ 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);
+ }
+ }
+ }
+ }
+ newRoom = room;
+ return pack.Code;
+ }
+ /// <summary>
+ /// 鍒犻櫎鎴块棿
+ /// </summary>
+ /// <param name="room"></param>
+ public string DelRoom(Room room)
+ {
+ var pm = new HttpServerRequest();
+ var pack = pm.DeleteRoom(new List<string>() { room.roomId });
+ if (pack.Code == StateCode.SUCCESS)
+ {
+ var tRoom = RoomList.Find((obj) => obj.roomId == room.roomId);
+ if (tRoom != null)
+ {
+ CurrentSpatial.RoomList.Remove(room);
+ }
+ Common.FileUtlis.Files.DeleteFile(room.dataSavePath);
+ }
+ return pack.Code;
+ }
+ /// <summary>
+ /// 鍒犻櫎鎵�鏈夋埧闂�
+ /// </summary>
+ public void DeleteAllRoom()
+ {
+ for(int i=0;i< RoomList.Count;)
+ {
+ Common.FileUtlis.Files.DeleteFile(RoomList[i].dataSavePath);
+ RoomList.RemoveAt(i);
+ }
+ rooms = null;
}
+ public void Clear()
+ {
+ if (_currentSpatial != null)
+ {
+ if (_currentSpatial.floors != null)
+ {
+ _currentSpatial.floors.Clear();
+ }
+ if (_currentSpatial.rooms != null)
+ {
+ _currentSpatial.rooms.Clear();
+ }
+ _currentSpatial = null;
+ }
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栨瘡涓埧闂寸殑鍔熻兘鏁版嵁
+ /// </summary>
+ public void InitRoomListFunctions()
+ {
+ new System.Threading.Thread(() =>
+ {
+ try
+ {
+ //鍒濆鍖栦綇瀹呮墍鏈夋埧闂村姛鑳芥暟鎹�
+ foreach (var r in RoomList)
+ {
+ InitRoomFuntion(r);
+ }
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"Init room function error : {ex.Message}");
+ }
+ })
+ { IsBackground = true }.Start();
+ }
+ /// <summary>
+ /// 鍒濆鍖栨埧闂村姛鑳�
+ /// </summary>
+ /// <param name="tempRoom"></param>
+ public void InitRoomFuntion(Room tempRoom)
+ {
+ tempRoom.GetRoomFunctions(true);
+ tempRoom.GetRoomScenes(true);
+ }
+
+ /// <summary>
+ /// 淇濆瓨鎴块棿鏁版嵁鏂囦欢
+ /// </summary>
+ public void SaveRoomFile()
+ {
+ var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
+ Common.FileUtlis.Files.WriteFileByBytes(dataSavePath, ssd);
+ }
+ /// <summary>
+ /// 鏇存柊鎴块棿鏁版嵁
+ /// </summary>
+ public void UpdataRoomInfo()
+ {
+ new System.Threading.Thread(() =>
+ {
+ var pm = new HttpServerRequest();
+ var pack = pm.UpdateRoom(new List<SpatialInfo>() { this });
+ this.SaveRoomFile();
+ if (pack.Code != StateCode.SUCCESS)
+ {
+ IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
+ }
+ })
+ { IsBackground = true }.Start();
+ }
+
+ #endregion
+
}
+
+
[Serializable]
public class Room : SpatialInfo
@@ -182,14 +441,27 @@
roomType = "ROOM";
roomName = "Room";
}
- public string backgroundImage = "Classification/Room/Roombg.png";
- public string roomSavePath
+ //public string backgroundImage = "Classification/Room/Roombg.png";
+ public string backgroundImage
{
get
{
- return "RoomPath_" + uid;
+ if (string.IsNullOrEmpty(roomImage))
+ {
+ return "Classification/Room/Roombg.png";
+ }
+ else
+ {
+ return roomImage;
+ }
+ }
+ set
+ {
+ roomImage = value;
}
}
+
+
/// <summary>
/// 妤煎眰
/// </summary>
@@ -198,9 +470,9 @@
{
get
{
- if (Floor.InsFloor.Floors.Count > 0)
+ if (CurrentSpatial.FloorList.Count > 0)
{
- var f = Floor.InsFloor.Floors.Find((obj) => obj.uid == parentId);
+ var f = CurrentSpatial.FloorList.Find((obj) => obj.uid == parentId);
if (f != null)
{
return f.roomName + " ";
@@ -210,10 +482,10 @@
}
}
- /// <summary>
- /// 鎴块棿鍔熻兘鍒楄〃
- /// </summary>
- List<Function> functions = new List<Function>();
+ ///// <summary>
+ ///// 鎴块棿鍔熻兘鍒楄〃
+ ///// </summary>
+ //List<Function> functions = new List<Function>();
/// <summary>
/// 鑾峰彇鎴块棿鍔熻兘鍒楄〃
/// </summary>
@@ -221,13 +493,13 @@
{
if (needRefresh)
{
- functions = new List<Function>();
}
+ var functions = new List<Function>();
if (functions.Count == 0)
{
- foreach (var f in DB_ResidenceData.functionList.GetAllFunction())
+ foreach (var f in FunctionList.List.GetDeviceFunctionList())
{
- if (f.roomIds.Contains(uid) && uid != null)
+ if (f.roomIds.Contains(roomId) && roomId != null)
{
functions.Add(f);
}
@@ -235,22 +507,22 @@
}
return functions;
}
- /// <summary>
- /// 澧炲姞鎴块棿鍔熻兘
- /// 鎿嶄綔鐨勬槸缂撳瓨鏁版嵁锛屼笉鐢ㄤ繚瀛�
- /// </summary>
- public void AddRoomFunction(Function function)
- {
- functions.Add(function);
- }
- /// <summary>
- /// 鍒犻櫎鎴块棿鍔熻兘
- /// 鎿嶄綔鐨勬槸缂撳瓨鏁版嵁锛屼笉鐢ㄤ繚瀛�
- /// </summary>
- public void RemoveRoomFunction(Function function)
- {
- functions.Remove(functions.Find((obj) => obj.sid == function.sid));
- }
+ ///// <summary>
+ ///// 澧炲姞鎴块棿鍔熻兘
+ ///// 鎿嶄綔鐨勬槸缂撳瓨鏁版嵁锛屼笉鐢ㄤ繚瀛�
+ ///// </summary>
+ //public void AddRoomFunction(Function function)
+ //{
+ // functions.Add(function);
+ //}
+ ///// <summary>
+ ///// 鍒犻櫎鎴块棿鍔熻兘
+ ///// 鎿嶄綔鐨勬槸缂撳瓨鏁版嵁锛屼笉鐢ㄤ繚瀛�
+ ///// </summary>
+ //public void RemoveRoomFunction(Function function)
+ //{
+ // functions.Remove(functions.Find((obj) => obj.sid == function.sid));
+ //}
/// <summary>
/// 鎴块棿鍦烘櫙鍒楄〃
/// </summary>
@@ -267,9 +539,9 @@
}
if (scenes.Count == 0)
{
- foreach (var s in DB_ResidenceData.functionList.scenes)
+ foreach (var s in FunctionList.List.scenes)
{
- if (s.roomIds.Contains(uid) && uid != null)
+ if (s.roomIds.Contains(roomId) && roomId != null)
{
scenes.Add(s);
}
@@ -294,16 +566,6 @@
public void RemoveRoomScene(Scene scene)
{
scenes.Remove(scenes.Find((obj) => obj.sid == scene.sid));
- }
- /// <summary>
- /// 淇濆瓨鎴块棿鏁版嵁
- /// </summary>
- public void SaveRoomData()
- {
- var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
- FileUtils.WriteFileByBytes(roomSavePath, ssd);
- MainPage.Log($"Save Room Data {roomName} : {this.uid}");
- base.SaveSpatialInfo();
}
}
--
Gitblit v1.8.0