Merge branch 'master' into WJC

陈嘉乐

2020-11-30 c44b10e4447e84dbdfa9105edf460ef364a8f2b3

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
using HDL_ON.DAL;
using HDL_ON.DAL.Net;
using Shared;

namespace HDL_ON.Entity
@@ -99,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
@@ -409,7 +407,7 @@
            ins_Function = null;
            if (MainPage.IsRemote)
            {
                Mqtt_Cloud.DisConnectRemoteMqttClient("退出登录，或者切换住宅");
                DAL.Mqtt.MqttClient.DisConnectRemote("退出登录，或者切换住宅");
            }
        }

@@ -690,6 +688,11 @@
        #endregion

        #region oid列表 a协议转bus协议控制使用
        /// <summary>
        /// oid数据保存的文件名
        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        public static string OidSavePathName = "AProtocolData_FunctionOid";
        static List<FunctionOid> ins_OidList;
        public static List<FunctionOid> functionOidList
        {
@@ -697,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>();
@@ -729,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