合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

 ZigbeeApp/Shared/Phone/Device/Category/SelectScene.cs

@@ -66,7 +66,7 @@

            AddBodyView();

            RefreshBodyView();
            RefreshBodyView(Config.Instance.Home.CurrentFloorId);
        }


@@ -124,10 +124,10 @@
            var floors = new SelectFloor();
            AddChidren(floors);
            floors.Init(580, 184, Direction.Right);
            floors.FloorAction += (floorName) =>
            floors.FloorAction += (floorId) =>
            {
                floorBtn.Text = floorName;
                RefreshBodyView();
                floorBtn.Text = Config.Instance.Home.GetFloorNameById(floorId);
                RefreshBodyView(floorId);
            };
        }
        /// <summary>
@@ -161,15 +161,15 @@
        /// <summary>
        /// RefreshBodyView
        /// </summary>
        private void RefreshBodyView()
        private void RefreshBodyView(string floorId)
        {
            AddRoomView();
            AddRoomView(floorId);
        }

        /// <summary>
        /// AddRoomView
        /// </summary>
        private void AddRoomView()
        private void AddRoomView(string floorId)
        {
            var roomFL = new HorizontalScrolViewLayout()
            {
@@ -190,7 +190,7 @@
            bodyFrameLayout.AddChidren(functionSceneBodyView);

            Button curBtn = new Button();
            foreach (var room in Common.Room.CurrentRoom.GetRoomsByCurrentFloorIdAppendLoveRoom())
            foreach (var room in Common.Room.CurrentRoom.GetRoomsByFloorIdAppendLoveRoom(floorId))
            {
                var row = new FrameLayout()
                {