~wxr/HDL_APP_Project.git

			@@ -1,6 +1,7 @@
			using System;
			using System.Collections.Generic;
			using HDL_ON.DAL.Server;
			using Shared;

			namespace HDL_ON.Entity
			{
			@@ -45,148 +46,57 @@
			public SpatialInfo(string spatialType)
			{
			roomType = "FLOOR";
			parentId = DB_ResidenceData.residenceData.CurReginID;
			parentId = DB_ResidenceData.Instance.CurrentRegion.id;
			}

			public string homeId = "";
			public string roomId = "";
			public string roomName = "";
			public string roomImage = "";
			//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>
			/// 删除标记
			/// 需要删除数据时，标记为：true
			/// 由云端删除成功之后，返回数据再清除本地数据
			/// </summary>
			public bool DeleteSign = false;


			protected void SaveSpatialInfo()
			{
			var pm = new 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 DownloadRoomList()
			{
			new System.Threading.Thread(() =>
			{
			var pm = new HttpServerRequest();
			var pack = pm.GetRoomList();
			if (pack.Code == StateCode.SUCCESS)
			{
			var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<SpatialApiPack>(pack.Data.ToString());
			if (revData != null)
			{
			CurrentSpatial.UpdateSpatialList(revData.list, OptionType.Cover);
			}
			}
			else
			{
			MainPage.Log($"读取房间数据失败:\r\nCode:{pack.Code}; msg:{pack.message}");
			}
			})
			{ IsBackground = true }.Start();
			}
			///// <summary>
			///// 删除标记 20201208：可欣:APP的在线和离线问题，刚刚确定了，离线无法编辑，只能控制
			///// 需要删除数据时，标记为：true
			///// 由云端删除成功之后，返回数据再清除本地数据
			///// </summary>
			//public bool DeleteSign = false;

			/// <summary>
			/// 更新空间信息
			/// </summary>
			/// <param name="spatials">空间信息</param>
			/// <param name="optionType">操作类型：ADD/UPDATE/DELETE</param>
			public void UpdateSpatialList(List<SpatialInfo> spatials,OptionType optionType)
			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)
			{
			if (optionType == OptionType.Update)
			foreach (var newRoom in roomUpdateList)
			{
			foreach (var updateTemp in roomUpdateList)
			{
			var localDelRoom = CurrentSpatial.needDeleteRooms.Find((obj) => obj.roomId == updateTemp.roomId);
			if(localDelRoom!= null)
			{
			DelRoom(localDelRoom);

			continue;
			}
			var localRoom = CurrentSpatial.RoomList.Find((obj) => obj.roomId == updateTemp.roomId);
			if (localRoom != null)
			{
			if (localRoom.modifyTime != updateTemp.modifyTime)
			{
			localRoom.roomName = updateTemp.roomName;
			localRoom.roomImage = updateTemp.roomImage;
			localRoom.parentId = updateTemp.parentId;
			localRoom.createTime = updateTemp.createTime;
			localRoom.modifyTime = updateTemp.modifyTime;
			localRoom.SaveRoomData();
			}
			}else
			{
			updateTemp.SaveRoomData();
			}
			}
			}
			else if (optionType == OptionType.Cover)
			{
			CurrentSpatial.DeleteAllRoom();
			foreach(var newRoom in roomUpdateList)
			{
			newRoom.SaveRoomData();
			RoomList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Room>(
			Newtonsoft.Json.JsonConvert.SerializeObject(newRoom)));
			}
			newRoom.SaveRoomFile();
			RoomList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Room>(
			Newtonsoft.Json.JsonConvert.SerializeObject(newRoom)));
			}
			}
			//楼层房间列表
			if (floorUpdateList != null && floorUpdateList.Count > 0)
			{
			if (optionType == OptionType.Update)
			foreach (var updateTemp in floorUpdateList)
			{
			foreach(var updateTemp in floorUpdateList)
			{
			var localFloor = FloorList.Find((obj) => obj.roomId == updateTemp.roomId);
			if (localFloor == null)
			{
			FloorList.Add(updateTemp);
			}
			else
			{
			localFloor = updateTemp;
			}
			}
			CurrentSpatial.SaveFloorData();
			FloorList.Add(updateTemp);
			}
			if(optionType == OptionType.Cover)
			{
			FloorList.Clear();
			foreach (var updateTemp in floorUpdateList)
			{
			FloorList.Add(updateTemp);
			}
			var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(FloorList));
			FileUtils.WriteFileByBytes(dataSavePath, ssd);
			}
			var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(FloorList));
			Common.FileUtlis.Files.WriteFileByBytes(dataSavePath, ssd);
			}
			}

			@@ -202,24 +112,34 @@
			{
			get
			{
			if (MainPage.NoLoginMode)
			{
			if (floors == null)
			{
			floors = new List<SpatialInfo>();
			}
			return floors;
			}

			if (floors == null)
			{
			try
			{
			var floorsDataBytes = FileUtils.ReadFile("FloorsData");
			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<SpatialInfo>>(floorsDataString);
			if (floors == null)
			{
			floors = new List<SpatialInfo>();
			}
			}
			if(floors == null)
			{
			floors = new List<SpatialInfo>();
			}
			}
			catch (Exception ex)
			{
			floors = new List<SpatialInfo>();
			MainPage.Log($"楼层数据初始化失败：{ex.Message}");
			}
			}
			@@ -251,45 +171,74 @@
			/// 增加楼层
			/// </summary>
			/// <param name="floor"></param>
			public void AddFloor(SpatialInfo floor)
			public string AddFloor(SpatialInfo floor, out SpatialInfo newFloor)
			{
			FloorList.Add(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 void UpdateFloor()
			public string UpdateFloor(SpatialInfo floor)
			{
			SaveFloorData();
			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(SpatialInfo floor)
			public string DelFloor(string floorId)
			{
			var tRoom = FloorList.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)
			{
			FloorList.Remove(floor);
			floor.DeleteSign = true;
			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;
			}

			/// <summary>
			/// 保存楼层数据
			/// </summary>
			void SaveFloorData()
			{
			var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(FloorList));
			FileUtils.WriteFileByBytes(dataSavePath, ssd);
			MainPage.Log($"Save floor Data");
			SaveSpatialInfo();
			}


			#endregion

			@@ -305,54 +254,33 @@
			{
			get
			{
			if(MainPage.NoLoginMode )
			{
			if (rooms == null)
			{
			rooms = new List<Room>();
			}
			return rooms;
			}
			if (rooms == null)
			{
			try
			{
			rooms = new List<Room> { };
			var filePathList = FileUtils.ReadFiles();
			var filePathList = Common.FileUtlis.Files.ReadFiles();

			foreach (var filePath in filePathList)
			{
			if (filePath.StartsWith("RoomData_"))
			{
			var roomDataBytes = FileUtils.ReadFile(filePath);
			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 )
			if (room != null)
			{
			if(room.DeleteSign)
			{
			needDeleteRooms.Add(room);
			}else
			{
			rooms.Add(room);
			}
			rooms.Add(room);
			}
			}
			}
			if(needDeleteRooms.Count>0)
			{
			//删除已经标记需要删除的房间
			new System.Threading.Thread(() =>
			{
			var delIds = new List<string>();
			foreach(var delTemp in needDeleteRooms)
			{
			delIds.Add(delTemp.roomId);
			}
			var pm = new HttpServerRequest();
			var pack = pm.DeleteRoom(delIds);
			if (pack.Code == StateCode.SUCCESS)
			{
			foreach (var delTemp in needDeleteRooms)
			{
			FileUtils.DeleteFile(delTemp.dataSavePath);
			}
			needDeleteRooms.Clear();
			}
			})
			{ IsBackground = true }.Start();
			}
			}
			catch (Exception ex)
			@@ -364,65 +292,87 @@
			}
			}
			/// <summary>
			/// 需要删除的房间
			/// 本地标记删除了，但是服务上没有删除
			/// 无法与服务器通讯造成删除不成功，通讯成功之后要重新删除
			/// </summary>
			List<Room> needDeleteRooms = new List<Room>();
			/// <summary>
			/// 增加房间
			/// </summary>
			/// <param name="room"></param>
			public void AddRoom(Room room)
			public string AddRoom(Room room,out Room newRoom)
			{
			RoomList.Add(room);
			room.SaveRoomData();
			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 void DelRoom(Room room)
			public string DelRoom(Room room)
			{
			new System.Threading.Thread(() =>
			var pm = new HttpServerRequest();
			var pack = pm.DeleteRoom(new List<string>() { room.roomId });
			if (pack.Code == StateCode.SUCCESS)
			{
			room.DeleteSign = true;
			room.SaveRoomData();
			var tRoom = RoomList.Find((obj) => obj.uid == room.uid);
			var tRoom = RoomList.Find((obj) => obj.roomId == room.roomId);
			if (tRoom != null)
			{
			RoomList.Remove(room);
			CurrentSpatial.RoomList.Remove(room);
			}
			var temp = needDeleteRooms.Find((obj) => obj.uid == room.uid);
			if (temp != null)
			{
			needDeleteRooms.Add(room);
			}
			var pm = new HttpServerRequest();
			var pack = pm.DeleteRoom(new List<string>() { room.roomId });
			if (pack.Code == StateCode.SUCCESS)
			{
			FileUtils.DeleteFile(room.dataSavePath);
			needDeleteRooms.Remove(room);
			}
			})
			{ IsBackground = true }.Start();
			Common.FileUtlis.Files.DeleteFile(room.dataSavePath);
			}
			return pack.Code;
			}
			/// <summary>
			/// 删除所有房间
			/// </summary>
			public void DeleteAllRoom()
			{
			foreach(var localRoom in RoomList)
			for(int i=0;i< RoomList.Count;)
			{
			FileUtils.DeleteFile(localRoom.dataSavePath);
			Common.FileUtlis.Files.DeleteFile(RoomList[i].dataSavePath);
			RoomList.RemoveAt(i);
			}
			RoomList.Clear();
			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 InitRoomFunction()
			public void InitRoomListFunctions()
			{
			new System.Threading.Thread(() =>
			{
			@@ -431,8 +381,7 @@
			//初始化住宅所有房间功能数据
			foreach (var r in RoomList)
			{
			r.GetRoomFunctions(true);
			r.GetRoomScenes(true);
			InitRoomFuntion(r);
			}
			}
			catch (Exception ex)
			@@ -442,17 +391,42 @@
			})
			{ IsBackground = true }.Start();
			}
			/// <summary>
			/// 初始化房间功能
			/// </summary>
			/// <param name="tempRoom"></param>
			public void InitRoomFuntion(Room tempRoom)
			{
			tempRoom.GetRoomFunctions(true);
			tempRoom.GetRoomScenes(true);
			}

			/// <summary>
			/// 保存房间数据
			/// 保存房间数据文件
			/// </summary>
			public void SaveRoomData()
			public void SaveRoomFile()
			{
			var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
			FileUtils.WriteFileByBytes(dataSavePath, ssd);
			MainPage.Log($"Save Room Data {roomName} : {uid}");
			SaveSpatialInfo();
			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

			}
			@@ -467,7 +441,26 @@
			roomType = "ROOM";
			roomName = "Room";
			}
			public string backgroundImage = "Classification/Room/Roombg.png";
			//public string backgroundImage = "Classification/Room/Roombg.png";
			public string backgroundImage
			{
			get
			{
			if (string.IsNullOrEmpty(roomImage))
			{
			return "Classification/Room/Roombg.png";
			}
			else
			{
			return roomImage;
			}
			}
			set
			{
			roomImage = value;
			}
			}


			/// <summary>
			/// 楼层
			@@ -477,9 +470,9 @@
			{
			get
			{
			if (FloorList.Count > 0)
			if (CurrentSpatial.FloorList.Count > 0)
			{
			var f = FloorList.Find((obj) => obj.uid == parentId);
			var f = CurrentSpatial.FloorList.Find((obj) => obj.uid == parentId);
			if (f != null)
			{
			return f.roomName + " ";
			@@ -489,10 +482,10 @@
			}
			}

			/// <summary>
			/// 房间功能列表
			/// </summary>
			List<Function> functions = new List<Function>();
			///// <summary>
			///// 房间功能列表
			///// </summary>
			//List<Function> functions = new List<Function>();
			/// <summary>
			/// 获取房间功能列表
			/// </summary>
			@@ -500,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);
			}
			@@ -514,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>
			@@ -546,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);
			}