~wjc/HDL_APP_Project.git

			@@ -9,33 +9,59 @@
			public DB_ResidenceData()
			{
			}

			/// <summary>
			/// 住宅名称
			/// 0:A协议网关
			/// 1:bus网关
			/// 2:knx网关
			/// </summary>
			public string residenceName;
			public int GatewayType = 0;

			/// <summary>
			/// 住宅图片
			/// 住宅基础信息
			/// </summary>
			public string residenceImage;
			public RegionInfoRes residecenInfo
			{
			get
			{
			if (MainPage.LocalMode)
			{
			return new RegionInfoRes() { Name = "本地模式" };
			}
			else
			{
			return MainPage.LoginUser.regionList.Find((obj) => obj.RegionID == CurReginID);
			}
			}
			}

			/// <summary>
			/// 当前选择的住宅索引
			/// </summary>
			public string CurReginID = "";

			/// <summary>
			/// 楼层列表
			/// </summary>
			public List<string> floors = new List<string>();
			public List<Floor> floors = new List<Floor>();

			/// <summary>
			/// 房间列表
			/// </summary>
			public List<Room> rooms = new List<Room>();

			/// <summary>
			/// 功能类型列表
			/// </summary>
			public List<string> functionTypeList = new List<string>();
			/// <summary>
			/// 功能列表
			/// </summary>
			public FunctionList functionList = new FunctionList();
			/// <summary>
			/// 功能oid列表
			/// </summary>
			public List<FunctionOid> functionOidList = new List<FunctionOid>();

			/// <summary>
			/// 功能类型列表
			/// </summary>
			public List<ShowFunction> functionTypeList = new List<ShowFunction>();

			static DB_ResidenceData instance;
			public static DB_ResidenceData residenceData
			@@ -63,170 +89,22 @@
			}
			if (instance.functionTypeList.Count == 0)
			{
			instance.functionTypeList.AddRange(new List<string> {
			"Light","AC","Curtain"
			,"FloorHeating","DoorLock"
			,"Electric","EnergyMonitoring",
			"Environmental",
			"FreshAir","Music",
			"Panel","SecurityMonitoring",
			"Sensor","VideoIntercom"
			instance.functionTypeList.AddRange(new List<ShowFunction> {
			ShowFunction.Light,ShowFunction.AC,ShowFunction.Curtain,
			ShowFunction.FloorHeating,ShowFunction.DoorLock,
			ShowFunction.Electric,ShowFunction.EnergyMonitoring,
			ShowFunction.Environmental,
			ShowFunction.FreshAir,ShowFunction.Music,
			ShowFunction.Panel,ShowFunction.SecurityMonitoring,
			ShowFunction.Sensor,ShowFunction.VideoIntercom
			});
			}

			//new System.Threading.Thread(() =>
			//{
			#if DEBUG
			if (DB_ResidenceData.residenceData.functionList.scenes.Count == 0)
			{
			var s1 = new Scene()
			{
			name = "场景",
			scene_id = "0001",
			sceneType = SceneType.OrdinaryScenes,
			roomIdList = new List<string>() { "0001" },
			};
			DB_ResidenceData.residenceData.functionList.scenes.Add(s1);
			var s2 = new Scene()
			{
			name = "电影场景",
			scene_id = "0002",
			sceneType = SceneType.MovieScene,
			roomIdList = new List<string>() { "0001" },
			};
			DB_ResidenceData.residenceData.functionList.scenes.Add(s2);

			var s3 = new Scene()
			{
			name = "电影场景2",
			scene_id = "0003",
			sceneType = SceneType.MovieScene,
			roomIdList = new List<string>() { "0001" },
			};
			DB_ResidenceData.residenceData.functionList.scenes.Add(s3);
			}
			if (instance.rooms.Count == 0)
			{
			//--------------------
			var r111 = new Room() { sid = "0001", name = "Room-1", floorIndex = 1, backgroundImage = "Classification/Room/Roombg.png" };
			instance.rooms.Add(r111);
			instance.functionList.aCs.Add(new AC()
			{
			sid = "12341212345678901234560600000001",
			name = "空调",
			trait = "on_off,mode,fan,temperature",
			roomIdList = new List<string>() { "0001" },
			lastState = "制冷中风 18°C",
			bus_Data = new BusData
			{
			SubnetID = 111,
			DeviceID = 9,
			LoopID = 1,
			},
			});
			instance.functionList.lights.Add(new Light()
			{
			sid = "12341212345678901234560400000002",
			name = "客厅灯",
			trait = "brightness",
			roomIdList = new List<string>() { "0001" },
			lastState = "20%",
			bus_Data = new BusData
			{
			SubnetID = 111,
			DeviceID = 2,
			LoopID = 1,
			},

			});
			instance.functionList.curtains.Add(new Curtain()
			{
			sid = "12341212345678901234560500000003",
			name = "窗帘模块",
			roomIdList = new List<string>() { "0001" },
			trait = "curtain",
			lastState = "开",
			bus_Data = new BusData
			{
			SubnetID = 42,
			DeviceID = 7,
			LoopID = 1,
			},
			});
			instance.functionList.curtains.Add(new Curtain()
			{
			sid = "12341212345678901234560500000011",
			name = "开合帘",
			roomIdList = new List<string>() { "0001" },
			trait = "curtaintype",
			lastState = "20%",
			bus_Data = new BusData
			{
			SubnetID = 42,
			DeviceID = 7,
			LoopID = 11,
			},
			});
			instance.functionList.curtains.Add(new Curtain()
			{
			sid = "12341212345678901234560500000012",
			name = "卷帘",
			roomIdList = new List<string>() { "0001" },
			trait = "rollingshutter",
			lastState = "20%",
			bus_Data = new BusData
			{
			SubnetID = 42,
			DeviceID = 7,
			LoopID = 12,
			},
			});
			instance.functionList.floorHeatings.Add(new FloorHeating()
			{
			sid = "12341212345678901234560700000004",
			name = "地热",
			roomIdList = new List<string>() { "0001" },
			lastState = ""
			});
			instance.functionList.lights.Add(new Light()
			{
			sid = "12341212345678901234560400000005",
			name = "客厅大灯",
			trait = "on_off",
			roomIdList = new List<string>() { "0001" },
			bus_Data = new BusData
			{
			SubnetID = 111,
			DeviceID = 6,
			LoopID = 1,
			},
			});
			instance.functionList.lights.Add(new Light()
			{
			sid = "12341212345678901234560400000006",
			name = "客厅RGB灯",
			trait = "brightness,color",
			roomIdList = new List<string>() { "0001" },
			bus_Data = new BusData
			{
			SubnetID = 42,
			DeviceID = 4,
			LoopID = 1,
			},
			});
			instance.SaveResidenceData();
			}

			#endif
			//})
			//{ IsBackground = true }.Start();

			}
			catch (Exception ex)
			{
			MainPage.Log($"住宅数据初始化失败：{ex.Message}");
			}
			instance.residenceName = "妮儿的家";
			instance.residenceImage = "Classification/Room/Roombg.png";
			//初始化住宅功能数据
			InitRoomFunction();
			@@ -235,28 +113,36 @@
			return instance;
			}
			}
			/// <summary>
			/// 退出账号清空数据
			/// </summary>
			public void EixtAccount()
			{
			instance = null;
			}

			/// <summary>
			/// 住宅图片
			/// </summary>
			public string residenceImage;
			/// <summary>
			/// 住宅数据是否存在变化
			/// </summary>
			bool hasChange = false;
			/// <summary>
			/// 当前住宅的网关MAC
			/// </summary>
			public string residenceGatewayMAC = "4E47323347591243";
			/// <summary>
			/// 保存住宅数据
			/// </summary>
			public void SaveResidenceData()
			{
			if (hasChange)
			if (this == null\|\| this.residecenInfo==null)
			return;
			hasChange = true;
			new System.Threading.Thread(() =>
			{
			System.Threading.Thread.Sleep(5000);
			var ssd = CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
			FileUtils.WriteFileByBytes("DB_ResidenceData", ssd);
			MainPage.Log("Save DB_ResidenceData");
			hasChange = false;
			})
			{ IsBackground = true }.Start();
			var ssd = CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
			FileUtils.WriteFileByBytes("DB_ResidenceData", ssd);
			MainPage.Log("Save DB_ResidenceData");
			}

			/// <summary>
			@@ -266,20 +152,29 @@
			{
			new System.Threading.Thread(() =>
			{
			foreach (var function in functionList.functions)
			try
			{
			System.Threading.Thread.Sleep(100);
			if (function.bus_Data != null)
			foreach (var function in functionList.functions)
			{
			if (function.functionCategory == FunctionType.Light)
			System.Threading.Thread.Sleep(100);
			//if (function.bus_Data != null)
			{
			Control.Send("read", function);
			switch (function.functionCategory)
			{
			case FunctionCategory.Light:
			case FunctionCategory.Electrical:
			case FunctionCategory.SwitchDevice:
			case FunctionCategory.Curtain:
			case FunctionCategory.Thermostat:
			Control.SendReadCommand(function);
			break;
			}
			}
			}
			else
			{

			}
			}
			catch (Exception ex)
			{
			MainPage.Log($"Refresh Residence Function Status Error : {ex.Message}");
			}
			})
			{ IsBackground = true }.Start();
			@@ -292,21 +187,29 @@
			{
			new System.Threading.Thread(() =>
			{
			//初始化住宅功能数据
			instance.functionList.GetAllFunction();
			//初始化住宅所有房间功能数据
			foreach (var r in instance.rooms)
			try
			{
			foreach (var func in instance.functionList.functions)
			//初始化住宅功能数据
			instance.functionList.GetAllFunction();
			//初始化住宅所有房间功能数据
			foreach (var r in instance.rooms)
			{
			if (func.roomIdList.Contains(r.sid))
			r.functions.Clear();
			foreach (var func in instance.functionList.functions)
			{
			r.functionData.Add(func);
			MainPage.Log($"init room function sid {func.functionCategory.ToString()}:{r.sid}");
			if (func.roomIdList.Contains(r.sid))
			{
			r.functions.Add(func);
			}
			}
			}
			}catch(Exception ex)
			{
			MainPage.Log($"Init room function error : {ex.Message}");
			}
			})
			{ IsBackground = true }.Start();
			}
			}
			}
			}