From cc0d80c7d86c6d0167269b3408c4b30c24ce84e9 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 23 三月 2020 16:55:37 +0800
Subject: [PATCH] ？？？？？？？
---
ZigbeeApp/Shared/Phone/Device/Room/AddRoomSelectPicByLocal.cs | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/AddRoomSelectPicByLocal.cs b/ZigbeeApp/Shared/Phone/Device/Room/AddRoomSelectPicByLocal.cs
index c0d9db5..de1c241 100755
--- a/ZigbeeApp/Shared/Phone/Device/Room/AddRoomSelectPicByLocal.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/AddRoomSelectPicByLocal.cs
@@ -33,9 +33,10 @@
};
topView.AddChidren(title);
- var back = new Device.CommonForm.BackButton() { };鈥� topView.AddChidren(back);
+ var back = new UserCenter.BackViewControl();鈥� topView.AddChidren(back);
+ back.InitControl();
- back.MouseUpEventHandler += (sender, e) =>
+ back.ButtonClickEvent += (sender, e) =>
{
this.RemoveFromParent();
};
@@ -56,18 +57,19 @@
{
var itemView = new FrameLayout()
{
- Height = Application.GetRealHeight(311 + CommonPage.XLeft)
+ Height = Application.GetRealHeight(311 + 58)
};
midFl.AddChidren(itemView);
for (int i = 0; i < 2; i++)
{
- var icon = new Button()
+ var icon = new ImageView()
{
- X = Application.GetRealWidth(CommonPage.XLeft + i * (467 + 32)),
- Width = Application.GetMinRealAverage(467),
- Height = Application.GetMinRealAverage(311),
- Gravity = Gravity.CenterVertical,
- UnSelectedImagePath = $"RoomIcon/{k}.JPG",
+ X = Application.GetRealWidth(58 + i * (467 + 32)),
+ Y = Application.GetRealHeight(58),
+ Width = Application.GetRealWidth(467),
+ Height = Application.GetRealHeight(311),
+ ImagePath = $"RoomIcon/{k}.JPG",
+ Radius = (uint)Application.GetRealHeight(17)
};
itemView.AddChidren(icon);
icon.SetViewShadow(true);
@@ -75,7 +77,7 @@
EventHandler<MouseEventArgs> selectIcon = (sender, e) =>
{
- action?.Invoke(icon.UnSelectedImagePath);
+ action?.Invoke(icon.ImagePath);
action = null;
this.RemoveFromParent();
};
--
Gitblit v1.8.0