优化代码，更改门锁需求接口

xm

2020-04-29 07466c19110693e3e439a7d7c8ad0bc21d9b3287

 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs

old mode 100644
new mode 100755
@@ -183,8 +183,8 @@
            //获取楼层
            dicFloor = HdlRoomLogic.Current.GetFloorSortList();
            currentKey.currentSelectFloorId = BindInfo.GetCurrentSelectFloorId();
            btnFloorText.Text = BindInfo.GetCurrentSelectFloorIdName();



            btnFloorText.Text = BindInfo.GetCurrentSelectFloorIdName();

            var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
            if (Common.Config.Instance.Home.FloorDics.Count == 0)
            {
@@ -615,7 +615,7 @@
                    Y = Application.GetMinRealAverage(46),
                    Width = Application.GetMinReal(81),
                    Height = Application.GetMinReal(81),
                    UnSelectedImagePath = "Scene/SceneIcon.png",// scene.IconPath,

                    UnSelectedImagePath = "Scene/SceneIcon.png",// scene.IconPath,
                };
                rowLayout.AddChidren(devicePic);

@@ -868,9 +868,9 @@
                        btnMethodText.IsSelected = true;
                        oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                        oldbuttonText.IsBold = true;
                    }



                    //获取楼层对应的房间

                    }

                    //获取楼层对应的房间
                    var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
                    foreach (var room in listAllRoom)
                    {
@@ -930,8 +930,8 @@
        /// <returns></returns>
        List<SceneUI> GetALlDispalyRoomSceneList()
        {
            currentKeyAllRoomSceneList.Clear();

            // 获取所有房间 
            currentKeyAllRoomSceneList.Clear();
            // 获取所有房间 
            var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
            foreach (var room in listAllRoom)
            {
@@ -947,7 +947,7 @@
                }

                foreach (var sceneId in room.ListSceneId)
                {

                {
                    var scene = HdlSceneLogic.Current.GetSceneUIBySceneId(sceneId);
                    if (scene == null)
                    {
@@ -968,10 +968,10 @@
            var tempSceneUIList = new List<SceneUI>();
            foreach (var sceneId in curRoom.ListSceneId)
            {
                var scene = HdlSceneLogic.Current.GetSceneUIBySceneId(sceneId);

                if (scene == null)

                {

                    continue;

                var scene = HdlSceneLogic.Current.GetSceneUIBySceneId(sceneId);
                if (scene == null)
                {
                    continue;
                }
                var gwSc = gwCurScenesList.Find(obj => (obj.ScenesId == sceneId));
                if (gwSc != null)