2020-10-13-1

陈嘉乐

2020-10-13 611786df5108dca0bdcff03834cc285cba4b8e61

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -24,7 +24,14 @@
        {
            get
            {
                return MainPage.LoginUser.regionList.Find((obj) => obj.RegionID == CurReginID);
                if (MainPage.LocalMode)
                {
                    return new RegionInfoRes() { Name = "本地模式" };
                }
                else
                {
                    return MainPage.LoginUser.regionList.Find((obj) => obj.RegionID == CurReginID);
                }
            }
        }

@@ -174,8 +181,8 @@
                                lastState = "20%",
                                bus_Data = new BusData
                                {
                                    SubnetID = 111,
                                    DeviceID = 2,
                                    SubnetID = 42,
                                    DeviceID = 9,
                                    LoopID = 1,
                                },

@@ -474,8 +481,7 @@
                    {
                        MainPage.Log($"住宅数据初始化失败：{ex.Message}");
                    }
                    if (instance!=null) { 
                    instance.residenceImage = "Classification/Room/Roombg.png";}
                    instance.residenceImage = "Classification/Room/Roombg.png";
                    //初始化住宅功能数据
                    InitRoomFunction();

@@ -500,6 +506,10 @@
        /// </summary>
        bool hasChange = false;
        /// <summary>
        /// 当前住宅的网关MAC
        /// </summary>
        public string residenceGatewayMAC = "4E47323347591243";
        /// <summary>
        /// 保存住宅数据
        /// </summary>
        public void SaveResidenceData()