~wjc/HDL_APP_Project.git

			@@ -1,6 +1,8 @@
			using System;
			using System.Collections.Generic;
			using HDL_ON.DAL;
			using HDL_ON.DAL.Net;
			using Shared;

			namespace HDL_ON.Entity
			{
			@@ -11,9 +13,8 @@
			}

			/// <summary>
			/// 0:A协议网关
			/// 1:bus网关
			/// 2:knx网关
			/// 0:bus网关
			/// 1:A协议网关
			/// </summary>
			public int GatewayType = 0;
			/// <summary>
			@@ -23,13 +24,19 @@
			{
			get
			{
			if (MainPage.LocalMode)
			if (MainPage.NoLoginMode)
			{
			return new RegionInfoRes() { Name = "本地模式" };
			}
			else
			{
			return MainPage.LoginUser.regionList.Find((obj) => obj.RegionID == CurReginID);
			var curRegion = MainPage.LoginUser.regionList.Find((obj) => obj.RegionID == CurReginID);
			//if (curRegion == null)
			//{
			// CurReginID = MainPage.LoginUser.regionList[0].RegionID;
			// return MainPage.LoginUser.regionList[0];
			//}
			return curRegion;
			}
			}
			}
			@@ -59,7 +66,7 @@
			var userConfigString = CommonPage.MyEncodingUTF8.GetString(residenceDataBytes);
			DB_ResidenceData temp = null;

			if (!string.IsNullOrEmpty(userConfigString))
			if (!string.IsNullOrEmpty(userConfigString))
			{
			temp = Newtonsoft.Json.JsonConvert.DeserializeObject<DB_ResidenceData>(userConfigString);
			}
			@@ -82,325 +89,26 @@
			ShowFunction.Panel,ShowFunction.SecurityMonitoring,
			ShowFunction.Sensor,ShowFunction.VideoIntercom
			});
			}




			#if DEBUG
			//if (DB_ResidenceData.functionList.scenes.Count == 0)
			//{
			// var s0 = new Scene()
			// {
			// sid = "030101123456780A0A010001ABCD",
			// name = "全关场景",
			// sceneType = SceneType.OrdinaryScenes,
			// roomIdList = new List<string>() { "0001" },
			// bus_SceneData = new Dictionary<string, byte[]>(),
			// };
			// s0.bus_SceneData.Add("030101123456780202010002ABCD", new byte[] { 1, 0, 0, 0 });
			// s0.bus_SceneData.Add("030101123456780202020005ABCD", new byte[] { 1, 0, 0, 0 });
			// s0.bus_SceneData.Add("030101123456780202040006ABCD", new byte[] { 1, 0, 254, 0, 0, 3, 255, 0, 0, 0, 0 });
			// s0.bus_SceneData.Add("030101123456780604010001ABCD", new byte[] { 1, 0, 32, 32, 32, 32, 32, 0, 0, 0, 1, 28, 0 });
			// s0.bus_SceneData.Add("030101123456780303010003ABCD", new byte[] { 1, 2 });
			// DB_ResidenceData.functionList.scenes.Add(s0);
			// var s1 = new Scene()
			// {
			// sid = "030101123456780A0A00010002ABCD",
			// name = "全开场景",
			// sceneType = SceneType.OrdinaryScenes,
			// roomIdList = new List<string>() { "0001" },
			// bus_SceneData = new Dictionary<string, byte[]>(),
			// };
			// s1.bus_SceneData.Add("030101123456780202010002ABCD", new byte[] { 1, 100, 0, 0 });
			// s1.bus_SceneData.Add("030101123456780202020005ABCD", new byte[] { 1, 100, 0, 0 });
			// s1.bus_SceneData.Add("030101123456780202040006ABCD", new byte[] { 1, 100, 254, 0, 0, 3, 255, 0, 0, 0, 0 });
			// s1.bus_SceneData.Add("030101123456780604010001ABCD", new byte[] { 1, 0, 32, 32, 32, 32, 32, 0, 1, 0, 1, 28, 0 });
			// s1.bus_SceneData.Add("030101123456780303010003ABCD", new byte[] { 1, 1 });
			// DB_ResidenceData.functionList.scenes.Add(s1);
			// var s2 = new Scene()
			// {
			// sid = "030101123456780A0A010004ABCD",
			// name = "电影场景",
			// sceneType = SceneType.MovieScene,
			// roomIdList = new List<string>() { "0001" },
			// };
			// DB_ResidenceData.functionList.scenes.Add(s2);
			// var s3 = new Scene()
			// {
			// sid = "030101123456780A0A010005ABCD",
			// name = "电影场景2",
			// sceneType = SceneType.MovieScene,
			// roomIdList = new List<string>() { "0001" },
			// };
			// DB_ResidenceData.functionList.scenes.Add(s3);
			//}

			if (rooms.Count == 0)
			{
			//--------------------
			var r111 = new Room() { sid = "0001", name = "Room-1", floorId = "", backgroundImage = "Classification/Room/Roombg.png" };
			rooms.Add(r111);
			instance.floors.Add(new Floor() { sid = "000022222", name = "1 F" });
			new AC()
			{
			sid = "030101123456780604010001ABCD",
			name = "空调",
			function = new List<Trait>() {
			new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
			new Trait { name="mode", max = 2,min =0,value_key = new List<string>{ "auto", "heat", "cool","dry" } },
			new Trait { name = "fan",max = 3,min =0,value_key = new List<string>{ "low", "medium", "high" ,"auto"} },
			new Trait { name = "temperature", max = 32,min=16,value_key = new List<string>{"up","down" } },
			},
			roomIdList = new List<string>() { "0001" },
			lastState = "制冷中风 18°C",
			bus_Data = new BusData
			{
			SubnetID = 42,
			DeviceID = 8,
			LoopID = 1,
			},
			}.SaveFunctionData();
			new Light()
			{
			sid = "030101123456780202020002ABCD",
			name = "调光灯",
			function = new List<Trait>() {
			new Trait { name="brightness", max=100,min = 0, value_key= new List<string> { "up","down"} },
			},//"brightness",
			roomIdList = new List<string>() { "0001" },
			lastState = "20%",
			bus_Data = new BusData
			{
			SubnetID = 42,
			DeviceID = 9,
			LoopID = 1,
			},

			}.SaveFunctionData();
			new Curtain()
			{
			sid = "030101123456780303010003ABCD",
			name = "窗帘模块",
			roomIdList = new List<string>() { "0001" },
			function = new List<Trait>() {
			new Trait { name="on_off", max=2,min = 0, value_key= new List<string> { "on","off","stop"} },
			},// "curtain",
			lastState = "开",
			bus_Data = new BusData
			{
			SubnetID = 42,
			DeviceID = 7,
			LoopID = 1,
			},
			}.SaveFunctionData();
			new Curtain()
			{
			sid = "030101123456780303030011ABCD",
			name = "开合帘",
			roomIdList = new List<string>() { "0001" },
			function = new List<Trait>() {
			new Trait { name="on_off", max=100,min = 0, value_key= new List<string> { "on","off","stop"} },
			},//"curtaintype",
			lastState = "20%",
			bus_Data = new BusData
			{
			SubnetID = 42,
			DeviceID = 7,
			LoopID = 11,
			},
			}.SaveFunctionData();
			new Curtain()
			{
			sid = "030101123456780503040012ABCD",
			name = "卷帘",
			roomIdList = new List<string>() { "0001" },
			function = new List<Trait>() {
			new Trait { name="on_off", max=2,min = 0, value_key= new List<string> { "on","off","stop"} },
			new Trait { name="percent", max=100,min = 0, value_key= new List<string> { "percent" } },

			},// "rollingshutter",
			lastState = "20%",
			bus_Data = new BusData
			{
			SubnetID = 42,
			DeviceID = 17,
			LoopID = 1,
			},
			}.SaveFunctionData();
			new FloorHeating()
			{
			sid = "030101123456780404020004ABCD",
			name = "地热",
			roomIdList = new List<string>() { "0001" },
			function = new List<Trait>() {
			new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
			new Trait { name="mode", max = 2,min =0,value_key = new List<string>{ "normal", "day", "night","timer","away" } },
			new Trait { name = "temperature", max = 32,min=5,value_key = new List<string>{"up","down" } },
			},//
			lastState = "自动 25°C",
			bus_Data = new BusData
			{
			SubnetID = 111,
			DeviceID = 12,
			LoopID = 1
			}
			}.SaveFunctionData();
			new Light()
			{
			sid = "030101123456780202010005ABCD",
			name = "吊灯",
			function = new List<Trait>() {
			new Trait { name="on_off", max=100,min = 0, value_key= new List<string> { "on","off"} },
			},//"on_off",
			roomIdList = new List<string>() { "0001" },
			bus_Data = new BusData
			{
			SubnetID = 42,
			DeviceID = 6,
			LoopID = 1,
			},
			}.SaveFunctionData();
			new Light()
			{
			sid = "030101123456780202040006ABCD",
			name = "RGB灯",
			function = new List<Trait>() {
			new Trait { name="brightness", max=100,min = 0, value_key= new List<string> { "on","off"} },
			new Trait { name="color", max=100,min = 0, value_key= new List<string> { "255", "255", "255" } },
			},//"brightness,color",
			roomIdList = new List<string>() { "0001" },
			bus_Data = new BusData
			{
			SubnetID = 42,
			DeviceID = 4,
			LoopID = 1,
			},
			}.SaveFunctionData();
			new Fan()
			{
			sid = "030101123456781010020006ABCD",
			name = "风扇",
			function = new List<Trait>() {
			new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
			new Trait { name="percent", max=7,min = 0, value_key= new List<string> { "percent" } },
			},//"brightness,color",
			roomIdList = new List<string>() { "0001" },
			bus_Data = new BusData
			{
			SubnetID = 142,
			DeviceID = 4,
			LoopID = 11,
			},
			}.SaveFunctionData();
			new TV()
			{
			sid = "030101123456781010020006ABCD",
			name = "电视",
			function = new List<Trait>() {
			new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
			},
			roomIdList = new List<string>() { "0001" },
			bus_Data = new BusData
			{
			SubnetID = 142,
			DeviceID = 4,
			LoopID = 111,
			},
			}.SaveFunctionData();
			new SwitchSocket()
			{
			sid = "030101123456780101020006ABCD",
			name = "插座",
			function = new List<Trait>() {
			new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
			},//"brightness,color",
			roomIdList = new List<string>() { "0001" },
			bus_Data = new BusData
			{
			SubnetID = 42,
			DeviceID = 6,
			LoopID = 1,
			},
			}.SaveFunctionData();
			new Sensor()
			{
			sid = "030101123456781005060006ABCD",
			name = "PM2.5",
			roomIdList = new List<string>() { "0001" },
			function = new List<Trait>() {
			new Trait { name="values", max=1,min = 0, value_key= new List<string> { "22"} },
			},
			bus_Data = new BusData
			{
			SubnetID = 111,
			DeviceID = 15,
			LoopID = 1,
			},
			}.SaveFunctionData();
			new Sensor()
			{
			sid = "030101123456781005070006ABCD",
			name = "CO2",
			roomIdList = new List<string>() { "0001" },
			function = new List<Trait>() {
			new Trait { name="values", max=1,min = 0, value_key= new List<string> { "1352"} },
			},
			bus_Data = new BusData
			{
			SubnetID = 111,
			DeviceID = 15,
			LoopID = 1,
			},
			}.SaveFunctionData();
			new Sensor()
			{
			sid = "030101123456781005020006ABCD",
			name = "温度",
			roomIdList = new List<string>() { "0001" },
			function = new List<Trait>() {
			new Trait { name="values", max=1,min = 0, value_key= new List<string> { "28"} },
			},
			bus_Data = new BusData
			{
			SubnetID = 111,
			DeviceID = 15,
			LoopID = 1,
			},
			}.SaveFunctionData();
			new Sensor()
			{
			sid = "030101123456781005050006ABCD",
			name = "TVOC",
			roomIdList = new List<string>() { "0001" },
			function = new List<Trait>() {
			new Trait { name="values", max=1,min = 0, value_key= new List<string> { "0.3"} },
			},
			bus_Data = new BusData
			{
			SubnetID = 111,
			DeviceID = 15,
			LoopID = 1,
			},
			}.SaveFunctionData();
			new Sensor()
			{
			sid = "030101123456781005030006ABCD",
			name = "湿度",
			roomIdList = new List<string>() { "0001" },
			function = new List<Trait>() {
			new Trait { name="values", max=1,min = 0, value_key= new List<string> { "15"} },
			},
			bus_Data = new BusData
			{
			SubnetID = 111,
			DeviceID = 15,
			LoopID = 1,
			},
			}.SaveFunctionData();
			instance.SaveResidenceData();
			}
			#endif

			//new Light()
			//{
			// sid = "030101123456780202010005ABCD",
			// name = "吊灯",
			// function = new List<Trait>() {
			// new Trait { name="on_off", max=100,min = 0, value_key= new List<string> { "on","off"} },
			// },
			// roomIdList = new List<string>() { "0001" },
			// bus_Data = new BusData
			// {
			// SubnetID = 42,
			// DeviceID = 6,
			// LoopID = 1,
			// },
			//}.SaveFunctionData();


			}
			catch (Exception ex)
			{
			@@ -420,6 +128,13 @@
			public void EixtAccount()
			{
			instance = null;
			ins_Room = null;
			ins_OidList = null;
			ins_Function = null;
			if (MainPage.IsRemote)
			{
			Mqtt_Cloud.DisConnectRemoteMqttClient("退出登录，或者切换住宅");
			}
			}

			/// <summary>
			@@ -429,18 +144,23 @@
			/// <summary>
			/// 当前住宅的网关MAC
			/// </summary>
			public string residenceGatewayMAC = "4E47323347591243";
			public string residenceGatewayMAC = "00964E19C4467B1E";
			/// <summary>
			/// 保存住宅数据
			/// </summary>
			public void SaveResidenceData()
			{
			if (this == null\|\| this.residecenInfo==null)
			if (this == null \|\| this.residecenInfo == null)
			return;
			var ssd = CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
			FileUtils.WriteFileByBytes("DB_ResidenceData", ssd);
			MainPage.Log("Save DB_ResidenceData");
			}

			/// <summary>
			/// 当前选择的楼层
			/// </summary>
			public string CurFoor = Language.StringByID(StringId.All);

			#region 房间数据相关
			/// <summary>
			@@ -480,12 +200,12 @@

			foreach (var filePath in filePathList)
			{
			if (filePath.StartsWith("RoomData_") )
			if (filePath.StartsWith("RoomData_"))
			{
			var roomDataBytes = FileUtils.ReadFile(filePath);
			var roomDataString = CommonPage.MyEncodingUTF8.GetString(roomDataBytes);
			var room = Newtonsoft.Json.JsonConvert.DeserializeObject<Room>(roomDataString);
			if(room != null)
			if (room != null)
			{
			ins_Room.Add(room);
			}
			@@ -504,18 +224,16 @@
			/// 删除房间
			/// </summary>
			/// <param name="delRoom"></param>
			public static void DelRoom (Room delRoom)
			public static void DelRoom(Room delRoom)
			{
			var tRoom = rooms.Find((obj) => obj.sid == delRoom.sid);
			if (tRoom!=null)
			if (tRoom != null)
			{
			FileUtils.DeleteFile(delRoom.roomSavePath);
			rooms.Remove(tRoom);
			}
			}

			#endregion


			#region 功能数据
			static FunctionList ins_Function;
			@@ -559,6 +277,7 @@
			break;
			case FunctionType.Curtain:
			case FunctionType.MotorCurtain:
			case FunctionType.RollingShutter:
			//恢复窗帘数据
			var curtainsDataBytes = FileUtils.ReadFile(filePath);
			var curtainsString = CommonPage.MyEncodingUTF8.GetString(curtainsDataBytes);
			@@ -625,17 +344,35 @@
			public static void DelAllFunctionData()
			{
			var filePathList = FileUtils.ReadFiles();

			List<Function> fs = new List<Function>();

			foreach (var filePath in filePathList)
			{
			if (filePath.StartsWith("FunctionData_") && filePath.Length == 13 + 24)
			if (filePath.StartsWith("FunctionData_") && filePath.Length == 13 + 28)
			{
			FileUtils.DeleteFile(filePath);
			}
			}
			ins_Function = new FunctionList();
			ins_Function.aCs = new List<AC>();
			ins_Function.lights = new List<Light>();
			ins_Function.curtains = new List<Curtain>();
			ins_Function.floorHeatings = new List<FloorHeating>();
			ins_Function.sensorsEnvironmentalScience = new List<Sensor>();
			ins_Function.switchSockets = new List<SwitchSocket>();
			ins_Function.tVs = new List<TV>();
			ins_Function.fans = new List<Fan>();
			ins_Function.scenes = new List<Scene>();
			}
			/// <summary>
			/// 删除功能
			/// </summary>
			public static void DelSceneFunction(string fSid)
			{
			var f = functionList.scenes.Find((obj) => obj.sid == fSid);
			if (f != null)
			{
			FileUtils.DeleteFile(f.savePath);
			functionList.scenes.Remove(f);
			}
			}

			/// <summary>
			@@ -684,7 +421,7 @@
			{
			if (ins_OidList == null)
			{
			var bytes = FileUtils.ReadFile("FunctionOidData_AProtocol");
			var bytes = FileUtils.ReadFile("AProtocolData_FunctionOid");
			if (bytes == null \|\| bytes.Length == 0)
			{
			ins_OidList = new List<FunctionOid>();
			@@ -714,16 +451,14 @@
			}
			}
			/// <summary>
			/// 保存oid列表，每次保存都会覆盖
			/// 保存oid数据，每次保存都会覆盖
			/// </summary>
			/// <param name="functionOids"></param>
			public static void SaveFunctionOidList(List<FunctionOid> functionOids)
			public static void SaveFunctionOidJsonDataList(string oidJsonString)
			{
			ins_OidList = new List<FunctionOid>();
			ins_OidList = functionOids;
			oidJsonString = oidJsonString.Replace("add", "get_list_response");
			var oidBytes = System.Text.Encoding.UTF8.GetBytes(oidJsonString);

			var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(ins_OidList));
			FileUtils.WriteFileByBytes("FunctionOidData_AProtocol",ssd);
			FileUtils.WriteFileByBytes("AProtocolData_FunctionOid", oidBytes);
			}

			#endregion