From 06696e6f225733a60b03eea4a7c6374053d92c1d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 14 四月 2020 14:15:35 +0800
Subject: [PATCH] 20200414
---
HDL_ON/Entity/DB_ResidenceData.cs | 129 +++++++++++++++++++++++++------------------
1 files changed, 75 insertions(+), 54 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 93583a6..82843cc 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -31,7 +31,7 @@
/// <summary>
/// 鍔熻兘绫诲瀷鍒楄〃
/// </summary>
- public List<FunctionCategory> functionTypeList = new List<FunctionCategory>();
+ public List<ShowFunction> functionTypeList = new List<ShowFunction>();
static DB_ResidenceData instance;
public static DB_ResidenceData residenceData
@@ -59,65 +59,60 @@
}
if (instance.functionTypeList.Count == 0)
{
- instance.functionTypeList.AddRange(new List<FunctionCategory> {
- FunctionCategory.Light,FunctionCategory.AC,FunctionCategory.Curtain,
- FunctionCategory.FloorHeating,FunctionCategory.DoorLock,
- FunctionCategory.Electric,FunctionCategory.EnergyMonitoring,
- FunctionCategory.Environmental,
- FunctionCategory.FreshAir,FunctionCategory.Music,
- FunctionCategory.Panel,FunctionCategory.SecurityMonitoring,
- FunctionCategory.Sensor,FunctionCategory.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 s0 = new Scene()
{
- sid = "12341212345678901234560100010001",
+ sid = "12341212345678901234560A00010001ABCD",
name = "鍏ㄥ叧鍦烘櫙",
- scene_id = "0001",
sceneType = SceneType.OrdinaryScenes,
roomIdList = new List<string>() { "0001" },
bus_SceneData = new Dictionary<string, byte[]>(),
};
- s0.bus_SceneData.Add("12341212345678901234560401020002", new byte[] { 1, 0, 0, 0 });
- s0.bus_SceneData.Add("12341212345678901234560401010005", new byte[] { 1, 0, 0, 0 });
- s0.bus_SceneData.Add("12341212345678901234560401030006", new byte[] { 1, 0, 254, 0, 0, 3, 255, 0, 0, 0, 0 });
- s0.bus_SceneData.Add("12341212345678901234560603010001", new byte[] { 1, 0, 32, 32, 32, 32, 32, 0, 0, 0, 1, 28, 0 });
- s0.bus_SceneData.Add("12341212345678901234560502010003", new byte[] { 1, 2 });
+ s0.bus_SceneData.Add("12341212345678901234560202020002ABCD", new byte[] { 1, 0, 0, 0 });
+ s0.bus_SceneData.Add("12341212345678901234560202010005ABCD", new byte[] { 1, 0, 0, 0 });
+ s0.bus_SceneData.Add("12341212345678901234560202040006ABCD", new byte[] { 1, 0, 254, 0, 0, 3, 255, 0, 0, 0, 0 });
+ s0.bus_SceneData.Add("12341212345678901234560604010001ABCD", new byte[] { 1, 0, 32, 32, 32, 32, 32, 0, 0, 0, 1, 28, 0 });
+ s0.bus_SceneData.Add("12341212345678901234560303010003ABCD", new byte[] { 1, 2 });
DB_ResidenceData.residenceData.functionList.scenes.Add(s0);
var s1 = new Scene()
{
- sid = "12341212345678901234560100010002",
+ sid = "12341212345678901234560A00010002ABCD",
name = "鍏ㄥ紑鍦烘櫙",
- scene_id = "0002",
sceneType = SceneType.OrdinaryScenes,
roomIdList = new List<string>() { "0001" },
bus_SceneData = new Dictionary<string, byte[]>(),
};
- s1.bus_SceneData.Add("12341212345678901234560401020002", new byte[] { 1, 100, 0, 0 });
- s1.bus_SceneData.Add("12341212345678901234560401010005", new byte[] { 1, 100, 0, 0 });
- s1.bus_SceneData.Add("12341212345678901234560401030006", new byte[] { 1, 100, 254, 0, 0, 3, 255, 0, 0, 0, 0 });
- s1.bus_SceneData.Add("12341212345678901234560603010001", new byte[] { 1, 0, 32, 32, 32, 32, 32, 0, 1, 0, 1, 28, 0 });
- s1.bus_SceneData.Add("12341212345678901234560502010003", new byte[] { 1, 1 });
+ s1.bus_SceneData.Add("12341212345678901234560202020002ABCD", new byte[] { 1, 100, 0, 0 });
+ s1.bus_SceneData.Add("12341212345678901234560202010005ABCD", new byte[] { 1, 100, 0, 0 });
+ s1.bus_SceneData.Add("12341212345678901234560202040006ABCD", new byte[] { 1, 100, 254, 0, 0, 3, 255, 0, 0, 0, 0 });
+ s1.bus_SceneData.Add("12341212345678901234560604010001ABCD", new byte[] { 1, 0, 32, 32, 32, 32, 32, 0, 1, 0, 1, 28, 0 });
+ s1.bus_SceneData.Add("12341212345678901234560303010003ABCD", new byte[] { 1, 1 });
DB_ResidenceData.residenceData.functionList.scenes.Add(s1);
var s2 = new Scene()
{
- sid = "12341212345678901234560100010004",
+ sid = "12341212345678901234560A00010004ABCD",
name = "鐢靛奖鍦烘櫙",
- scene_id = "0004",
sceneType = SceneType.MovieScene,
roomIdList = new List<string>() { "0001" },
};
DB_ResidenceData.residenceData.functionList.scenes.Add(s2);
var s3 = new Scene()
{
+ sid = "12341212345678901234560A00010005ABCD",
name = "鐢靛奖鍦烘櫙2",
- scene_id = "0003",
sceneType = SceneType.MovieScene,
roomIdList = new List<string>() { "0001" },
};
@@ -130,9 +125,14 @@
instance.rooms.Add(r111);
instance.functionList.aCs.Add(new AC()
{
- sid = "12341212345678901234560603010001",
+ sid = "12341212345678901234560604010001ABCD",
name = "绌鸿皟",
- trait = "on_off,mode,fan,temperature",
+ trait = new List<Trait>() {
+ new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
+ new Trait { attri="mode", max = 2,min =0,value = new List<string>{ "auto", "heat", "cool","dry" } },
+ new Trait { attri = "fan",max = 3,min =0,value = new List<string>{ "low", "mid", "high" ,"auto"} },
+ new Trait { attri = "temperature", max = 32,min=16,value = new List<string>{"up","down" } },
+ },
roomIdList = new List<string>() { "0001" },
lastState = "鍒跺喎 涓 18掳C",
bus_Data = new BusData
@@ -144,9 +144,11 @@
});
instance.functionList.lights.Add(new Light()
{
- sid = "12341212345678901234560401020002",
+ sid = "12341212345678901234560202020002ABCD",
name = "璋冨厜鐏�",
- trait = "brightness",
+ trait = new List<Trait>() {
+ new Trait { attri="brightness", max=100,min = 0, value= new List<string> { "up","down"} },
+ },//"brightness",
roomIdList = new List<string>() { "0001" },
lastState = "20%",
bus_Data = new BusData
@@ -159,10 +161,12 @@
});
instance.functionList.curtains.Add(new Curtain()
{
- sid = "12341212345678901234560502010003",
+ sid = "12341212345678901234560303010003ABCD",
name = "绐楀笜妯″潡",
roomIdList = new List<string>() { "0001" },
- trait = "curtain",
+ trait = new List<Trait>() {
+ new Trait { attri="on_off", max=2,min = 0, value= new List<string> { "on","off","stop"} },
+ },// "curtain",
lastState = "寮�",
bus_Data = new BusData
{
@@ -173,10 +177,12 @@
});
instance.functionList.curtains.Add(new Curtain()
{
- sid = "12341212345678901234560502020011",
+ sid = "12341212345678901234560303030011ABCD",
name = "寮�鍚堝笜",
roomIdList = new List<string>() { "0001" },
- trait = "curtaintype",
+ trait = new List<Trait>() {
+ new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off","stop"} },
+ },//"curtaintype",
lastState = "20%",
bus_Data = new BusData
{
@@ -187,10 +193,12 @@
});
instance.functionList.curtains.Add(new Curtain()
{
- sid = "12341212345678901234560502030012",
+ sid = "12341212345678901234560503040012ABCD",
name = "鍗峰笜",
roomIdList = new List<string>() { "0001" },
- trait = "rollingshutter",
+ trait = new List<Trait>() {
+ new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off","stop"} },
+ },// "rollingshutter",
lastState = "20%",
bus_Data = new BusData
{
@@ -201,16 +209,23 @@
});
instance.functionList.floorHeatings.Add(new FloorHeating()
{
- sid = "12341212345678901234560704010004",
+ sid = "12341212345678901234560404020004ABCD",
name = "鍦扮儹",
roomIdList = new List<string>() { "0001" },
+ trait = new List<Trait>() {
+ new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
+ new Trait { attri="mode", max = 2,min =0,value = new List<string>{ "auto", "heat", "cool","dry" } },
+ new Trait { attri = "temperature", max = 32,min=16,value = new List<string>{"up","down" } },
+ },//
lastState = ""
});
instance.functionList.lights.Add(new Light()
{
- sid = "12341212345678901234560401010005",
- name = "澶у悐鐏�",
- trait = "on_off",
+ sid = "12341212345678901234560202010005ABCD",
+ name = "鍚婄伅",
+ trait = new List<Trait>() {
+ new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off"} },
+ },//"on_off",
roomIdList = new List<string>() { "0001" },
bus_Data = new BusData
{
@@ -221,9 +236,12 @@
});
instance.functionList.lights.Add(new Light()
{
- sid = "12341212345678901234560401030006",
+ sid = "12341212345678901234560202040006ABCD",
name = "RGB鐏�",
- trait = "brightness,color",
+ trait = new List<Trait>() {
+ new Trait { attri="brightness", max=100,min = 0, value= new List<string> { "on","off"} },
+ new Trait { attri="color", max=100,min = 0, value= new List<string> { "255", "255", "255" } },
+ },//"brightness,color",
roomIdList = new List<string>() { "0001" },
bus_Data = new BusData
{
@@ -253,6 +271,8 @@
return instance;
}
}
+ public RegionInfoRes residecenInfo;
+
/// <summary>
/// 浣忓畢鍥剧墖
@@ -267,18 +287,18 @@
/// </summary>
public void SaveResidenceData()
{
- if (hasChange)
- return;
- hasChange = true;
- new System.Threading.Thread(() =>
- {
- System.Threading.Thread.Sleep(5000);
+ //if (hasChange)
+ // 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();
+ // hasChange = false;
+ //})
+ //{ IsBackground = true }.Start();
}
/// <summary>
@@ -303,7 +323,7 @@
case FunctionCategory.Curtain:
Control.Send(CommandType_A.read, function);
break;
- case FunctionCategory.AC:
+ case FunctionCategory.Thermostat:
Control.Send(CommandType_A.read, function);
break;
}
@@ -336,6 +356,7 @@
//鍒濆鍖栦綇瀹呮墍鏈夋埧闂村姛鑳芥暟鎹�
foreach (var r in instance.rooms)
{
+ r.functions.Clear();
foreach (var func in instance.functionList.functions)
{
MainPage.Log($"init room function sid {func.functionCategory.ToString()}:{r.sid}");
--
Gitblit v1.8.0