20201208

wei

2020-12-08 62d77d3bb8e7215d9da9ecf6f5aeda0b69f805f8

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -30,6 +30,22 @@
                else
                {
                    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;
@@ -117,25 +133,6 @@
                                });
                            instance.SaveResidenceData();
                        }

                        new Light()
                        {
                            sid = "030101123456780202010005ABCD",
                            name = "灯光1",
                            attributes = new List<FunctionAttributes>() {
                                        new FunctionAttributes { key="on_off", max=100,min = 0, value= new List<string> { "on","off"} },
                                        },
                            roomIds = new List<string>() { "0001" },
                            bus_Data = new BusData
                            {
                                addresses = "2A06",
                                loopId = 1,
                            },
                        }.SaveFunctionData();


                       
                       


                    }
@@ -271,43 +268,21 @@
        public List<Room> Rooms = SpatialInfo.CurrentSpatial.RoomList;

        #region 功能数据
        public static FunctionList functionList = FunctionList.List;

        /// <summary>
        /// 刷新住宅里面的搜索设备状态
        /// </summary>
        public void RefreshResidenceFunctionStatus()
        {
            new Thread(() =>
        static FunctionList _functionList;
        public static FunctionList functionList {
            get
            {
                try
                if(_functionList == null)
                {
                    foreach (var function in functionList.GetAllDeviceFunctionList())
                    {
                        Thread.Sleep(100);
                        switch (function.functionCategory)
                        {
                            case FunctionCategory.Light:
                            case FunctionCategory.Electrical:
                            case FunctionCategory.SwitchDevice:
                            case FunctionCategory.Curtain:
                            case FunctionCategory.Thermostat:
                                if (DB_ResidenceData.residenceData.GatewayType == 0)
                                {
                                    DriverLayer.Control.Ins.SendReadCommand(function);
                                }
                                break;
                        }
                    }
                    _functionList = FunctionList.List;
                }
                catch (Exception ex)
                {
                    MainPage.Log($"Refresh Residence Function Status Error : {ex.Message}");
                }
            })
            { IsBackground = true }.Start();
                return _functionList;
            }
            set
            {
                _functionList = value;
            }
        }


        #endregion