From 8a10caa6573a67dac87be44d6990151248b2cc44 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 04 十二月 2020 13:58:27 +0800
Subject: [PATCH] 2020-12-04 1.优化Android极光推送，未完善。
---
HDL_ON/Entity/DB_ResidenceData.cs | 926 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 759 insertions(+), 167 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 31c3fb4..e20e883 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
{
@@ -9,35 +11,98 @@
public DB_ResidenceData()
{
}
- /// <summary>
- /// 浣忓畢鍚嶇О
- /// </summary>
- public string residenceName;
- /// <summary>
- /// 浣忓畢鍥剧墖
- /// </summary>
- public string residenceImage;
+ /// <summary>
+ /// 涓讳汉token
+ /// </summary>
+ public string MasterToken;
+ /// <summary>
+ /// 0:bus缃戝叧
+ /// 1:A鍗忚缃戝叧
+ /// </summary>
+ public int GatewayType = 1;
+ /// <summary>
+ /// 浣忓畢鍩虹淇℃伅
+ /// </summary>
+ public RegionInfoRes residecenInfo
+ {
+ get
+ {
+ if (MainPage.NoLoginMode)
+ {
+ return new RegionInfoRes() { Name = "鏈湴妯″紡" };
+ }
+ else
+ {
+ var curRegion = UserInfo.Current.regionList.Find((obj) => obj.RegionID == CurReginID);
+ if (curRegion == null)
+ {
+ if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0)
+ {
+ CurReginID = UserInfo.Current.regionList[0].RegionID;
+ //鎭㈠澶囦唤
+ HDLCommon.Current.RestoreHomeBackup(CurReginID);
+
+ return UserInfo.Current.regionList[0];
+ }
+ else
+ {
+ return new RegionInfoRes();
+ }
+ }
+
+ //if (curRegion == null)
+ //{
+ // CurReginID = UserInfo.Current.regionList[0].RegionID;
+ // return UserInfo.Current.regionList[0];
+ //}
+ return curRegion;
+ }
+ }
+ }
+
+ ///// <summary>
+ ///// 鑾峰彇缃戝叧鍒楄〃
+ ///// </summary>
+ //void GetHomeGatewayList()
+ //{
+ // new Thread(() =>
+ // {
+ // //鍒囨崲浣忓畢鍚庯紝鏌ヨ涓�娆＄綉鍏冲垪琛�
+ // new HttpServerRequest().GetHomeGatewayList();
+ // })
+ // { IsBackground = true }.Start();
+
+ //}
+
+ //string curReginID;
+ ///// <summary>
+ ///// 褰撳墠閫夋嫨鐨勪綇瀹呯储寮�
+ ///// </summary>
+ //public string CurReginID
+ //{
+ // set
+ // {
+ // curReginID = value;
+ // GetHomeGatewayList();
+ // }
+ // get
+ // {
+ // return 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>
- //[Newtonsoft.Json.JsonIgnore]
- public FunctionList functions = new FunctionList();
-
- /// <summary>
- /// 鍦烘櫙鍒楄〃
- /// </summary>
- public List<Scene> scenes = new List<Scene>();
+ public List<ShowFunction> functionTypeList = new List<ShowFunction>();
static DB_ResidenceData instance;
public static DB_ResidenceData residenceData
@@ -49,9 +114,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 (userConfigString != null)
+
+ if (!string.IsNullOrEmpty(userConfigString))
{
temp = Newtonsoft.Json.JsonConvert.DeserializeObject<DB_ResidenceData>(userConfigString);
}
@@ -63,143 +129,628 @@
{
instance = temp;
}
- new System.Threading.Thread(() =>
+ if (instance.functionTypeList.Count == 0)
{
- //鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
- instance.functions.GetAllFunction();
- //鍒濆鍖栦綇瀹呮墍鏈夋埧闂村姛鑳芥暟鎹�
- foreach (var r in instance.rooms)
+ 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
+ });
+ instance.SaveResidenceData();
+ }
+
+ new Light()
+ {
+ sid = "030101123456780202010005ABCD",
+ name = "鐏厜1",
+ attributes = new List<FunctionAttributes>() {
+ new FunctionAttributes { key="on_off", max=100,min = 0, value= new List<string> { "on","off"} },
+ },
+ roomIds = new List<string>() { "0001" },
+ bus_Data = new BusData
{
- foreach (var func in instance.functions.functions)
+ addresses = "2A06",
+ loopId = 1,
+ },
+ }.SaveFunctionData();
+
+
+
+
+
+
+
+#if DEBUG11
+ if (rooms.Count == 0 )
+ {
+ //--------------------
+ 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 = "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" } },
+ },
+ roomIdList = new List<string>() { "0001" },
+ lastState = "鍒跺喎 涓 18掳C",
+ bus_Data = new BusData
{
- if (func.roomIdList.Contains(r.sid))
- {
- r.functions.Add(func);
- }
+ SubnetID = 42,
+ DeviceID = 8,
+ LoopID = 1,
+ },
+ }.SaveFunctionData();
+ new Light()
+ {
+ sid = "030101123456780202020002ABCD",
+ name = "璋冨厜鐏�",
+ function = new List<Trait>() {
+ 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
+ {
+ SubnetID = 42,
+ DeviceID = 9,
+ LoopID = 1,
+ },
+
+ }.SaveFunctionData();
+ new Curtain()
+ {
+ sid = "030101123456780303010003ABCD",
+ 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",
+ lastState = "寮�",
+ bus_Data = new BusData
+ {
+ SubnetID = 42,
+ DeviceID = 7,
+ LoopID = 1,
+ },
+ }.SaveFunctionData();
+ new Curtain()
+ {
+ sid = "030101123456780303030011ABCD",
+ 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",
+ lastState = "20%",
+ bus_Data = new BusData
+ {
+ SubnetID = 42,
+ DeviceID = 7,
+ LoopID = 11,
+ },
+ }.SaveFunctionData();
+ new Curtain()
+ {
+ sid = "030101123456780503040012ABCD",
+ 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" } },
+
+ },// "rollingshutter",
+ lastState = "20%",
+ bus_Data = new BusData
+ {
+ SubnetID = 42,
+ DeviceID = 17,
+ LoopID = 1,
+ },
+ }.SaveFunctionData();
+ new FloorHeating()
+ {
+ sid = "030101123456780404020004ABCD",
+ 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" } },
+ },//
+ lastState = "鑷姩 25掳C",
+ bus_Data = new BusData
+ {
+ SubnetID = 111,
+ DeviceID = 12,
+ LoopID = 1
}
- }
- })
- { IsBackground = true }.Start();
-
- }
- catch { }
- instance.residenceName = "濡効鐨勫";
- instance.residenceImage = "Classification/Room/Roombg.png";
-
-#if DEBUG
- 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.functions.aCs.Add(new AC()
- {
- sid = "12341212345678901234560600000001",
- name = "绌鸿皟",
- trait = "Switch,mode,fan,temperature",
- roomIdList = new List<string>() { "0001" },
- lastState = "鍒跺喎 涓 18掳C",
- bus_Data = new BusData
+ }.SaveFunctionData();
+ new Light()
{
- SubnetID = 4,
- DeviceID = 8,
- LoopID = 1,
- },
- });
- instance.functions.lights.Add(new Light()
- {
- sid = "12341212345678901234560400000002",
- name = "瀹㈠巺鐏�",
- trait = "brightness",
- roomIdList = new List<string>() { "0001" },
- lastState = "20%",
- bus_Data = new BusData
+ 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",
+ roomIdList = new List<string>() { "0001" },
+ bus_Data = new BusData
+ {
+ SubnetID = 42,
+ DeviceID = 6,
+ LoopID = 1,
+ },
+ }.SaveFunctionData();
+ new Light()
{
- SubnetID = 14,
- DeviceID = 8,
- LoopID = 1,
- },
-
- });
- instance.functions.curtains.Add(new Curtain()
- {
- sid = "12341212345678901234560500000003",
- name = "绐楀笜",
- roomIdList = new List<string>() { "0001" },
- lastState = "20%",
- bus_Data = new BusData
+ 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",
+ roomIdList = new List<string>() { "0001" },
+ bus_Data = new BusData
+ {
+ SubnetID = 42,
+ DeviceID = 4,
+ LoopID = 1,
+ },
+ }.SaveFunctionData();
+ new Fan()
{
- SubnetID = 42,
- DeviceID = 7,
- LoopID = 1,
- },
- });
- instance.functions.floorHeatings.Add(new FloorHeating()
- {
- sid = "12341212345678901234560700000004",
- name = "鍦扮儹",
- roomIdList = new List<string>() { "0001" },
- lastState = ""
- });
- instance.functions.lights.Add(new Light()
- {
- sid = "12341212345678901234560400000005",
- name = "瀹㈠巺澶х伅",
- trait = "switch",
- roomIdList = new List<string>() { "0001" },
- bus_Data = new BusData
+ 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",
+ roomIdList = new List<string>() { "0001" },
+ bus_Data = new BusData
+ {
+ SubnetID = 142,
+ DeviceID = 4,
+ LoopID = 11,
+ },
+ }.SaveFunctionData();
+ new TV()
{
- SubnetID = 111,
- DeviceID = 6,
- LoopID = 1,
- },
- });
- instance.functions.lights.Add(new Light()
- {
- sid = "12341212345678901234560400000006",
- name = "瀹㈠巺RGB鐏�",
- trait = "brightness,color",
- roomIdList = new List<string>() { "0001" },
- bus_Data = new BusData
+ sid = "030101123456781010020006ABCD",
+ name = "鐢佃",
+ function = new List<Trait>() {
+ 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
+ {
+ SubnetID = 142,
+ DeviceID = 4,
+ LoopID = 111,
+ },
+ }.SaveFunctionData();
+ new SwitchSocket()
{
- SubnetID = 214,
- DeviceID = 8,
- LoopID = 1,
- },
- });
-
- //鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
- instance.InitRoomFunction();
- }
+ sid = "030101123456780101020006ABCD",
+ name = "鎻掑骇",
+ function = new List<Trait>() {
+ 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
+ {
+ SubnetID = 42,
+ DeviceID = 6,
+ LoopID = 1,
+ },
+ }.SaveFunctionData();
+ new Sensor()
+ {
+ sid = "030101123456781005060006ABCD",
+ 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"} },
+ },
+ bus_Data = new BusData
+ {
+ SubnetID = 111,
+ DeviceID = 15,
+ LoopID = 1,
+ },
+ }.SaveFunctionData();
+ new Sensor()
+ {
+ sid = "030101123456781005070006ABCD",
+ 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"} },
+ },
+ bus_Data = new BusData
+ {
+ SubnetID = 111,
+ DeviceID = 15,
+ LoopID = 1,
+ },
+ }.SaveFunctionData();
+ new Sensor()
+ {
+ sid = "030101123456781005020006ABCD",
+ name = "娓╁害",
+ roomIdList = new List<string>() { "0001" },
+ function = new List<Trait>() {
+ new Trait { name="values", max=1,min = 0, value_key= new List<string> { "28"} },
+ },
+ bus_Data = new BusData
+ {
+ SubnetID = 111,
+ DeviceID = 15,
+ LoopID = 1,
+ },
+ }.SaveFunctionData();
+ new Sensor()
+ {
+ sid = "030101123456781005050006ABCD",
+ 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"} },
+ },
+ bus_Data = new BusData
+ {
+ SubnetID = 111,
+ DeviceID = 15,
+ LoopID = 1,
+ },
+ }.SaveFunctionData();
+ new Sensor()
+ {
+ sid = "030101123456781005030006ABCD",
+ name = "婀垮害",
+ roomIdList = new List<string>() { "0001" },
+ function = new List<Trait>() {
+ 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
+
+
+
+
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"浣忓畢鏁版嵁鍒濆鍖栧け璐ワ細{ex.Message}");
+ }
+ instance.residenceImage = "Classification/Room/Roombg.png";
+ //鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
+ InitRoomFunction();
+
}
return instance;
}
}
+ /// <summary>
+ /// 閫�鍑鸿处鍙锋竻绌烘暟鎹�
+ /// </summary>
+ public void EixtAccount()
+ {
+ instance = null;
+ ins_Room = null;
+ ins_OidList = null;
+ ins_Function = null;
+ if (MainPage.IsRemote)
+ {
+ DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
+ }
+ }
/// <summary>
- /// 浣忓畢鏁版嵁鏄惁瀛樺湪鍙樺寲
+ /// 缃戝叧璇︾粏淇℃伅
/// </summary>
- bool hasChange = false;
+ public HomeGatewayInfo HomeGateway;
+
+ /// <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>
+ //public string residenceGatewayMAC = "4E47323347591243";//"0281B9078C000000";// "00964E19C4467B1E";
/// <summary>
/// 淇濆瓨浣忓畢鏁版嵁
/// </summary>
public void SaveResidenceData()
{
- hasChange = true;
+ if (this == null || this.residecenInfo == null)
+ return;
+ 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>
+ /// 鍒濆鍖栨瘡涓埧闂寸殑鍔熻兘鏁版嵁
+ /// </summary>
+ public static void InitRoomFunction()
+ {
new System.Threading.Thread(() =>
{
- while (hasChange)
+ try
{
- hasChange = false;
- System.Threading.Thread.Sleep(5000);
+ //鍒濆鍖栦綇瀹呮墍鏈夋埧闂村姛鑳芥暟鎹�
+ foreach (var r in rooms)
+ {
+ r.GetRoomFunctions(true);
+ r.GetRoomScenes(true);
+ }
}
-
- var ssd = CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
- FileUtils.WriteFileByBytes("DB_ResidenceData", ssd);
- MainPage.Log("Save DB_ResidenceData");
+ 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>
@@ -209,48 +760,89 @@
{
new System.Threading.Thread(() =>
{
- foreach (var function in functions.functions)
+ try
{
- System.Threading.Thread.Sleep(100);
- if (function.bus_Data!= null)
+ foreach (var function in functionList.GetAllDeviceFunctionList())
{
- if (function.functionCategory == FunctionType.Light)
+ System.Threading.Thread.Sleep(100);
+ switch (function.functionCategory)
{
- Control.Send("read", function, 3);
+ 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;
}
+ }
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"Refresh Residence Function Status Error : {ex.Message}");
+ }
+ })
+ { IsBackground = true }.Start();
+ }
+
+
+ #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 = FileUtils.ReadFile(OidSavePathName);
+ if (bytes == null || bytes.Length == 0)
+ {
+ ins_OidList = new List<FunctionOid>();
}
else
{
-
- }
- }
- })
- { IsBackground = true }.Start();
- }
-
- /// <summary>
- /// 鍒濆鍖栨瘡涓埧闂寸殑鍔熻兘鏁版嵁
- /// </summary>
- public void InitRoomFunction()
- {
- new System.Threading.Thread(() =>
- {
- //鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
- instance.functions.GetAllFunction();
- //鍒濆鍖栦綇瀹呮墍鏈夋埧闂村姛鑳芥暟鎹�
- foreach (var r in instance.rooms)
- {
- foreach (var func in instance.functions.functions)
- {
- if (func.roomIdList.Contains(r.sid))
+ var jsonString = System.Text.Encoding.UTF8.GetString(bytes);
+ if (string.IsNullOrEmpty(jsonString))
{
- r.functions.Add(func);
+ ins_OidList = new List<FunctionOid>();
+ }
+ else
+ {
+ var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<FunctionOid>>(jsonString);
+ if (list == null)
+ {
+ ins_OidList = new List<FunctionOid>();
+ }
+ else
+ {
+ ins_OidList = list;
+ }
}
}
}
- })
- { IsBackground = true }.Start();
-
+ return ins_OidList;
+ }
}
+ /// <summary>
+ /// 淇濆瓨oid鏁版嵁锛屾瘡娆′繚瀛橀兘浼氳鐩�
+ /// </summary>
+ public static void SaveOidList(string oidJsonString)
+ {
+ var oidBytes = System.Text.Encoding.UTF8.GetBytes(oidJsonString);
+
+ FileUtils.WriteFileByBytes(OidSavePathName, oidBytes);
+ }
+
+ #endregion
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0