2020-05-18-2

陈嘉乐

2020-05-18 5da99fed2eb0d08b6338064da5f998891252c7b8

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

@@ -26,7 +26,7 @@
        {

            get

            {

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

                return HdlSceneLogic.Current.GetSceneUIBySceneId(SceneId);

            }

        }



@@ -39,7 +39,7 @@
        /// </summary>

        /// <param name="i_SceneId">场景ID</param>

        /// <param name="i_SceneName">场景名</param>

        /// <param name="i_chidrenYaxis">子控件Y轴偏移量(真实值,有些界面需要这种特殊操作)</param>

        /// <param name="i_chidrenYaxis">子控件Y轴偏移量(【列表控件的rowSpace/2】即可,不懂默认为0即可)</param>

        public SceneRoomControl(int i_SceneId, string i_SceneName, int i_chidrenYaxis) : base(i_chidrenYaxis)

        {

            this.SceneId = i_SceneId;

@@ -76,7 +76,7 @@
            btnRoom.TextColor = UserCenterColor.Current.TextGrayColor1;

            frameTable.AddChidren(btnRoom, ChidrenBindMode.BindEventOnly);



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

            var room = HdlRoomLogic.Current.GetRoomBySceneId(this.SceneId);

            if (room != null)

            {

                btnRoom.Text = room.Name;