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 | 771 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 445 insertions(+), 326 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 2a7747e..e20e883 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -1,7 +1,8 @@
锘縰sing System;
using System.Collections.Generic;
-using HDL_ON.DAL;
-using HDL_ON.DAL.Net;
+using System.Threading;
+using HDL_ON.DAL.Server;
+using Shared;
namespace HDL_ON.Entity
{
@@ -12,11 +13,14 @@
}
/// <summary>
- /// 0:A鍗忚缃戝叧
- /// 1:bus缃戝叧
- /// 2:knx缃戝叧
+ /// 涓讳汉token
/// </summary>
- public int GatewayType = 0;
+ public string MasterToken;
+ /// <summary>
+ /// 0:bus缃戝叧
+ /// 1:A鍗忚缃戝叧
+ /// </summary>
+ public int GatewayType = 1;
/// <summary>
/// 浣忓畢鍩虹淇℃伅
/// </summary>
@@ -30,16 +34,63 @@
}
else
{
- var curRegion = MainPage.LoginUser.regionList.Find((obj) => obj.RegionID == CurReginID);
+ 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 = MainPage.LoginUser.regionList[0].RegionID;
- // return MainPage.LoginUser.regionList[0];
+ // 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>
@@ -63,10 +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 (!string.IsNullOrEmpty(userConfigString))
+ if (!string.IsNullOrEmpty(userConfigString))
{
temp = Newtonsoft.Json.JsonConvert.DeserializeObject<DB_ResidenceData>(userConfigString);
}
@@ -92,291 +143,298 @@
instance.SaveResidenceData();
}
- //new Light()
- //{
- // sid = "030101123456780202010005ABCD",
- // name = "鍚婄伅",
- // 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 = 111,
- // DeviceID = 3,
- // LoopID = 1,
- // },
- //}.SaveFunctionData();
+ 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
+ {
+ addresses = "2A06",
+ loopId = 1,
+ },
+ }.SaveFunctionData();
+
+
+
+
- //#if DEBUG
- // if (rooms.Count == 0 && residenceData.CurReginID == "1108024")
- // {
- // //--------------------
- // var r111 = new Room() { sid = "0001", name = "Room-1", 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
- // {
- // 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,
- // },
+#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
+ {
+ 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" } },
+ }.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
- // }
- // }.SaveFunctionData();
- // new Light()
- // {
- // 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()
- // {
- // 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()
- // {
- // 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()
- // {
- // 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()
- // {
- // 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",
- // 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
+ },// "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
+ }
+ }.SaveFunctionData();
+ new Light()
+ {
+ 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()
+ {
+ 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()
+ {
+ 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()
+ {
+ 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()
+ {
+ 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)
{
@@ -399,10 +457,61 @@
ins_Room = null;
ins_OidList = null;
ins_Function = null;
- if(MainPage.IsRemote)
+ if (MainPage.IsRemote)
{
- Mqtt_Cloud.DisConnectRemoteMqttClient("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
+ DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
}
+ }
+
+ /// <summary>
+ /// 缃戝叧璇︾粏淇℃伅
+ /// </summary>
+ 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>
@@ -412,18 +521,23 @@
/// <summary>
/// 褰撳墠浣忓畢鐨勭綉鍏矼AC
/// </summary>
- public string residenceGatewayMAC = "00964E19C4467B1E";
+ //public string residenceGatewayMAC = "4E47323347591243";//"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>
@@ -439,6 +553,7 @@
foreach (var r in rooms)
{
r.GetRoomFunctions(true);
+ r.GetRoomScenes(true);
}
}
catch (Exception ex)
@@ -463,12 +578,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);
}
@@ -487,17 +602,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;
@@ -528,7 +642,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:
@@ -536,20 +650,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:
@@ -559,31 +674,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;
@@ -650,18 +765,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;
}
}
}
@@ -677,6 +792,11 @@
#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
{
@@ -684,7 +804,7 @@
{
if (ins_OidList == null)
{
- var bytes = FileUtils.ReadFile("AProtocolData_FunctionOid");
+ var bytes = FileUtils.ReadFile(OidSavePathName);
if (bytes == null || bytes.Length == 0)
{
ins_OidList = new List<FunctionOid>();
@@ -716,12 +836,11 @@
/// <summary>
/// 淇濆瓨oid鏁版嵁锛屾瘡娆′繚瀛橀兘浼氳鐩�
/// </summary>
- public static void SaveFunctionOidJsonDataList(string oidJsonString)
+ public static void SaveOidList(string oidJsonString)
{
- oidJsonString = oidJsonString.Replace("add", "get_list_response");
var oidBytes = System.Text.Encoding.UTF8.GetBytes(oidJsonString);
- FileUtils.WriteFileByBytes("AProtocolData_FunctionOid", oidBytes);
+ FileUtils.WriteFileByBytes(OidSavePathName, oidBytes);
}
#endregion
--
Gitblit v1.8.0