From a715181089be0d31cd737a5367ffd02690b9d77f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十一月 2020 13:36:01 +0800
Subject: [PATCH] 20201112
---
HDL_ON/Entity/DB_ResidenceData.cs | 691 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 412 insertions(+), 279 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 926fe3a..3fc2293 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -1,6 +1,8 @@
锘縰sing System;
using System.Collections.Generic;
using HDL_ON.DAL;
+using HDL_ON.DAL.Net;
+using Shared;
namespace HDL_ON.Entity
{
@@ -11,12 +13,10 @@
}
/// <summary>
- /// 0:A鍗忚缃戝叧
- /// 1:bus缃戝叧
- /// 2:knx缃戝叧
+ /// 0:bus缃戝叧
+ /// 1:A鍗忚缃戝叧
/// </summary>
- public int GatewayType = 0;
-
+ public int GatewayType = 1;
/// <summary>
/// 浣忓畢鍩虹淇℃伅
/// </summary>
@@ -24,37 +24,30 @@
{
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;
}
}
}
-
/// <summary>
/// 褰撳墠閫夋嫨鐨勪綇瀹呯储寮�
/// </summary>
public string CurReginID = "";
-
-
/// <summary>
/// 妤煎眰鍒楄〃
/// </summary>
public List<Floor> floors = new List<Floor>();
-
- /// <summary>
- /// 鎴块棿鍒楄〃
- /// </summary>
- public List<Room> rooms = new List<Room>();
- /// <summary>
- /// 鍔熻兘鍒楄〃
- /// </summary>
- public FunctionList functionList = new FunctionList();
-
/// <summary>
/// 鍔熻兘绫诲瀷鍒楄〃
/// </summary>
@@ -70,8 +63,9 @@
try
{
var residenceDataBytes = FileUtils.ReadFile("DB_ResidenceData");
- var userConfigString = CommonPage.MyEncodingUTF8.GetString(residenceDataBytes);
+ var userConfigString = System.Text.Encoding.UTF8.GetString(residenceDataBytes);
DB_ResidenceData temp = null;
+
if (!string.IsNullOrEmpty(userConfigString))
{
temp = Newtonsoft.Json.JsonConvert.DeserializeObject<DB_ResidenceData>(userConfigString);
@@ -95,72 +89,46 @@
ShowFunction.Panel,ShowFunction.SecurityMonitoring,
ShowFunction.Sensor,ShowFunction.VideoIntercom
});
+ instance.SaveResidenceData();
}
-#if DEBUG
- if (DB_ResidenceData.residenceData.functionList.scenes.Count == 0)
+ new Light()
{
- var s0 = new Scene()
+ sid = "030101123456780202010005ABCD",
+ name = "鐏厜1",
+ 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
{
- sid = "12341212345678901234560A0A010001ABCD",
- name = "鍏ㄥ叧鍦烘櫙",
- sceneType = SceneType.OrdinaryScenes,
- roomIdList = new List<string>() { "0001" },
- bus_SceneData = new Dictionary<string, byte[]>(),
- };
- s0.bus_SceneData.Add("12341212345678901234560202010002ABCD", new byte[] { 1, 0, 0, 0 });
- s0.bus_SceneData.Add("12341212345678901234560202020005ABCD", 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 = "12341212345678901234560A0A00010002ABCD",
- name = "鍏ㄥ紑鍦烘櫙",
- sceneType = SceneType.OrdinaryScenes,
- roomIdList = new List<string>() { "0001" },
- bus_SceneData = new Dictionary<string, byte[]>(),
- };
- s1.bus_SceneData.Add("12341212345678901234560202010002ABCD", new byte[] { 1, 100, 0, 0 });
- s1.bus_SceneData.Add("12341212345678901234560202020005ABCD", 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 = "12341212345678901234560A0A010004ABCD",
- name = "鐢靛奖鍦烘櫙",
- sceneType = SceneType.MovieScene,
- roomIdList = new List<string>() { "0001" },
- };
- DB_ResidenceData.residenceData.functionList.scenes.Add(s2);
- var s3 = new Scene()
- {
- sid = "12341212345678901234560A0A010005ABCD",
- name = "鐢靛奖鍦烘櫙2",
- sceneType = SceneType.MovieScene,
- roomIdList = new List<string>() { "0001" },
- };
- DB_ResidenceData.residenceData.functionList.scenes.Add(s3);
- }
- if (instance.rooms.Count == 0)
+ SubnetID = 42,
+ DeviceID = 6,
+ LoopID = 1,
+ },
+ }.SaveFunctionData();
+
+
+
+
+#if DEBUG11
+ if (rooms.Count == 0 )
{
//--------------------
- var r111 = new Room() { sid = "0001", name = "Room-1", floorId = "", backgroundImage = "Classification/Room/Roombg.png" };
- instance.rooms.Add(r111);
- instance.floors.Add(new Floor() { sid = "", name = "1 F" });
- instance.functionList.aCs.Add(new AC()
+ var r111 = new Room() { sid = "0001", name = "瀹㈠巺", floorId = "", backgroundImage = "Classification/Room/Roombg.png" };
+ rooms.Add(r111);
+ instance.floors.Add(new Floor() { sid = "000022222", name = "1F" });
+ r111.SaveRoomData();
+ new AC()
{
- sid = "12341212345678901234560604010001ABCD",
+ sid = "030101123456780604010001ABCD",
name = "绌鸿皟",
function = 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", "medium", "high" ,"auto"} },
- new Trait { attri = "temperature", max = 32,min=16,value = new List<string>{"up","down" } },
- },
+ 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
@@ -169,14 +137,14 @@
DeviceID = 8,
LoopID = 1,
},
- });
- instance.functionList.lights.Add(new Light()
+ }.SaveFunctionData();
+ new Light()
{
- sid = "12341212345678901234560202010002ABCD",
+ sid = "030101123456780202020002ABCD",
name = "璋冨厜鐏�",
function = new List<Trait>() {
- new Trait { attri="brightness", max=100,min = 0, value= new List<string> { "up","down"} },
- },//"brightness",
+ 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
@@ -186,15 +154,15 @@
LoopID = 1,
},
- });
- instance.functionList.curtains.Add(new Curtain()
+ }.SaveFunctionData();
+ new Curtain()
{
- sid = "12341212345678901234560303010003ABCD",
- name = "绐楀笜妯″潡",
+ sid = "030101123456780303010003ABCD",
+ name = "绐楀笜",
roomIdList = new List<string>() { "0001" },
function = new List<Trait>() {
- new Trait { attri="on_off", max=2,min = 0, value= new List<string> { "on","off","stop"} },
- },// "curtain",
+ new Trait { name="on_off", max=2,min = 0, value_key= new List<string> { "on","off","stop"} },
+ },// "curtain",
lastState = "寮�",
bus_Data = new BusData
{
@@ -202,15 +170,15 @@
DeviceID = 7,
LoopID = 1,
},
- });
- instance.functionList.curtains.Add(new Curtain()
+ }.SaveFunctionData();
+ new Curtain()
{
- sid = "12341212345678901234560303030011ABCD",
+ sid = "030101123456780303030011ABCD",
name = "寮�鍚堝笜",
roomIdList = new List<string>() { "0001" },
function = new List<Trait>() {
- new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off","stop"} },
- },//"curtaintype",
+ new Trait { name="on_off", max=100,min = 0, value_key= new List<string> { "on","off","stop"} },
+ },//"curtaintype",
lastState = "20%",
bus_Data = new BusData
{
@@ -218,17 +186,17 @@
DeviceID = 7,
LoopID = 11,
},
- });
- instance.functionList.curtains.Add(new Curtain()
+ }.SaveFunctionData();
+ new Curtain()
{
- sid = "12341212345678901234560503040012ABCD",
+ sid = "030101123456780503040012ABCD",
name = "鍗峰笜",
roomIdList = new List<string>() { "0001" },
function = new List<Trait>() {
- new Trait { attri="on_off", max=2,min = 0, value= new List<string> { "on","off","stop"} },
- new Trait { attri="openLevel", max=100,min = 0, value= new List<string> { "percent" } },
+ 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",
+ },// "rollingshutter",
lastState = "20%",
bus_Data = new BusData
{
@@ -236,17 +204,17 @@
DeviceID = 17,
LoopID = 1,
},
- });
- instance.functionList.floorHeatings.Add(new FloorHeating()
+ }.SaveFunctionData();
+ new FloorHeating()
{
- sid = "12341212345678901234560404020004ABCD",
+ sid = "030101123456780404020004ABCD",
name = "鍦扮儹",
roomIdList = new List<string>() { "0001" },
function = 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>{ "ordinary", "day", "night","timer","away" } },
- new Trait { attri = "temperature", max = 32,min=16,value = new List<string>{"up","down" } },
- },//
+ 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
{
@@ -254,14 +222,14 @@
DeviceID = 12,
LoopID = 1
}
- });
- instance.functionList.lights.Add(new Light()
+ }.SaveFunctionData();
+ new Light()
{
- sid = "12341212345678901234560202020005ABCD",
+ sid = "030101123456780202010005ABCD",
name = "鍚婄伅",
function = new List<Trait>() {
- new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off"} },
- },//"on_off",
+ 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
{
@@ -269,15 +237,15 @@
DeviceID = 6,
LoopID = 1,
},
- });
- instance.functionList.lights.Add(new Light()
+ }.SaveFunctionData();
+ new Light()
{
- sid = "12341212345678901234560202040006ABCD",
+ sid = "030101123456780202040006ABCD",
name = "RGB鐏�",
function = 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",
+ 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
{
@@ -285,17 +253,15 @@
DeviceID = 4,
LoopID = 1,
},
- });
-
-
- instance.functionList.fans.Add(new Fan()
+ }.SaveFunctionData();
+ new Fan()
{
- sid = "12341212345678901234561010020006ABCD",
+ sid = "030101123456781010020006ABCD",
name = "椋庢墖",
function = new List<Trait>() {
- new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
- new Trait { attri="openLevel", max=7,min = 0, value= new List<string> { "percent" } },
- },//"brightness,color",
+ 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
{
@@ -303,16 +269,14 @@
DeviceID = 4,
LoopID = 11,
},
- });
-
-
- instance.functionList.tVs.Add(new TV()
+ }.SaveFunctionData();
+ new TV()
{
- sid = "12341212345678901234561010030006ABCD",
+ sid = "030101123456781010020006ABCD",
name = "鐢佃",
function = new List<Trait>() {
- new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
- },
+ 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
{
@@ -320,16 +284,14 @@
DeviceID = 4,
LoopID = 111,
},
- });
-
-
- instance.functionList.switchSockets.Add(new SwitchSocket()
+ }.SaveFunctionData();
+ new SwitchSocket()
{
- sid = "12341212345678901234560101020006ABCD",
+ sid = "030101123456780101020006ABCD",
name = "鎻掑骇",
function = new List<Trait>() {
- new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
- },//"brightness,color",
+ 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
{
@@ -337,144 +299,88 @@
DeviceID = 6,
LoopID = 1,
},
- });
-
- instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
+ }.SaveFunctionData();
+ new Sensor()
{
- sid = "1234121234567890123456100B010006ABCD",
- name = "PM1.0",
- roomIdList = new List<string>() { "0001" },
- function = new List<Trait>() {
- new Trait { attri="values", max=1,min = 0, value= new List<string> { "135"} },
- },
- bus_Data = new BusData
- {
- SubnetID = 111,
- DeviceID = 15,
- LoopID = 1,
- },
- });;
-
- instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
- {
- sid = "1234121234567890123456100B060006ABCD",
+ sid = "030101123456781005060006ABCD",
name = "PM2.5",
roomIdList = new List<string>() { "0001" },
function = new List<Trait>() {
- new Trait { attri="values", max=1,min = 0, value= new List<string> { "22"} },
- },
+ new Trait { name="values", max=1,min = 0, value_key= new List<string> { "22"} },
+ },
bus_Data = new BusData
{
SubnetID = 111,
DeviceID = 15,
LoopID = 1,
},
- });
- //instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
- //{
- // sid = "1234121234567890123456100B030006ABCD",
- // name = "鍣煶",
- // roomIdList = new List<string>() { "0001" },
- // propertList = new List<Trait>() {
- // new Trait { attri="values", max=1,min = 0, value= new List<string> { "120"} },
- // },
- // bus_Data = new BusData
- // {
- // SubnetID = 142,
- // DeviceID = 4,
- // LoopID = 111,
- // },
- //});
- //instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
- //{
- // sid = "1234121234567890123456100B040006ABCD",
- // name = "椋庡姏",
- // roomIdList = new List<string>() { "0001" },
- // propertList = new List<Trait>() {
- // new Trait { attri="values", max=1,min = 0, value= new List<string> { "1.8"} },
- // },
- // bus_Data = new BusData
- // {
- // SubnetID = 142,
- // DeviceID = 4,
- // LoopID = 111,
- // },
- //});
- instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
+ }.SaveFunctionData();
+ new Sensor()
{
- sid = "1234121234567890123456100B070006ABCD",
+ sid = "030101123456781005070006ABCD",
name = "CO2",
roomIdList = new List<string>() { "0001" },
function = new List<Trait>() {
- new Trait { attri="values", max=1,min = 0, value= new List<string> { "1352"} },
- },
+ new Trait { name="values", max=1,min = 0, value_key= new List<string> { "1352"} },
+ },
bus_Data = new BusData
{
SubnetID = 111,
DeviceID = 15,
LoopID = 1,
},
- });
- instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
+ }.SaveFunctionData();
+ new Sensor()
{
- sid = "1234121234567890123456100B020006ABCD",
+ sid = "030101123456781005020006ABCD",
name = "娓╁害",
roomIdList = new List<string>() { "0001" },
function = new List<Trait>() {
- new Trait { attri="values", max=1,min = 0, value= new List<string> { "28"} },
- },
+ new Trait { name="values", max=1,min = 0, value_key= new List<string> { "28"} },
+ },
bus_Data = new BusData
{
SubnetID = 111,
DeviceID = 15,
LoopID = 1,
},
- });
- instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
+ }.SaveFunctionData();
+ new Sensor()
{
- sid = "1234121234567890123456100B050006ABCD",
+ sid = "030101123456781005050006ABCD",
name = "TVOC",
roomIdList = new List<string>() { "0001" },
function = new List<Trait>() {
- new Trait { attri="values", max=1,min = 0, value= new List<string> { "0.3"} },
- },
+ 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,
},
- });
- instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
+ }.SaveFunctionData();
+ new Sensor()
{
- sid = "1234121234567890123456100B030006ABCD",
+ sid = "030101123456781005030006ABCD",
name = "婀垮害",
roomIdList = new List<string>() { "0001" },
function = new List<Trait>() {
- new Trait { attri="values", max=1,min = 0, value= new List<string> { "15"} },
- },
+ 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
- //})
- //{ IsBackground = true }.Start();
+
+
+
}
catch (Exception ex)
@@ -495,6 +401,13 @@
public void EixtAccount()
{
instance = null;
+ ins_Room = null;
+ ins_OidList = null;
+ ins_Function = null;
+ if (MainPage.IsRemote)
+ {
+ Mqtt_Cloud.DisConnectRemoteMqttClient("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
+ }
}
/// <summary>
@@ -502,32 +415,237 @@
/// </summary>
public string residenceImage;
/// <summary>
- /// 浣忓畢鏁版嵁鏄惁瀛樺湪鍙樺寲
- /// </summary>
- bool hasChange = false;
- /// <summary>
/// 褰撳墠浣忓畢鐨勭綉鍏矼AC
/// </summary>
- public string residenceGatewayMAC = "4E47323347591243";
+ public string residenceGatewayMAC = "0281B9078C000000";// "00964E19C4467B1E";
/// <summary>
/// 淇濆瓨浣忓畢鏁版嵁
/// </summary>
public void SaveResidenceData()
{
- //if (hasChange)
- // return;
- //hasChange = true;
- //new System.Threading.Thread(() =>
- //{
- // System.Threading.Thread.Sleep(5000);
- if (this == null|| this.residecenInfo==null)
+ if (this == null || this.residecenInfo == null)
return;
- var ssd = CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
+ var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
FileUtils.WriteFileByBytes("DB_ResidenceData", ssd);
MainPage.Log("Save DB_ResidenceData");
- // hasChange = false;
- //})
- //{ IsBackground = true }.Start();
+ }
+
+ /// <summary>
+ /// 褰撳墠閫夋嫨鐨勬ゼ灞�
+ /// </summary>
+ public string CurFoor = Language.StringByID(StringId.All);
+
+ #region 鎴块棿鏁版嵁鐩稿叧
+ /// <summary>
+ /// 鍒濆鍖栨瘡涓埧闂寸殑鍔熻兘鏁版嵁
+ /// </summary>
+ public static void InitRoomFunction()
+ {
+ new System.Threading.Thread(() =>
+ {
+ try
+ {
+ //鍒濆鍖栦綇瀹呮墍鏈夋埧闂村姛鑳芥暟鎹�
+ foreach (var r in rooms)
+ {
+ r.GetRoomFunctions(true);
+ }
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"Init room function error : {ex.Message}");
+ }
+ })
+ { IsBackground = true }.Start();
+ }
+
+ static List<Room> ins_Room;
+ public static List<Room> rooms
+ {
+ get
+ {
+ if (ins_Room == null)
+ {
+ try
+ {
+ ins_Room = new List<Room> { };
+ var filePathList = FileUtils.ReadFiles();
+
+ foreach (var filePath in filePathList)
+ {
+ if (filePath.StartsWith("RoomData_"))
+ {
+ var roomDataBytes = FileUtils.ReadFile(filePath);
+ var roomDataString = System.Text.Encoding.UTF8.GetString(roomDataBytes);
+ var room = Newtonsoft.Json.JsonConvert.DeserializeObject<Room>(roomDataString);
+ if (room != null)
+ {
+ ins_Room.Add(room);
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"鍔熻兘鏁版嵁鍒濆鍖栧け璐ワ細{ex.Message}");
+ }
+ }
+ return ins_Room;
+ }
+ }
+ /// <summary>
+ /// 鍒犻櫎鎴块棿
+ /// </summary>
+ /// <param name="delRoom"></param>
+ public static void DelRoom(Room delRoom)
+ {
+ var tRoom = rooms.Find((obj) => obj.sid == delRoom.sid);
+ if (tRoom != null)
+ {
+ FileUtils.DeleteFile(delRoom.roomSavePath);
+ rooms.Remove(tRoom);
+ }
+ }
+ #endregion
+
+ #region 鍔熻兘鏁版嵁
+ static FunctionList ins_Function;
+ public static FunctionList functionList
+ {
+ get
+ {
+ if (ins_Function == null)
+ {
+ try
+ {
+ ins_Function = new FunctionList { };
+ #region 鎭㈠鏁版嵁
+ var filePathList = FileUtils.ReadFiles();
+
+ List<Function> fs = new List<Function>();
+
+ foreach (var filePath in filePathList)
+ {
+ if (filePath.StartsWith("FunctionData_") && filePath.Length == 13 + 28)
+ {
+ //var filePath = fp.Remove(0, 13);
+ var _functionTypeString = filePath.Substring(16 + 13, 4);
+ var ft = (FunctionType)Enum.ToObject(typeof(FunctionType), Convert.ToInt32(_functionTypeString, 16));
+
+ switch (ft)
+ {
+ case FunctionType.AC:
+ //鎭㈠绌鸿皟鏁版嵁
+ var acDataBytes = FileUtils.ReadFile(filePath);
+ var acString = System.Text.Encoding.UTF8.GetString(acDataBytes);
+ ins_Function.aCs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(acString));
+ break;
+ case FunctionType.Relay:
+ case FunctionType.Dimmer:
+ case FunctionType.RGB:
+ //鎭㈠鐏厜鏁版嵁
+ var lightsDataBytes = FileUtils.ReadFile(filePath);
+ var lightsString = System.Text.Encoding.UTF8.GetString(lightsDataBytes);
+ ins_Function.lights.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(lightsString));
+ break;
+ case FunctionType.Curtain:
+ case FunctionType.MotorCurtain:
+ case FunctionType.RollingShutter:
+ //鎭㈠绐楀笜鏁版嵁
+ var curtainsDataBytes = FileUtils.ReadFile(filePath);
+ var curtainsString = System.Text.Encoding.UTF8.GetString(curtainsDataBytes);
+ ins_Function.curtains.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(curtainsString));
+ break;
+ case FunctionType.FloorHeating:
+ //鎭㈠鍦扮儹鏁版嵁
+ var fhDataBytes = FileUtils.ReadFile(filePath);
+ var fhString = System.Text.Encoding.UTF8.GetString(fhDataBytes);
+ ins_Function.floorHeatings.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(fhString));
+ break;
+ case FunctionType.PM25:
+ case FunctionType.CO2:
+ case FunctionType.TVOC:
+ case FunctionType.Temp:
+ case FunctionType.Humidity:
+ //鎭㈠鐜鏁版嵁
+ var sesDataBytes = FileUtils.ReadFile(filePath);
+ var sesString = System.Text.Encoding.UTF8.GetString(sesDataBytes);
+ ins_Function.sensorsEnvironmentalScience.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(sesString));
+ break;
+ case FunctionType.Socket:
+ //鎭㈠鎻掑骇鏁版嵁
+ var eleDataBytes = FileUtils.ReadFile(filePath);
+ var eleString = System.Text.Encoding.UTF8.GetString(eleDataBytes);
+ ins_Function.switchSockets.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(eleString));
+ break;
+ case FunctionType.TV:
+ //鎭㈠鐢佃鏁版嵁
+ var eleDataBytes1 = FileUtils.ReadFile(filePath);
+ var eleString1 = System.Text.Encoding.UTF8.GetString(eleDataBytes1);
+ ins_Function.tVs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(eleString1));
+ break;
+ case FunctionType.Fan:
+ //鎭㈠椋庢墖鏁版嵁
+ var eleDataBytes2 = FileUtils.ReadFile(filePath);
+ var eleString2 = System.Text.Encoding.UTF8.GetString(eleDataBytes2);
+ ins_Function.fans.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(eleString2));
+ break;
+ case FunctionType.Scene:
+ //鎭㈠鍦烘櫙鏁版嵁
+ var scenesDataBytes = FileUtils.ReadFile(filePath);
+ var scenesString = System.Text.Encoding.UTF8.GetString(scenesDataBytes);
+ ins_Function.scenes.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Scene>(scenesString));
+ break;
+
+ }
+ }
+ }
+ #endregion
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"鍔熻兘鏁版嵁鍒濆鍖栧け璐ワ細{ex.Message}");
+ }
+
+ }
+ return ins_Function;
+ }
+ }
+ /// <summary>
+ /// 鍒犻櫎鎵嬫満瀛樺偍閮芥墍鏈夊姛鑳芥暟鎹�
+ /// </summary>
+ public static void DelAllFunctionData()
+ {
+ var filePathList = FileUtils.ReadFiles();
+ foreach (var filePath in filePathList)
+ {
+ 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>
@@ -539,27 +657,21 @@
{
try
{
- foreach (var function in functionList.functions)
+ foreach (var function in functionList.GetAllDeviceFunctionList())
{
System.Threading.Thread.Sleep(100);
- if (function.bus_Data != null)
+ switch (function.functionCategory)
{
- switch (function.functionCategory)
- {
- case FunctionCategory.Light:
- case FunctionCategory.Electrical:
- case FunctionCategory.SwitchDevice:
- case FunctionCategory.Curtain:
- case FunctionCategory.Thermostat:
- Control.Send(CommandType_A.read, function);
- break;
-
-
- }
- }
- else
- {
-
+ case FunctionCategory.Light:
+ case FunctionCategory.Electrical:
+ case FunctionCategory.SwitchDevice:
+ case FunctionCategory.Curtain:
+ case FunctionCategory.Thermostat:
+ if (DB_ResidenceData.residenceData.GatewayType == 0)
+ {
+ DriverLayer.Control.ins.SendReadCommand(function);
+ }
+ break;
}
}
}
@@ -571,36 +683,57 @@
{ IsBackground = true }.Start();
}
- /// <summary>
- /// 鍒濆鍖栨瘡涓埧闂寸殑鍔熻兘鏁版嵁
- /// </summary>
- public static void InitRoomFunction()
+
+ #endregion
+
+ #region oid鍒楄〃 a鍗忚杞琤us鍗忚鎺у埗浣跨敤
+ static List<FunctionOid> ins_OidList;
+ public static List<FunctionOid> functionOidList
{
- new System.Threading.Thread(() =>
+ get
{
- try
+ if (ins_OidList == null)
{
- //鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
- instance.functionList.GetAllFunction();
- //鍒濆鍖栦綇瀹呮墍鏈夋埧闂村姛鑳芥暟鎹�
- foreach (var r in instance.rooms)
+ var bytes = FileUtils.ReadFile("AProtocolData_FunctionOid");
+ if (bytes == null || bytes.Length == 0)
{
- r.functions.Clear();
- foreach (var func in instance.functionList.functions)
+ ins_OidList = new List<FunctionOid>();
+ }
+ else
+ {
+ var jsonString = System.Text.Encoding.UTF8.GetString(bytes);
+ if (string.IsNullOrEmpty(jsonString))
{
- MainPage.Log($"init room function sid {func.functionCategory.ToString()}:{r.sid}");
- if (func.roomIdList.Contains(r.sid))
+ ins_OidList = new List<FunctionOid>();
+ }
+ else
+ {
+ var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<FunctionOid>>(jsonString);
+ if (list == null)
{
- r.functions.Add(func);
+ ins_OidList = new List<FunctionOid>();
+ }
+ else
+ {
+ ins_OidList = list;
}
}
}
- }catch(Exception ex)
- {
- MainPage.Log($"Init room function error : {ex.Message}");
}
- })
- { IsBackground = true }.Start();
+ return ins_OidList;
+ }
}
+ /// <summary>
+ /// 淇濆瓨oid鏁版嵁锛屾瘡娆′繚瀛橀兘浼氳鐩�
+ /// </summary>
+ public static void SaveFunctionOidJsonDataList(string oidJsonString)
+ {
+ oidJsonString = oidJsonString.Replace("add", "get_list_response");
+ var oidBytes = System.Text.Encoding.UTF8.GetBytes(oidJsonString);
+
+ FileUtils.WriteFileByBytes("AProtocolData_FunctionOid", oidBytes);
+ }
+
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.8.0