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

JLChen

2020-12-09 e87985ec1dcb69beedaf9f95e8e7aba14b7c08d6

 HDL_ON/Entity/DB_ResidenceData.cs

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

namespace HDL_ON.Entity
@@ -13,10 +13,9 @@
        }

        /// <summary>
        /// 0:bus网关
        /// 1:A协议网关
        /// 主人token
        /// </summary>
        public int GatewayType = 0;
        public string MasterToken;
        /// <summary>
        /// 住宅基础信息
        /// </summary>
@@ -30,24 +29,67 @@
                }
                else
                {
                    var curRegion = 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 = MainPage.LoginUser.regionList[0].RegionID;
                    //    return MainPage.LoginUser.regionList[0];
                    //    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>
@@ -63,7 +105,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))
@@ -92,22 +134,6 @@
                            instance.SaveResidenceData();
                        }

                        //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"} },
                        //                },
                        //    roomIdList = new List<string>() { "0001" },
                        //    bus_Data = new BusData
                        //    {
                        //        SubnetID = 42,
                        //        DeviceID = 6,
                        //        LoopID = 1,
                        //    },
                        //}.SaveFunctionData();


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

                }
                return instance;
@@ -128,13 +154,88 @@
        public void EixtAccount()
        {
            instance = null;
            ins_Room = null;
            Rooms = null;
            ins_OidList = null;
            ins_Function = null;
            functionList = null;
            HomeGateway = null;
            if (MainPage.IsRemote)
            {
                Mqtt_Cloud.DisConnectRemoteMqttClient("退出登录，或者切换住宅");
                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>
@@ -144,7 +245,7 @@
        /// <summary>
        /// 当前住宅的网关MAC
        /// </summary>
        public string residenceGatewayMAC = "00964E19C4467B1E";
        //public string residenceGatewayMAC = "4E47323347591243";//"0281B9078C000000";// "00964E19C4467B1E";
        /// <summary>
        /// 保存住宅数据
        /// </summary>
@@ -152,7 +253,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");
        }
@@ -162,258 +263,37 @@
        /// </summary>
        public string CurFoor = Language.StringByID(StringId.All);

        #region 房间数据相关
        /// <summary>
        /// 初始化每个房间的功能数据
        /// 房间列表
        /// </summary>
        public static void InitRoomFunction()
        {
            new System.Threading.Thread(() =>
            {
                try
                {
                    //初始化住宅所有房间功能数据
                    foreach (var r in rooms)
                    {
                        r.GetRoomFunctions(true);
                    }
                }
                catch (Exception ex)
                {
                    MainPage.Log($"Init room function error : {ex.Message}");
                }
            })
            { IsBackground = true }.Start();
        }

        static List<Room> ins_Room;
        public static List<Room> rooms
        {
            get
            {
                if (ins_Room == null)
                {
                    try
                    {
                        ins_Room = new List<Room> { };
                        var filePathList = FileUtils.ReadFiles();

                        foreach (var filePath in filePathList)
                        {
                            if (filePath.StartsWith("RoomData_"))
                            {
                                var roomDataBytes = FileUtils.ReadFile(filePath);
                                var roomDataString = CommonPage.MyEncodingUTF8.GetString(roomDataBytes);
                                var room = Newtonsoft.Json.JsonConvert.DeserializeObject<Room>(roomDataString);
                                if (room != null)
                                {
                                    ins_Room.Add(room);
                                }
                            }
                        }
                    }
                    catch (Exception ex)
                    {
                        MainPage.Log($"功能数据初始化失败：{ex.Message}");
                    }
                }
                return ins_Room;
            }
        }
        /// <summary>
        /// 删除房间
        /// </summary>
        /// <param name="delRoom"></param>
        public static void DelRoom(Room delRoom)
        {
            var tRoom = rooms.Find((obj) => obj.sid == delRoom.sid);
            if (tRoom != null)
            {
                FileUtils.DeleteFile(delRoom.roomSavePath);
                rooms.Remove(tRoom);
            }
        }
        #endregion
        public List<Room> Rooms = SpatialInfo.CurrentSpatial.RoomList;

        #region 功能数据
        static FunctionList ins_Function;
        static FunctionList _functionList;
        public static FunctionList functionList
        {
            get
            {
                if (ins_Function == null)
                if (_functionList == null)
                {
                    try
                    {
                        ins_Function = new FunctionList { };
                        #region 恢复数据
                        var filePathList = FileUtils.ReadFiles();

                        List<Function> fs = new List<Function>();

                        foreach (var filePath in filePathList)
                        {
                            if (filePath.StartsWith("FunctionData_") && filePath.Length == 13 + 28)
                            {
                                //var filePath = fp.Remove(0, 13);
                                var _functionTypeString = filePath.Substring(16 + 13, 4);
                                var ft = (FunctionType)Enum.ToObject(typeof(FunctionType), Convert.ToInt32(_functionTypeString, 16));

                                switch (ft)
                                {
                                    case FunctionType.AC:
                                        //恢复空调数据
                                        var acDataBytes = FileUtils.ReadFile(filePath);
                                        var acString = CommonPage.MyEncodingUTF8.GetString(acDataBytes);
                                        ins_Function.aCs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(acString));
                                        break;
                                    case FunctionType.Relay:
                                    case FunctionType.Dimmer:
                                    case FunctionType.RGB:
                                        //恢复灯光数据
                                        var lightsDataBytes = FileUtils.ReadFile(filePath);
                                        var lightsString = CommonPage.MyEncodingUTF8.GetString(lightsDataBytes);
                                        ins_Function.lights.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(lightsString));
                                        break;
                                    case FunctionType.Curtain:
                                    case FunctionType.MotorCurtain:
                                    case FunctionType.RollingShutter:
                                        //恢复窗帘数据
                                        var curtainsDataBytes = FileUtils.ReadFile(filePath);
                                        var curtainsString = CommonPage.MyEncodingUTF8.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);
                                        ins_Function.floorHeatings.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(fhString));
                                        break;
                                    case FunctionType.PM25:
                                    case FunctionType.CO2:
                                    case FunctionType.TVOC:
                                    case FunctionType.Temp:
                                    case FunctionType.Humidity:
                                        //恢复环境数据
                                        var sesDataBytes = FileUtils.ReadFile(filePath);
                                        var sesString = CommonPage.MyEncodingUTF8.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);
                                        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);
                                        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);
                                        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);
                                        ins_Function.scenes.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Scene>(scenesString));
                                        break;

                                }
                            }
                        }
                        #endregion
                    }
                    catch (Exception ex)
                    {
                        MainPage.Log($"功能数据初始化失败：{ex.Message}");
                    }

                    _functionList = FunctionList.List;
                }
                return ins_Function;
                return _functionList;
            }
            set
            {
                _functionList = value;
            }
        }
        /// <summary>
        /// 删除手机存储都所有功能数据
        /// </summary>
        public static void DelAllFunctionData()
        {
            var filePathList = FileUtils.ReadFiles();
            foreach (var filePath in filePathList)
            {
                if (filePath.StartsWith("FunctionData_") && filePath.Length == 13 + 28)
                {
                    FileUtils.DeleteFile(filePath);
                }
            }
            ins_Function = new FunctionList();
            ins_Function.aCs = new List<AC>();
            ins_Function.lights = new List<Light>();
            ins_Function.curtains = new List<Curtain>();
            ins_Function.floorHeatings = new List<FloorHeating>();
            ins_Function.sensorsEnvironmentalScience = new List<Sensor>();
            ins_Function.switchSockets = new List<SwitchSocket>();
            ins_Function.tVs = new List<TV>();
            ins_Function.fans = new List<Fan>();
            ins_Function.scenes = new List<Scene>();
        }
        /// <summary>
        /// 删除功能
        /// </summary>
        public static void DelSceneFunction(string fSid)
        {
            var f = functionList.scenes.Find((obj) => obj.sid == fSid);
            if (f != null)
            {
                FileUtils.DeleteFile(f.savePath);
                functionList.scenes.Remove(f);
            }
        }

        /// <summary>
        /// 刷新住宅里面的搜索设备状态
        /// </summary>
        public void RefreshResidenceFunctionStatus()
        {
            new System.Threading.Thread(() =>
            {
                try
                {
                    foreach (var function in functionList.GetAllDeviceFunctionList())
                    {
                        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();
        }


        #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
        {
@@ -421,7 +301,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>();
@@ -453,12 +333,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