2020-12-09 1.信息中心，增加下划线和点击Alter提醒详情。

JLChen

2020-12-09 e87985ec1dcb69beedaf9f95e8e7aba14b7c08d6

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -1,6 +1,8 @@
using System;
using System.Collections.Generic;
using HDL_ON.DAL;
using System.Threading;
using HDL_ON.DAL.Server;
using Shared;

namespace HDL_ON.Entity
{
@@ -11,12 +13,9 @@
        }

        /// <summary>
        /// 0:A协议网关
        /// 1:bus网关
        /// 2:knx网关
        /// 主人token
        /// </summary>
        public int GatewayType = 0;

        public string MasterToken;
        /// <summary>
        /// 住宅基础信息
        /// </summary>
@@ -24,40 +23,73 @@
        {
            get
            {
                if (MainPage.LocalMode)
                if (MainPage.NoLoginMode)
                {
                    return new RegionInfoRes() { Name = "本地模式" };
                }
                else
                {
                    return 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 =  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>
        public string CurReginID = "";

        /// <summary>
        /// 楼层列表
        /// </summary>
        public List<Floor> floors = new List<Floor>();

        /// <summary>
        /// 房间列表
        /// </summary>
        public List<Room> rooms = new List<Room>();
        /// <summary>
        /// 功能列表
        /// </summary>
        public FunctionList functionList = new FunctionList();
        /// <summary>
        /// 功能oid列表
        /// </summary>
        public List<FunctionOid> functionOidList = new List<FunctionOid>();

        /// <summary>
        /// 功能类型列表
        /// </summary>
@@ -73,8 +105,9 @@
                    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))
                        {
                            temp = Newtonsoft.Json.JsonConvert.DeserializeObject<DB_ResidenceData>(userConfigString);
@@ -98,7 +131,9 @@
                                    ShowFunction.Panel,ShowFunction.SecurityMonitoring,
                                    ShowFunction.Sensor,ShowFunction.VideoIntercom
                                });
                            instance.SaveResidenceData();
                        }


                    }
                    catch (Exception ex)
@@ -107,7 +142,7 @@
                    }
                    instance.residenceImage = "Classification/Room/Roombg.png";
                    //初始化住宅功能数据
                    InitRoomFunction();
                    SpatialInfo.CurrentSpatial.InitRoomFunction();

                }
                return instance;
@@ -119,6 +154,88 @@
        public void EixtAccount()
        {
            instance = null;
            Rooms = null;
            ins_OidList = null;
            functionList = null;
            HomeGateway = null;
            if (MainPage.IsRemote)
            {
                DAL.Mqtt.MqttClient.DisConnectRemote("退出登录，或者切换住宅");
            }
        }

        /// <summary>
        /// 网关详细信息
        /// </summary>
        public HomeGatewayInfo HomeGateway;

        /// <summary>
        /// 0:bus网关
        /// 1:A协议网关
        /// </summary>
        public int GatewayType
        {
            get
            {
                //#if DEBUG
                //return 0;
                //#endif
                if (HomeGateway == null)
                    return -1;
                if (HomeGateway.gatewayType == "AGATEWAY")
                {
                    return 1;
                }
                else
                {
                    return 0;
                }
            }
        }
        /// <summary>
        /// 检测住宅是否绑定了网关
        /// </summary>
        /// <returns></returns>
        public bool CheckWhetherGatewayIsBound()
        {
            if (HomeGateway != null && !string.IsNullOrEmpty(HomeGateway.mac))
            {
                return true;
            }
            else
            {
                return false;
            }
        }

        /// <summary>
        /// 当前住宅的网关MAC
        /// </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>
@@ -126,90 +243,103 @@
        /// </summary>
        public string residenceImage;
        /// <summary>
        /// 住宅数据是否存在变化
        /// </summary>
        bool hasChange = false;
        /// <summary>
        /// 当前住宅的网关MAC
        /// </summary>
        public string residenceGatewayMAC = "4E47323347591243";
        //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 void RefreshResidenceFunctionStatus()
        {
            new System.Threading.Thread(() =>
            {
                try
                {
                    foreach (var function in functionList.functions)
                    {
                        System.Threading.Thread.Sleep(100);
                        //if (function.bus_Data != null)
                        {
                            switch (function.functionCategory)
                            {
                                case FunctionCategory.Light:
                                case FunctionCategory.Electrical:
                                case FunctionCategory.SwitchDevice:
                                case FunctionCategory.Curtain:
                                case FunctionCategory.Thermostat:
                                    Control.SendReadCommand(function);
                                    break;
                            }
                        }
                    }
                }
                catch (Exception ex)
                {
                    MainPage.Log($"Refresh Residence Function Status Error : {ex.Message}");
                }
            })
            { IsBackground = true }.Start();
        }
        public string CurFoor = Language.StringByID(StringId.All);

        /// <summary>
        /// 初始化每个房间的功能数据
        /// 房间列表
        /// </summary>
        public static void InitRoomFunction()
        public List<Room> Rooms = SpatialInfo.CurrentSpatial.RoomList;

        #region 功能数据
        static FunctionList _functionList;
        public static FunctionList functionList
        {
            new System.Threading.Thread(() =>
            get
            {
                try
                if (_functionList == null)
                {
                    //初始化住宅功能数据
                    instance.functionList.GetAllFunction();
                    //初始化住宅所有房间功能数据
                    foreach (var r in instance.rooms)
                    _functionList = FunctionList.List;
                }
                return _functionList;
            }
            set
            {
                _functionList = value;
            }
        }

        #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
        {
            get
            {
                if (ins_OidList == null)
                {
                    var bytes = FileUtils.ReadFile(OidSavePathName);
                    if (bytes == null || bytes.Length == 0)
                    {
                        r.functions.Clear();
                        foreach (var func in instance.functionList.functions)
                        ins_OidList = new List<FunctionOid>();
                    }
                    else
                    {
                        var jsonString = System.Text.Encoding.UTF8.GetString(bytes);
                        if (string.IsNullOrEmpty(jsonString))
                        {
                            MainPage.Log($"init room function sid {func.functionCategory.ToString()}:{r.sid}");
                            if (func.roomIdList.Contains(r.sid))
                            ins_OidList = new List<FunctionOid>();
                        }
                        else
                        {
                            var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<FunctionOid>>(jsonString);
                            if (list == null)
                            {
                                r.functions.Add(func);
                                ins_OidList = new List<FunctionOid>();
                            }
                            else
                            {
                                ins_OidList = list;
                            }
                        }
                    }
                }catch(Exception ex)
                {
                    MainPage.Log($"Init room function error : {ex.Message}");
                }
            })
            { IsBackground = true }.Start();
                return ins_OidList;
            }
        }
        /// <summary>
        /// 保存oid数据，每次保存都会覆盖
        /// </summary>
        public static void SaveOidList(string oidJsonString)
        {
            var oidBytes = System.Text.Encoding.UTF8.GetBytes(oidJsonString);

            FileUtils.WriteFileByBytes(OidSavePathName, oidBytes);
        }

        #endregion
    }
}