From 26cee91cc3332e09db5cadb9faf76612b1b0c081 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 11 五月 2020 11:22:34 +0800
Subject: [PATCH] 2020-05-11-1
---
ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs | 59 ++++++++++++++++++++++++-----------------------------------
1 files changed, 24 insertions(+), 35 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs
index 213e42d..3b5ffb5 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs
@@ -28,11 +28,7 @@
public VerticalScrolViewLayout middle = new VerticalScrolViewLayout
{
Width = Application.GetRealWidth(1080),
- Height = Application.GetRealHeight(1920 - 260 - 200 - 184),
- BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
- };
- public FrameLayout saveframeLayout = new FrameLayout {
- Height = Application.GetRealHeight(260),
+ Height = Application.GetRealHeight(Method.H - 260 - 200 - 184),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
@@ -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,
};
@@ -320,9 +303,9 @@
foreach (var sceneId in scenelist)
{
var scene = UserCenter.HdlSceneLogic.Current.GetSceneUIBySceneId(sceneId);
- if (scene == null)
- {
- continue;
+ if (scene == null)
+ {
+ continue;
}
var sceneFramelayout = new FrameLayout
{
@@ -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