From ed3bfb7462d44747230437717e8673a5192f833f Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 20:34:51 +0800
Subject: [PATCH] 2020-11-30-2
---
HDL_ON/Entity/DB_ResidenceData.cs | 35 +++++++++++++++--------------------
1 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 32c04e4..3fc2293 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -1,5 +1,7 @@
锘縰sing System;
using System.Collections.Generic;
+using HDL_ON.DAL;
+using HDL_ON.DAL.Net;
using Shared;
namespace HDL_ON.Entity
@@ -9,10 +11,7 @@
public DB_ResidenceData()
{
}
- /// <summary>
- /// 涓讳汉token
- /// </summary>
- public string MasterToken;
+
/// <summary>
/// 0:bus缃戝叧
/// 1:A鍗忚缃戝叧
@@ -31,11 +30,11 @@
}
else
{
- var curRegion = UserInfo.Current.regionList.Find((obj) => obj.RegionID == CurReginID);
+ var curRegion = MainPage.LoginUser.regionList.Find((obj) => obj.RegionID == CurReginID);
//if (curRegion == null)
//{
- // CurReginID = UserInfo.Current.regionList[0].RegionID;
- // return UserInfo.Current.regionList[0];
+ // CurReginID = MainPage.LoginUser.regionList[0].RegionID;
+ // return MainPage.LoginUser.regionList[0];
//}
return curRegion;
}
@@ -97,8 +96,8 @@
{
sid = "030101123456780202010005ABCD",
name = "鐏厜1",
- function = new List<FunctionAttributes>() {
- new FunctionAttributes { key="on_off", max=100,min = 0, value= new List<string> { "on","off"} },
+ 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
@@ -407,7 +406,7 @@
ins_Function = null;
if (MainPage.IsRemote)
{
- DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
+ Mqtt_Cloud.DisConnectRemoteMqttClient("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
}
}
@@ -418,7 +417,7 @@
/// <summary>
/// 褰撳墠浣忓畢鐨勭綉鍏矼AC
/// </summary>
- public string residenceGatewayMAC = "4E47323347591243";//"0281B9078C000000";// "00964E19C4467B1E";
+ public string residenceGatewayMAC = "0281B9078C000000";// "00964E19C4467B1E";
/// <summary>
/// 淇濆瓨浣忓畢鏁版嵁
/// </summary>
@@ -670,7 +669,7 @@
case FunctionCategory.Thermostat:
if (DB_ResidenceData.residenceData.GatewayType == 0)
{
- DriverLayer.Control.Ins.SendReadCommand(function);
+ DriverLayer.Control.ins.SendReadCommand(function);
}
break;
}
@@ -688,11 +687,6 @@
#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
{
@@ -700,7 +694,7 @@
{
if (ins_OidList == null)
{
- var bytes = FileUtils.ReadFile(OidSavePathName);
+ var bytes = FileUtils.ReadFile("AProtocolData_FunctionOid");
if (bytes == null || bytes.Length == 0)
{
ins_OidList = new List<FunctionOid>();
@@ -732,11 +726,12 @@
/// <summary>
/// 淇濆瓨oid鏁版嵁锛屾瘡娆′繚瀛橀兘浼氳鐩�
/// </summary>
- public static void SaveOidList(string oidJsonString)
+ public static void SaveFunctionOidJsonDataList(string oidJsonString)
{
+ oidJsonString = oidJsonString.Replace("add", "get_list_response");
var oidBytes = System.Text.Encoding.UTF8.GetBytes(oidJsonString);
- FileUtils.WriteFileByBytes(OidSavePathName, oidBytes);
+ FileUtils.WriteFileByBytes("AProtocolData_FunctionOid", oidBytes);
}
#endregion
--
Gitblit v1.8.0