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 | 294 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 151 insertions(+), 143 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index cf1fb2c..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,11 +13,10 @@
}
/// <summary>
- /// 0:A鍗忚缃戝叧
- /// 1:bus缃戝叧
- /// 2:knx缃戝叧
+ /// 0:bus缃戝叧
+ /// 1:A鍗忚缃戝叧
/// </summary>
- public int GatewayType = 0;
+ public int GatewayType = 1;
/// <summary>
/// 浣忓畢鍩虹淇℃伅
/// </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;
}
}
}
@@ -56,10 +63,10 @@
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))
+ if (!string.IsNullOrEmpty(userConfigString))
{
temp = Newtonsoft.Json.JsonConvert.DeserializeObject<DB_ResidenceData>(userConfigString);
}
@@ -82,76 +89,46 @@
ShowFunction.Panel,ShowFunction.SecurityMonitoring,
ShowFunction.Sensor,ShowFunction.VideoIntercom
});
+ instance.SaveResidenceData();
}
+ new Light()
+ {
+ 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
+ {
+ SubnetID = 42,
+ DeviceID = 6,
+ LoopID = 1,
+ },
+ }.SaveFunctionData();
- #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)
+#if DEBUG11
+ if (rooms.Count == 0 )
{
//--------------------
- var r111 = new Room() { sid = "0001", name = "Room-1", floorId = "", backgroundImage = "Classification/Room/Roombg.png" };
+ var r111 = new Room() { sid = "0001", name = "瀹㈠巺", floorId = "", backgroundImage = "Classification/Room/Roombg.png" };
rooms.Add(r111);
- instance.floors.Add(new Floor() { sid = "000022222", name = "1 F" });
+ instance.floors.Add(new Floor() { sid = "000022222", name = "1F" });
+ r111.SaveRoomData();
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" } },
- },
+ 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
@@ -166,8 +143,8 @@
sid = "030101123456780202020002ABCD",
name = "璋冨厜鐏�",
function = new List<Trait>() {
- new Trait { name="brightness", max=100,min = 0, value_key= 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
@@ -181,11 +158,11 @@
new Curtain()
{
sid = "030101123456780303010003ABCD",
- name = "绐楀笜妯″潡",
+ 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",
+ new Trait { name="on_off", max=2,min = 0, value_key= new List<string> { "on","off","stop"} },
+ },// "curtain",
lastState = "寮�",
bus_Data = new BusData
{
@@ -200,8 +177,8 @@
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",
+ new Trait { name="on_off", max=100,min = 0, value_key= new List<string> { "on","off","stop"} },
+ },//"curtaintype",
lastState = "20%",
bus_Data = new BusData
{
@@ -216,10 +193,10 @@
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" } },
+ 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
{
@@ -234,10 +211,10 @@
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" } },
- },//
+ 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
{
@@ -251,8 +228,8 @@
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",
+ 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
{
@@ -266,9 +243,9 @@
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",
+ 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
{
@@ -282,9 +259,9 @@
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",
+ 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
{
@@ -298,8 +275,8 @@
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="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
+ },
roomIdList = new List<string>() { "0001" },
bus_Data = new BusData
{
@@ -313,8 +290,8 @@
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",
+ 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
{
@@ -329,8 +306,8 @@
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"} },
- },
+ new Trait { name="values", max=1,min = 0, value_key= new List<string> { "22"} },
+ },
bus_Data = new BusData
{
SubnetID = 111,
@@ -344,8 +321,8 @@
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"} },
- },
+ new Trait { name="values", max=1,min = 0, value_key= new List<string> { "1352"} },
+ },
bus_Data = new BusData
{
SubnetID = 111,
@@ -359,8 +336,8 @@
name = "娓╁害",
roomIdList = new List<string>() { "0001" },
function = new List<Trait>() {
- new Trait { name="values", max=1,min = 0, value_key= new List<string> { "28"} },
- },
+ new Trait { name="values", max=1,min = 0, value_key= new List<string> { "28"} },
+ },
bus_Data = new BusData
{
SubnetID = 111,
@@ -374,8 +351,8 @@
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"} },
- },
+ new Trait { name="values", max=1,min = 0, value_key= new List<string> { "0.3"} },
+ },
bus_Data = new BusData
{
SubnetID = 111,
@@ -389,8 +366,8 @@
name = "婀垮害",
roomIdList = new List<string>() { "0001" },
function = new List<Trait>() {
- new Trait { name="values", max=1,min = 0, value_key= new List<string> { "15"} },
- },
+ new Trait { name="values", max=1,min = 0, value_key= new List<string> { "15"} },
+ },
bus_Data = new BusData
{
SubnetID = 111,
@@ -400,7 +377,11 @@
}.SaveFunctionData();
instance.SaveResidenceData();
}
- #endif
+#endif
+
+
+
+
}
catch (Exception ex)
{
@@ -420,6 +401,13 @@
public void EixtAccount()
{
instance = null;
+ ins_Room = null;
+ ins_OidList = null;
+ ins_Function = null;
+ if (MainPage.IsRemote)
+ {
+ Mqtt_Cloud.DisConnectRemoteMqttClient("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
+ }
}
/// <summary>
@@ -429,18 +417,23 @@
/// <summary>
/// 褰撳墠浣忓畢鐨勭綉鍏矼AC
/// </summary>
- public string residenceGatewayMAC = "4E47323347591243";
+ public string residenceGatewayMAC = "0281B9078C000000";// "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));
+ var ssd = System.Text.Encoding.UTF8.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 +473,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 roomDataString = System.Text.Encoding.UTF8.GetString(roomDataBytes);
var room = Newtonsoft.Json.JsonConvert.DeserializeObject<Room>(roomDataString);
- if(room != null)
+ if (room != null)
{
ins_Room.Add(room);
}
@@ -504,18 +497,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;
@@ -546,7 +537,7 @@
case FunctionType.AC:
//鎭㈠绌鸿皟鏁版嵁
var acDataBytes = FileUtils.ReadFile(filePath);
- var acString = CommonPage.MyEncodingUTF8.GetString(acDataBytes);
+ var acString = System.Text.Encoding.UTF8.GetString(acDataBytes);
ins_Function.aCs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(acString));
break;
case FunctionType.Relay:
@@ -554,20 +545,21 @@
case FunctionType.RGB:
//鎭㈠鐏厜鏁版嵁
var lightsDataBytes = FileUtils.ReadFile(filePath);
- var lightsString = CommonPage.MyEncodingUTF8.GetString(lightsDataBytes);
+ 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 = CommonPage.MyEncodingUTF8.GetString(curtainsDataBytes);
+ 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 = CommonPage.MyEncodingUTF8.GetString(fhDataBytes);
+ var fhString = System.Text.Encoding.UTF8.GetString(fhDataBytes);
ins_Function.floorHeatings.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(fhString));
break;
case FunctionType.PM25:
@@ -577,31 +569,31 @@
case FunctionType.Humidity:
//鎭㈠鐜鏁版嵁
var sesDataBytes = FileUtils.ReadFile(filePath);
- var sesString = CommonPage.MyEncodingUTF8.GetString(sesDataBytes);
+ 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 = CommonPage.MyEncodingUTF8.GetString(eleDataBytes);
+ 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 = CommonPage.MyEncodingUTF8.GetString(eleDataBytes1);
+ 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 = CommonPage.MyEncodingUTF8.GetString(eleDataBytes2);
+ 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 = CommonPage.MyEncodingUTF8.GetString(scenesDataBytes);
+ var scenesString = System.Text.Encoding.UTF8.GetString(scenesDataBytes);
ins_Function.scenes.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Scene>(scenesString));
break;
@@ -625,17 +617,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>
@@ -650,18 +660,18 @@
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.SendReadCommand(function);
- break;
- }
+ 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;
}
}
}
@@ -684,7 +694,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 +724,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
--
Gitblit v1.8.0