合并了全部的代码

黄学彪

2019-11-04 c7698e163e43cea9e7f8ee45f8e3f91c9265cca4

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs

@@ -22,18 +22,11 @@
        /// <summary>

        /// 场景

        /// </summary>

        public Common.SceneRoomUI Scene

        public Common.SceneUI Scene

        {

            get

            {

                for (int i = 0; i < Common.SceneRoomUI.AllSceneRoomUIList.Count; i++)

                {

                    if (Common.SceneRoomUI.AllSceneRoomUIList[i].sceneUI.Id == SceneId)

                    {

                        return Common.SceneRoomUI.AllSceneRoomUIList[i];

                    }

                }

                return null;

                return Common.Room.CurrentRoom.GetSceneUIBySceneId(SceneId);

            }

        }



@@ -55,7 +48,7 @@
            var sceneTemp = this.Scene;

            if (sceneTemp != null && string.IsNullOrEmpty(i_SceneName) == false)

            {

                sceneTemp.sceneUI.Name = i_SceneName;

                sceneTemp.Name = i_SceneName;

            }

        }



@@ -66,7 +59,7 @@
        {

            //图标

            var btnIcon = frameTable.AddLeftIcon(81);

            btnIcon.UnSelectedImagePath = "Item/Scene.png";

            btnIcon.UnSelectedImagePath = "Scene/SceneIcon.png";



            //场景

            var btnSceneName = frameTable.AddLeftCaption(this.SceneName, 600, 60);

@@ -76,24 +69,24 @@
            frameTable.AddChidren(btnSceneName, ChidrenBindMode.BindEventOnly);



            //房间

            string roomName = string.Empty;

            var secneTemp = this.Scene;

            if (secneTemp != null)

            {

                roomName = secneTemp.room.Name;

            }

            else

            {

                //未分配区域

                roomName = Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);

            }



            var btnRoom = frameTable.AddLeftCaption(roomName, 600, 50, true);

            var btnRoom = frameTable.AddLeftCaption("", 600, 50, true);

            //这个坐标有点特殊

            btnRoom.Y = Application.GetRealHeight(72) + this.chidrenYaxis;

            btnRoom.TextSize = 12;

            btnRoom.TextColor = UserCenterColor.Current.TextGrayColor1;

            frameTable.AddChidren(btnRoom, ChidrenBindMode.BindEventOnly);



            var room = Common.Room.CurrentRoom.GetRoomBySceneId(this.SceneId);

            if (room != null)

            {

                btnRoom.Text = room.Name;

            }

            else

            {

                //未分配区域

                btnRoom.Text = Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);

            }



        }



        #endregion