From 9cfd22c2c308adc7a7ce38cf96be04a70048de01 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 20 七月 2020 15:57:57 +0800
Subject: [PATCH] 2020-07-20-1
---
ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs | 82 ++++++++++++++++++++---------------------
1 files changed, 40 insertions(+), 42 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 3b5ffb5..716b1ec
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs
@@ -21,14 +21,14 @@
public HorizontalScrolViewLayout roomhorizontalScrol = new HorizontalScrolViewLayout
{
Width = Application.GetRealWidth(1080 - 58),
- Height = Application.GetRealHeight(200),
+ Height = Application.GetRealHeight(204),
Y = Application.GetRealHeight(184),
X = Application.GetRealWidth(58),
};
public VerticalScrolViewLayout middle = new VerticalScrolViewLayout
{
Width = Application.GetRealWidth(1080),
- Height = Application.GetRealHeight(Method.H - 260 - 200 - 184),
+ Height = Application.GetRealHeight(Method.H - 260 - 204 - 184),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
@@ -228,49 +228,33 @@
for (int i = 0; i < RoomList.Count; i++)
{
var room = RoomList[i];
- var fra = new FrameLayout
- {
- Height = Application.GetRealHeight(200),
- Width = Application.GetRealWidth(255),
- };
- roomhorizontalScrol.AddChidren(fra);
- var roombjBtn = new Button
- {
- Height = Application.GetRealHeight(158),
- Width = Application.GetRealWidth(255),
- UnSelectedImagePath = "ZigeeLogic/iconBackgroundColor.png",
- SelectedImagePath = "ZigeeLogic/iconSelectedBackgroundColor.png",
- Y = Application.GetRealHeight(21),
- };
- fra.AddChidren(roombjBtn);
-
- var roomnameBtn = new Button
- {
-
- Height = Application.GetRealHeight(152 - 26 - 20),
- Width = Application.GetRealWidth(255 - 20 - 50),
- Text = room.Name,
- TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
- SelectedTextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
- Y = Application.GetRealHeight(21 + 13 + 10),
- X = Application.GetRealWidth(10 + 25),
-
- };
- fra.AddChidren(roomnameBtn);
+ LogicView.RoomClickView roomClickView = new LogicView.RoomClickView();
+ roomClickView.Show(roomhorizontalScrol);
+ roomClickView.roomnameBtn.Text =room.Name;
if (i == 0)
{
- roombjButton.IsSelected = false;
- roombjButton = roombjBtn;
- roombjBtn.IsSelected = true;
+ roombjButton.IsSelected = false;
+ roomClickView.roombjBtn.Height = Application.GetRealHeight(135);
+ roomClickView.roombjBtn.Width = Application.GetRealWidth(245);
+ roomClickView.roombjBtn.Y = Application.GetRealHeight(40);
+ roomClickView.roombjBtn.X = Application.GetRealWidth(0);
+ roombjButton = roomClickView.roombjBtn;
+ roomClickView.roombjBtn.IsSelected = true;
roomTextButton.IsSelected = false;
- roomTextButton = roomnameBtn;
- roomnameBtn.IsSelected = true;
+ roomClickView.roomnameBtn.Width = Application.GetRealWidth(245 - 60 * 2);
+ roomClickView.roomnameBtn.X = Application.GetRealWidth(60);
+ roomTextButton = roomClickView.roomnameBtn;
+ roomClickView.roomnameBtn.IsSelected = true;
+
+ roomClickView.roombjBtn.IsSelected = true;
+ roomClickView.roomnameBtn.IsSelected = true;
SceneView(room.ListSceneId);
}
+
EventHandler<MouseEventArgs> roomclick = (sender, e) =>
{
@@ -279,17 +263,31 @@
clickbutton = null;
clickbutton = new Button();
+ roombjButton.Height = Application.GetRealHeight(72);
+ roombjButton.Width = Application.GetRealWidth(170);
+ roombjButton.Y = Application.GetRealHeight(60);
+ roombjButton.X = Application.GetRealWidth(26);
roombjButton.IsSelected = false;
- roombjButton = roombjBtn;
- roombjBtn.IsSelected = true;
+ roomClickView.roombjBtn.Height = Application.GetRealHeight(135);
+ roomClickView.roombjBtn.Width = Application.GetRealWidth(245);
+ roomClickView.roombjBtn.Y = Application.GetRealHeight(40);
+ roomClickView.roombjBtn.X = Application.GetRealWidth(0);
+ roombjButton = roomClickView.roombjBtn;
+ roomClickView.roombjBtn.IsSelected = true;
+
+ roomTextButton.Width = Application.GetRealWidth(125);
+ roomTextButton.X = Application.GetRealWidth(26 + 22);
roomTextButton.IsSelected = false;
- roomTextButton = roomnameBtn;
- roomnameBtn.IsSelected = true;
+ roomClickView.roomnameBtn.Width = Application.GetRealWidth(245 - 60 * 2);
+ roomClickView.roomnameBtn.X = Application.GetRealWidth(60);
+ roomTextButton = roomClickView.roomnameBtn;
+ roomClickView.roomnameBtn.IsSelected = true;
+
SceneView(room.ListSceneId);
};
- roomnameBtn.MouseUpEventHandler += roomclick;
- roombjBtn.MouseUpEventHandler += roomclick;
+ roomClickView.roomnameBtn.MouseUpEventHandler += roomclick;
+ roomClickView.roombjBtn.MouseUpEventHandler += roomclick;
}
}
--
Gitblit v1.8.0