From e53a1951d6aa07ad22aad9816da4703496fcbccd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:27:16 +0800
Subject: [PATCH] 1127最新合并代码，合并嘉乐更新
---
HDL_ON/Entity/DB_ResidenceData.cs | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 489d7d3..32c04e4 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -97,8 +97,8 @@
{
sid = "030101123456780202010005ABCD",
name = "鐏厜1",
- function = new List<Trait>() {
- new Trait { name="on_off", max=100,min = 0, value_key= new List<string> { "on","off"} },
+ 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
@@ -688,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
{
@@ -695,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>();
@@ -727,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