请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

 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);

            }

        }



@@ -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;