From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/Entity/DB_ResidenceData.cs | 107 +++++++++++++++++++++++++++++------------------------
1 files changed, 58 insertions(+), 49 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index ee5685b..32c04e4 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -1,7 +1,5 @@
锘縰sing System;
using System.Collections.Generic;
-using HDL_ON.DAL;
-using HDL_ON.DAL.Net;
using Shared;
namespace HDL_ON.Entity
@@ -11,12 +9,15 @@
public DB_ResidenceData()
{
}
-
+ /// <summary>
+ /// 涓讳汉token
+ /// </summary>
+ public string MasterToken;
/// <summary>
/// 0:bus缃戝叧
/// 1:A鍗忚缃戝叧
/// </summary>
- public int GatewayType = 0;
+ public int GatewayType = 1;
/// <summary>
/// 浣忓畢鍩虹淇℃伅
/// </summary>
@@ -30,11 +31,11 @@
}
else
{
- var curRegion = MainPage.LoginUser.regionList.Find((obj) => obj.RegionID == CurReginID);
+ var curRegion = UserInfo.Current.regionList.Find((obj) => obj.RegionID == CurReginID);
//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;
}
@@ -63,7 +64,7 @@
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))
@@ -95,9 +96,9 @@
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"} },
+ name = "鐏厜1",
+ function = new List<FunctionAttributes>() {
+ new FunctionAttributes { key="on_off", max=100,min = 0, value= new List<string> { "on","off"} },
},
roomIdList = new List<string>() { "0001" },
bus_Data = new BusData
@@ -110,12 +111,12 @@
- //#if DEBUG
- if (rooms.Count == 0 && residenceData.CurReginID == "1108024000000000000000")
+
+#if DEBUG11
+ if (rooms.Count == 0 )
{
//--------------------
- instance.floors.Add(new Floor() { name = "1F", sid = "09888" });
- var r111 = new Room() { sid = "0001", name = "Room-1", floorId = "09888", 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 = "1F" });
r111.SaveRoomData();
@@ -127,7 +128,7 @@
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 = "set_temperature", max = 32,min=16,value_key = new List<string>{"up","down" } },
+ new Trait { name = "temperature", max = 32,min=16,value_key = new List<string>{"up","down" } },
},
roomIdList = new List<string>() { "0001" },
lastState = "鍒跺喎 涓 18掳C",
@@ -158,7 +159,7 @@
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"} },
@@ -213,7 +214,7 @@
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 = "set_temperature", max = 32,min=5,value_key = new List<string>{"up","down" } },
+ new Trait { name = "temperature", max = 32,min=5,value_key = new List<string>{"up","down" } },
},//
lastState = "鑷姩 25掳C",
bus_Data = new BusData
@@ -245,7 +246,7 @@
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
{
@@ -261,7 +262,7 @@
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
{
@@ -377,7 +378,11 @@
}.SaveFunctionData();
instance.SaveResidenceData();
}
- //#endif
+#endif
+
+
+
+
}
catch (Exception ex)
{
@@ -402,7 +407,7 @@
ins_Function = null;
if (MainPage.IsRemote)
{
- Mqtt_Cloud.DisConnectRemoteMqttClient("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
+ DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
}
}
@@ -413,7 +418,7 @@
/// <summary>
/// 褰撳墠浣忓畢鐨勭綉鍏矼AC
/// </summary>
- public string residenceGatewayMAC = "00964E19C4467B1E";
+ public string residenceGatewayMAC = "4E47323347591243";//"0281B9078C000000";// "00964E19C4467B1E";
/// <summary>
/// 淇濆瓨浣忓畢鏁版嵁
/// </summary>
@@ -421,7 +426,7 @@
{
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");
}
@@ -472,7 +477,7 @@
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)
{
@@ -533,7 +538,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:
@@ -541,7 +546,7 @@
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:
@@ -549,13 +554,13 @@
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:
@@ -565,31 +570,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;
@@ -656,18 +661,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;
}
}
}
@@ -683,6 +688,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
{
@@ -690,7 +700,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>();
@@ -722,12 +732,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