From b3abfd30576871c32f2839a322fa3bb783f96498 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 12 十二月 2020 19:10:10 +0800
Subject: [PATCH] 2020-12-12 1.解锁逻辑优化
---
HDL_ON/Entity/DB_ResidenceData.cs | 712 ++++++++++++++++++++---------------------------------------
1 files changed, 242 insertions(+), 470 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 61d1e8a..1ee49bc 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 System.Threading;
+using HDL_ON.DAL.Server;
+using Shared;
namespace HDL_ON.Entity
{
@@ -11,34 +13,73 @@
}
/// <summary>
- /// 褰撳墠閫夋嫨鐨勪綇瀹呯储寮�
+ /// 涓讳汉token
/// </summary>
- public int CurReginIndex = 0;
-
+ public string MasterToken;
/// <summary>
/// 浣忓畢鍩虹淇℃伅
/// </summary>
- public RegionInfoRes residecenInfo {
+ public RegionInfoRes residecenInfo
+ {
get
{
- return MainPage.LoginUser.regionList[CurReginIndex];
+ if (MainPage.NoLoginMode)
+ {
+ return new RegionInfoRes() { Name = "鏈湴妯″紡" };
+ }
+ else
+ {
+ var curRegion = UserInfo.Current.regionList.Find((obj) => obj.RegionID == UserInfo.Current.CurReginID);
+ if (curRegion == null)
+ {
+ if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0)
+ {
+ UserInfo.Current.CurReginID = UserInfo.Current.regionList[0].RegionID;
+ //鎭㈠澶囦唤
+ //HDLCommon.Current.RestoreHomeBackup(CurReginID);
+
+ return UserInfo.Current.regionList[0];
+ }
+ else
+ {
+ return new RegionInfoRes();
+ }
+ }
+ return curRegion;
+ }
}
}
- /// <summary>
- /// 妤煎眰鍒楄〃
- /// </summary>
- public List<string> floors = new List<string>();
+ ///// <summary>
+ ///// 鑾峰彇缃戝叧鍒楄〃
+ ///// </summary>
+ //void GetHomeGatewayList()
+ //{
+ // new Thread(() =>
+ // {
+ // //鍒囨崲浣忓畢鍚庯紝鏌ヨ涓�娆＄綉鍏冲垪琛�
+ // new HttpServerRequest().GetHomeGatewayList();
+ // })
+ // { IsBackground = true }.Start();
- /// <summary>
- /// 鎴块棿鍒楄〃
- /// </summary>
- public List<Room> rooms = new List<Room>();
- /// <summary>
- /// 鍔熻兘鍒楄〃
- /// </summary>
- public FunctionList functionList = new FunctionList();
+ //}
+ //string curReginID;
+ ///// <summary>
+ ///// 褰撳墠閫夋嫨鐨勪綇瀹呯储寮�
+ ///// </summary>
+ //public string CurReginID
+ //{
+ // set
+ // {
+ // curReginID = value;
+ // GetHomeGatewayList();
+ // }
+ // get
+ // {
+ // return curReginID;
+ // }
+ //}
/// <summary>
/// 鍔熻兘绫诲瀷鍒楄〃
/// </summary>
@@ -53,9 +94,10 @@
{
try
{
- var residenceDataBytes = FileUtils.ReadFile("DB_ResidenceData");
- var userConfigString = CommonPage.MyEncodingUTF8.GetString(residenceDataBytes);
+ var residenceDataBytes = Common.FileUtlis.Files.ReadFile("DB_ResidenceData");
+ var userConfigString = System.Text.Encoding.UTF8.GetString(residenceDataBytes);
DB_ResidenceData temp = null;
+
if (!string.IsNullOrEmpty(userConfigString))
{
temp = Newtonsoft.Json.JsonConvert.DeserializeObject<DB_ResidenceData>(userConfigString);
@@ -79,387 +121,8 @@
ShowFunction.Panel,ShowFunction.SecurityMonitoring,
ShowFunction.Sensor,ShowFunction.VideoIntercom
});
- }
-
-#if DEBUG
- //if (DB_ResidenceData.residenceData.functionList.scenes.Count == 0)
- //{
- // var s0 = new Scene()
- // {
- // 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)
- {
- //--------------------
- var r111 = new Room() { sid = "0001", name = "Room-1", floorIndex = 0, backgroundImage = "Classification/Room/Roombg.png" };
- instance.rooms.Add(r111);
- instance.floors.Add("1 F");
- // instance.functionList.aCs.Add(new AC()
- // {
- // sid = "12341212345678901234560604010001ABCD",
- // name = "绌鸿皟",
- // propertList = 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" } },
- // },
- // roomIdList = new List<string>() { "0001" },
- // lastState = "鍒跺喎 涓 18掳C",
- // bus_Data = new BusData
- // {
- // SubnetID = 42,
- // DeviceID = 8,
- // LoopID = 1,
- // },
- // });
- // instance.functionList.lights.Add(new Light()
- // {
- // sid = "12341212345678901234560202010002ABCD",
- // name = "璋冨厜鐏�",
- // propertList = 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
- // {
- // SubnetID = 111,
- // DeviceID = 2,
- // LoopID = 1,
- // },
-
- // });
- // instance.functionList.curtains.Add(new Curtain()
- // {
- // sid = "12341212345678901234560303010003ABCD",
- // name = "绐楀笜妯″潡",
- // roomIdList = new List<string>() { "0001" },
- // propertList = 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
- // {
- // SubnetID = 42,
- // DeviceID = 7,
- // LoopID = 1,
- // },
- // });
- // instance.functionList.curtains.Add(new Curtain()
- // {
- // sid = "12341212345678901234560303030011ABCD",
- // name = "寮�鍚堝笜",
- // roomIdList = new List<string>() { "0001" },
- // propertList = 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
- // {
- // SubnetID = 42,
- // DeviceID = 7,
- // LoopID = 11,
- // },
- // });
- // instance.functionList.curtains.Add(new Curtain()
- // {
- // sid = "12341212345678901234560503040012ABCD",
- // name = "鍗峰笜",
- // roomIdList = new List<string>() { "0001" },
- // propertList = 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" } },
-
- // },// "rollingshutter",
- // lastState = "20%",
- // bus_Data = new BusData
- // {
- // SubnetID = 42,
- // DeviceID = 7,
- // LoopID = 12,
- // },
- // });
- // instance.functionList.floorHeatings.Add(new FloorHeating()
- // {
- // sid = "12341212345678901234560404020004ABCD",
- // name = "鍦扮儹",
- // roomIdList = new List<string>() { "0001" },
- // propertList = 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" } },
- // },//
- // lastState = "鑷姩 25掳C",
- // bus_Data = new BusData
- // {
- // SubnetID = 111,
- // DeviceID = 12,
- // LoopID = 1
- // }
- // });
- // instance.functionList.lights.Add(new Light()
- // {
- // sid = "12341212345678901234560202020005ABCD",
- // name = "鍚婄伅",
- // propertList = 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
- // {
- // SubnetID = 42,
- // DeviceID = 6,
- // LoopID = 1,
- // },
- // });
- // instance.functionList.lights.Add(new Light()
- // {
- // sid = "12341212345678901234560202040006ABCD",
- // name = "RGB鐏�",
- // propertList = 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
- // {
- // SubnetID = 42,
- // DeviceID = 4,
- // LoopID = 1,
- // },
- // });
-
-
- instance.functionList.fans.Add(new Fan()
- {
- sid = "12341212345678901234561010020006ABCD",
- 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",
- roomIdList = new List<string>() { "0001" },
- bus_Data = new BusData
- {
- SubnetID = 142,
- DeviceID = 4,
- LoopID = 11,
- },
- });
-
-
- instance.functionList.tVs.Add(new TV()
- {
- sid = "12341212345678901234561010030006ABCD",
- name = "鐢佃",
- function = new List<Trait>() {
- new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
- },
- roomIdList = new List<string>() { "0001" },
- bus_Data = new BusData
- {
- SubnetID = 142,
- DeviceID = 4,
- LoopID = 111,
- },
- });
-
-
- instance.functionList.switchSockets.Add(new SwitchSocket()
- {
- sid = "12341212345678901234560101020006ABCD",
- name = "鎻掑骇",
- function = new List<Trait>() {
- new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
- },//"brightness,color",
- roomIdList = new List<string>() { "0001" },
- bus_Data = new BusData
- {
- SubnetID = 42,
- DeviceID = 6,
- LoopID = 1,
- },
- });
-
- instance.functionList.sensorsEnvironmentalScience.Add(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 = 142,
- DeviceID = 4,
- LoopID = 111,
- },
- });;
-
- instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
- {
- sid = "1234121234567890123456100B020006ABCD",
- 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"} },
- },
- bus_Data = new BusData
- {
- SubnetID = 142,
- DeviceID = 4,
- LoopID = 111,
- },
- });
- //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()
- {
- sid = "1234121234567890123456100B050006ABCD",
- name = "CO2",
- roomIdList = new List<string>() { "0001" },
- function = new List<Trait>() {
- new Trait { attri="values", max=1,min = 0, value= new List<string> { "1352"} },
- },
- bus_Data = new BusData
- {
- SubnetID = 142,
- DeviceID = 4,
- LoopID = 111,
- },
- });
- instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
- {
- sid = "1234121234567890123456100B060006ABCD",
- name = "娓╁害",
- roomIdList = new List<string>() { "0001" },
- function = new List<Trait>() {
- new Trait { attri="values", max=1,min = 0, value= new List<string> { "28"} },
- },
- bus_Data = new BusData
- {
- SubnetID = 142,
- DeviceID = 4,
- LoopID = 111,
- },
- });
- instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
- {
- sid = "1234121234567890123456100B070006ABCD",
- 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"} },
- },
- bus_Data = new BusData
- {
- SubnetID = 142,
- DeviceID = 4,
- LoopID = 111,
- },
- });
- instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
- {
- sid = "1234121234567890123456100B080006ABCD",
- name = "婀垮害",
- roomIdList = new List<string>() { "0001" },
- function = new List<Trait>() {
- new Trait { attri="values", max=1,min = 0, value= new List<string> { "15"} },
- },
- bus_Data = new BusData
- {
- SubnetID = 142,
- DeviceID = 4,
- LoopID = 111,
- },
- });
-
-
-
-
-
-
-
-
-
instance.SaveResidenceData();
}
-
-#endif
- //})
- //{ IsBackground = true }.Start();
-
}
catch (Exception ex)
{
@@ -467,115 +130,224 @@
}
instance.residenceImage = "Classification/Room/Roombg.png";
//鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
- InitRoomFunction();
+ SpatialInfo.CurrentSpatial.InitRoomFunction();
}
return instance;
}
}
+ /// <summary>
+ /// 閫�鍑鸿处鍙锋竻绌烘暟鎹�
+ /// </summary>
+ public void EixtAccount()
+ {
+ instance = null;
+ ins_OidList = null;
+ functionList = null;
+ HomeGateway = null;
+ SpatialInfo.CurrentSpatial.ClearRooms();
+ //UserInfo.Current.ClearUserInfo();
+ if (MainPage.IsRemote)
+ {
+ DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
+ }
+ }
+ /// <summary>
+ /// 缃戝叧璇︾粏淇℃伅
+ /// </summary>
+ public HomeGatewayInfo HomeGateway;
+ /// <summary>
+ /// 0:bus缃戝叧
+ /// 1:A鍗忚缃戝叧
+ /// </summary>
+ public int GatewayType
+ {
+ get
+ {
+ //#if DEBUG
+ //return 0;
+ //#endif
+ if (HomeGateway == null)
+ return -1;
+ if (HomeGateway.gatewayType == "AGATEWAY")
+ {
+ return 1;
+ }
+ else
+ {
+ return 0;
+ }
+ }
+ }
+
+ /// <summary>
+ /// 妫�娴嬩綇瀹呮槸鍚︾粦瀹氫簡缃戝叧
+ /// gatewayId 鍒ょ┖
+ /// </summary>
+ /// <returns></returns>
+ public bool CheckWhetherGatewayIdIsNull()
+ {
+ if (HomeGateway != null && !string.IsNullOrEmpty(HomeGateway.gatewayId))
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ /// <summary>
+ /// 妫�娴嬩綇瀹呮槸鍚︾粦瀹氫簡缃戝叧
+ /// </summary>
+ /// <returns></returns>
+ public bool CheckWhetherGatewayIsBound()
+ {
+ if (HomeGateway != null && !string.IsNullOrEmpty(HomeGateway.mac))
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ /// <summary>
+ /// 褰撳墠浣忓畢鐨勭綉鍏矼AC
+ /// </summary>
+ public string residenceGatewayMAC
+ {
+ get
+ {
+ if (CheckWhetherGatewayIsBound())
+ {
+ return HomeGateway.mac.ToUpper();
+ }
+ else
+ {
+ return "";
+ }
+ }
+ set
+ {
+ if (CheckWhetherGatewayIsBound())
+ {
+ HomeGateway.mac = value;
+ }
+ else
+ {
+ HomeGateway = new HomeGatewayInfo() { mac = value };
+ }
+ }
+
+ }
/// <summary>
/// 浣忓畢鍥剧墖
/// </summary>
public string residenceImage;
/// <summary>
- /// 浣忓畢鏁版嵁鏄惁瀛樺湪鍙樺寲
+ /// 褰撳墠浣忓畢鐨勭綉鍏矼AC
/// </summary>
- bool hasChange = false;
+ //public string residenceGatewayMAC = "4E47323347591243";//"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));
- FileUtils.WriteFileByBytes("DB_ResidenceData", ssd);
+ var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
+ Common.FileUtlis.Files.WriteFileByBytes("DB_ResidenceData", ssd);
MainPage.Log("Save DB_ResidenceData");
- // hasChange = false;
- //})
- //{ IsBackground = true }.Start();
}
/// <summary>
- /// 鍒锋柊浣忓畢閲岄潰鐨勬悳绱㈣澶囩姸鎬�
+ /// 褰撳墠閫夋嫨鐨勬ゼ灞�
/// </summary>
- public void RefreshResidenceFunctionStatus()
+ public string CurFoor = Language.StringByID(StringId.All);
+
+ ///// <summary>
+ ///// 鎴块棿鍒楄〃
+ ///// </summary>
+ //[Newtonsoft.Json.JsonIgnore]
+ //public List<Room> Rooms = SpatialInfo.CurrentSpatial.RoomList;
+
+ #region 鍔熻兘鏁版嵁
+ static FunctionList _functionList;
+ public static FunctionList functionList
{
- new System.Threading.Thread(() =>
+ get
{
- try
+ if (_functionList == null)
{
- foreach (var function in functionList.functions)
+ _functionList = FunctionList.List;
+ }
+ return _functionList;
+ }
+ set
+ {
+ _functionList = value;
+ }
+ }
+
+ #endregion
+
+ #region oid鍒楄〃 a鍗忚杞琤us鍗忚鎺у埗浣跨敤
+ /// <summary>
+ /// oid鏁版嵁淇濆瓨鐨勬枃浠跺悕
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public static string OidSavePathName = "AProtocolData_FunctionOid";
+ static List<FunctionOid> ins_OidList;
+ public static List<FunctionOid> functionOidList
+ {
+ get
+ {
+ if (ins_OidList == null)
+ {
+ var bytes = Common.FileUtlis.Files.ReadFile(OidSavePathName);
+ if (bytes == null || bytes.Length == 0)
{
- System.Threading.Thread.Sleep(100);
- if (function.bus_Data != null)
+ ins_OidList = new List<FunctionOid>();
+ }
+ else
+ {
+ var jsonString = System.Text.Encoding.UTF8.GetString(bytes);
+ if (string.IsNullOrEmpty(jsonString))
{
- 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;
-
-
- }
+ ins_OidList = new List<FunctionOid>();
}
else
{
-
- }
- }
- }
- catch (Exception ex)
- {
- MainPage.Log($"Refresh Residence Function Status Error : {ex.Message}");
- }
- })
- { IsBackground = true }.Start();
- }
-
- /// <summary>
- /// 鍒濆鍖栨瘡涓埧闂寸殑鍔熻兘鏁版嵁
- /// </summary>
- public static void InitRoomFunction()
- {
- new System.Threading.Thread(() =>
- {
- try
- {
- //鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
- instance.functionList.GetAllFunction();
- //鍒濆鍖栦綇瀹呮墍鏈夋埧闂村姛鑳芥暟鎹�
- 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}");
- if (func.roomIdList.Contains(r.sid))
+ 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 SaveOidList(string oidJsonString)
+ {
+ var oidBytes = System.Text.Encoding.UTF8.GetBytes(oidJsonString);
+
+ Common.FileUtlis.Files.WriteFileByBytes(OidSavePathName, oidBytes);
+ }
+
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.8.0