20201202

wei

2020-12-02 30b5770f56f99c1f92e933ad31cf7d2af58b033c

 HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs

@@ -33,8 +33,8 @@
            bodyView.AddChidren(contentView);

            System.Collections.Generic.List<Room> rooms = new System.Collections.Generic.List<Room>();
            rooms.Add(new Room() { sid = "", name = Language.StringByID(StringId.WholeHouseScene),floorId = ""  });
            rooms.AddRange(DB_ResidenceData.rooms);
            rooms.Add(new Room() { uid = "", roomName = Language.StringByID(StringId.WholeHouseScene),parentId = ""  });
            rooms.AddRange(DB_ResidenceData.Rooms);
            foreach (var room in rooms)
            {
                var roomView = new FrameLayout()
@@ -52,7 +52,7 @@
                    TextSize = CSS_FontSize.SubheadingFontSize,
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    TextAlignment = TextAlignment.CenterLeft,
                    Text = room.floorName + room.name,
                    Text = room.floorName + room.roomName,
                };
                roomView.AddChidren(btnRoomText);

@@ -67,7 +67,7 @@
                    Tag = "ChooseIcon"
                };
                roomView.AddChidren(btnChoose);
                if(scene.roomIds.Contains(room.sid))
                if(scene.roomIds.Contains(room.uid))
                {
                    btnChoose.IsSelected = true;
                    lastButton = btnChoose;
@@ -105,7 +105,7 @@
                lastButton = btn;
                btn.IsSelected = true;
                scene.roomIds = new System.Collections.Generic.List<string>();
                scene.roomIds.Add(room.sid);
                scene.roomIds.Add(room.uid);
                this.RemoveFromParent();
                backAction();
            };