？？？？？？？

黄学彪

2020-03-23 cc0d80c7d86c6d0167269b3408c4b30c24ce84e9

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

@@ -29,6 +29,10 @@
        /// </summary>
        private Button floorBtn;
        /// <summary>
        /// 当前楼层id
        /// </summary>
        private string curFloorId;
        /// <summary>
        /// 选择楼层
        /// </summary>
        private Button selectFloorBtn;
@@ -128,9 +132,12 @@
        {
            var floors = new SelectFloor();
            AddChidren(floors);
            floors.changeFloor = false;
            floors.CurFloorId = curFloorId;
            floors.Init(580, 184, Direction.Right);
            floors.FloorAction += (floorId) =>
            {
                curFloorId = floorId;
                floorBtn.Text = Config.Instance.Home.GetFloorNameById(floorId);
                RefreshBodyView(floorId);
            };
@@ -196,7 +203,7 @@

            RoomButton curBtn = new RoomButton(0,0);

            foreach (var room in Common.Room.CurrentRoom.GetRoomsByFloorIdAppendLoveRoom(floorId))
            foreach (var room in UserCenter.HdlRoomLogic.Current.GetRoomsByFloorIdAppendLoveRoom(floorId))
            {
                var row = new FrameLayout()
                {
@@ -242,7 +249,7 @@
        public void RefreshScene(Common.Room room)
        {
            functionSceneBodyView.RemoveAll();
            var sceneList = room.SceneUIList;
            var sceneList = room.ListSceneId;
            if (sceneList.Count == 0)
            {
                ShowNoSceneTip();
@@ -267,8 +274,8 @@

                for (int i = 0; i < sceneList.Count; i++)
                {
                    var scene = sceneList[i];
                    if (currentSceneUI?.Id == scene.Id)
                    var scene = UserCenter.HdlSceneLogic.Current.GetSceneUIBySceneId(sceneList[i]);
                    if (scene == null || currentSceneUI?.Id == scene.Id)
                    {
                        continue;
                    }