20200612

wxr

2020-06-15 b8e94316e41eba72d927d5ca7d931b26139ee8ff

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -11,24 +11,33 @@
        }

        /// <summary>
        /// 当前选择的住宅索引
        /// 0:A协议网关
        /// 1:bus网关
        /// 2:knx网关
        /// </summary>
        public int CurReginIndex = 0;
        public int GatewayType = 0;

        /// <summary>
        /// 住宅基础信息
        /// </summary>
        public RegionInfoRes residecenInfo {
        public RegionInfoRes residecenInfo
        {
            get
            {
                return MainPage.LoginUser.regionList[CurReginIndex];
                return MainPage.LoginUser.regionList.Find((obj) => obj.RegionID == CurReginID);
            }
        }

        /// <summary>
        /// 当前选择的住宅索引
        /// </summary>
        public string CurReginID = "";


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

        /// <summary>
        /// 房间列表
@@ -132,9 +141,9 @@
                        if (instance.rooms.Count == 0)
                        {
                            //--------------------
                            var r111 = new Room() { sid = "0001", name = "Room-1", floorIndex = 0, backgroundImage = "Classification/Room/Roombg.png" };
                            var r111 = new Room() { sid = "0001", name = "Room-1", floorId = "", backgroundImage = "Classification/Room/Roombg.png" };
                            instance.rooms.Add(r111);
                            instance.floors.Add("1 F");
                            instance.floors.Add(new Floor() { sid = "", name = "1 F" });
                            instance.functionList.aCs.Add(new AC()
                            {
                                sid = "12341212345678901234560604010001ABCD",
@@ -217,8 +226,8 @@
                                bus_Data = new BusData
                                {
                                    SubnetID = 42,
                                    DeviceID = 7,
                                    LoopID = 12,
                                    DeviceID = 17,
                                    LoopID = 1,
                                },
                            });
                            instance.functionList.floorHeatings.Add(new FloorHeating()
@@ -473,8 +482,13 @@
                return instance;
            }
        }


        /// <summary>
        /// 退出账号清空数据
        /// </summary>
        public void EixtAccount()
        {
            instance = null;
        }

        /// <summary>
        /// 住宅图片