blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
WJC
2020-03-17 f6e34a69f1d1e0b0b3a6252fe20acddca7fe56e5 
 ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs

old mode 100644
new mode 100755

@@ -70,7 +70,8 @@


            #endregion




            ///没有房间直接返回去；


            if (Common.Room.Lists.Count == 0)


            var listAllRoom = UserCenter.HdlRoomLogic.Current.GetAllListRooms();


            if (listAllRoom.Count == 0)


            {


                return;


            }


@@ -284,7 +285,7 @@


                    roomTextButton.IsSelected = false;


                    roomTextButton = roomnameBtn;


                    roomnameBtn.IsSelected = true;


                    SceneView(room.SceneUIList);


                    SceneView(room.ListSceneId);




                }




@@ -302,7 +303,7 @@


                    roomTextButton.IsSelected = false;


                    roomTextButton = roomnameBtn;


                    roomnameBtn.IsSelected = true;


                    SceneView(room.SceneUIList);


                    SceneView(room.ListSceneId);


                };


                roomnameBtn.MouseUpEventHandler += roomclick;


                roombjBtn.MouseUpEventHandler += roomclick;


@@ -313,11 +314,16 @@


        /// 显示所有的场景的方法


        /// </summary>


        /// <param name="scenelist"></param>


        void SceneView(List<SceneUI>scenelist)


        void SceneView(List<int>scenelist)


        {


            middle.RemoveAll();


            foreach (var scene in scenelist)


            foreach (var sceneId in scenelist)


            {


                var scene = UserCenter.HdlSceneLogic.Current.GetSceneUIBySceneId(sceneId);


                if (scene == null)



                {



                    continue;



                }


                var sceneFramelayout = new FrameLayout


                {


                    Height = Application.GetRealHeight(160),