20201202

wei

2020-12-02 30b5770f56f99c1f92e933ad31cf7d2af58b033c

 HDL_ON/UI/UI2/2-Classification/FunctionPage.cs

@@ -193,10 +193,10 @@
                };
                dispalyView.AddChidren(contentView);

                if (DB_ResidenceData.rooms.Count < 2)
                if (DB_ResidenceData.Rooms.Count < 2)
                {
                }
                else if (DB_ResidenceData.rooms.Count < 3)
                else if (DB_ResidenceData.Rooms.Count < 3)
                {
                    dispalyView = new FrameLayout()
                    {
@@ -211,7 +211,7 @@
                    contentView.Height = Application.GetRealHeight(45 * 3);
                    dispalyView.AddChidren(contentView);
                }
                else if (DB_ResidenceData.rooms.Count < 4)
                else if (DB_ResidenceData.Rooms.Count < 4)
                {
                    dispalyView = new FrameLayout()
                    {
@@ -245,11 +245,11 @@


                List<Room> roomList = new List<Room>();
                roomList.Add(new Room() { sid = "", name = Language.StringByID(StringId.All) });
                roomList.AddRange(DB_ResidenceData.rooms);
                roomList.Add(new Room() { uid = "", roomName = Language.StringByID(StringId.All) });
                roomList.AddRange(DB_ResidenceData.Rooms);
                foreach (var tempRoom in roomList)
                {
                    var roomName = tempRoom.name;
                    var roomName = tempRoom.roomName;
                    if (roomName != Language.StringByID(StringId.All))
                    {
                        contentView.AddChidren(new Button()
@@ -288,7 +288,7 @@
                            var showList = new List<Function>();
                            foreach (var sf in functionList)
                            {
                                if(sf.roomIds.Contains(tempRoom.sid))
                                if(sf.roomIds.Contains(tempRoom.uid))
                                {
                                    showList.Add(sf);
                                }