2020-03-20-1

WJC

2020-03-20 133ca903ae9c4df6ff037f5223d5abcd0df926f4

 ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs

@@ -31,10 +31,6 @@
            Height = Application.GetRealHeight(1920 - 260 - 200 - 184),
            BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
        };
        public FrameLayout saveframeLayout = new FrameLayout {
            Height = Application.GetRealHeight(260),
            BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
        };

        Button roombjButton = new Button();
        Button roomTextButton = new Button();
@@ -70,7 +66,8 @@
            #endregion

            ///没有房间直接返回去；
            if (Common.Room.Lists.Count == 0)
            var listAllRoom = UserCenter.HdlRoomLogic.Current.GetAllListRooms();
            if (listAllRoom.Count == 0)
            {
                return;
            }
@@ -78,23 +75,10 @@
            this.AddChidren(roomhorizontalScrol);
            middle.Y = roomhorizontalScrol.Bottom;
            this.AddChidren(middle);
            saveframeLayout.Y = middle.Bottom;
            this.AddChidren(saveframeLayout);

            var btnsave = new Button
            {
                X = Application.GetRealWidth(85),
                Height = Application.GetRealHeight(130),
                Width = Application.GetRealWidth(910),
                Radius = (uint)Application.GetRealHeight(60),
                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                TextID = MyInternationalizationString.Save,
                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                TextSize = 16,
            };
            saveframeLayout.AddChidren(btnsave);

            btnsave.MouseUpEventHandler += (sender2, e2) =>
            LogicView.SaveView saveView = new LogicView.SaveView();
            saveView.frameLayout.Y = middle.Bottom;
            this.AddChidren(saveView.Show());
            saveView.clickviewBtn.MouseUpEventHandler += (sender2, e2) =>
            {
                if (clickTag == "no" || tempScene == null)
                {
@@ -182,8 +166,8 @@

                    var btnfoolricon = new Button
                    {
                        Width = Application.GetRealWidth(81),
                        Height = Application.GetRealHeight(81),
                        Width = Application.GetMinRealAverage(81),
                        Height = Application.GetMinRealAverage(81),
                        UnSelectedImagePath = "Floor/Floor.png",
                        Gravity = Gravity.CenterVertical,
                    };
@@ -284,7 +268,7 @@
                    roomTextButton.IsSelected = false;
                    roomTextButton = roomnameBtn;
                    roomnameBtn.IsSelected = true;
                    SceneView(room.SceneUIList);
                    SceneView(room.ListSceneId);

                }

@@ -302,7 +286,7 @@
                    roomTextButton.IsSelected = false;
                    roomTextButton = roomnameBtn;
                    roomnameBtn.IsSelected = true;
                    SceneView(room.SceneUIList);
                    SceneView(room.ListSceneId);
                };
                roomnameBtn.MouseUpEventHandler += roomclick;
                roombjBtn.MouseUpEventHandler += roomclick;
@@ -313,11 +297,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),
@@ -328,8 +317,8 @@

                var sceneIconBtn = new Button
                {
                    Width = Application.GetRealWidth(81),
                    Height = Application.GetRealHeight(81),
                    Width = Application.GetMinRealAverage(81),
                    Height = Application.GetMinRealAverage(81),
                    X = Application.GetRealWidth(58),
                    Y = Application.GetRealHeight(55),
                    UnSelectedImagePath = "ZigeeLogic/scene.png",
@@ -360,8 +349,8 @@

                var selectedBtn = new Button
                {
                    Width = Application.GetRealWidth(58),
                    Height = Application.GetRealHeight(58),
                    Width = Application.GetMinRealAverage(60),
                    Height = Application.GetMinRealAverage(60),
                    X = Application.GetRealWidth(789),
                    UnSelectedImagePath = "ZigeeLogic/selected.png",
                    Visible = false,