From 1f6f024bddf48dea1c17c54ade1535a10ef7b39b Mon Sep 17 00:00:00 2001 From: WJC <wjc@hdlchina.com.cn> Date: 星期一, 23 三月 2020 17:16:37 +0800 Subject: [PATCH] 2020-03-23-2 --- ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs | 51 ++++++++++++++++++++------------------------------- 1 files changed, 20 insertions(+), 31 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs old mode 100755 new mode 100644 index 213e42d..c911959 --- a/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs +++ b/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(); @@ -79,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) { @@ -183,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, }; @@ -331,11 +314,10 @@ }; middle.AddChidren(sceneFramelayout); - 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", @@ -349,8 +331,7 @@ Width = Application.GetRealWidth(850), Height = Application.GetRealHeight(130), X = Application.GetRealWidth(176 + 10), - LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor, - + LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor, }; sceneFramelayout.AddChidren(sceneRow); @@ -366,15 +347,23 @@ 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, Gravity = Gravity.CenterVertical, }; sceneRow.AddChidren(selectedBtn); - + var lineBtn = new Button + { + Y = sceneFramelayout.Height - 1, + Width = Application.GetRealWidth(850), + Height = 1, + X = Application.GetRealWidth(176 + 10), + BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor, + }; + sceneFramelayout.AddChidren(lineBtn); EventHandler<MouseEventArgs> sceneclick = (sender, e) => { tempScene = scene; -- Gitblit v1.8.0