From ff3cfcf62632bf43e51a6b6098c203bf0f5cddbc Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 24 十二月 2019 19:53:29 +0800
Subject: [PATCH] 2019.12.24
---
ZigbeeApp/Shared/Phone/Device/CommonForm/RoomMainView.cs | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomMainView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomMainView.cs
index a39d1ff..9599d1d 100644
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomMainView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomMainView.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using Shared.Common;
+using Shared.Phone.UserView;
namespace Shared.Phone.Device.CommonForm
{
@@ -8,7 +9,7 @@
/// <summary>
/// SceneIcon
/// </summary>
- public Button Icon;
+ public ImageView Icon;
/// <summary>
/// RoomNameButton
/// </summary>
@@ -17,7 +18,10 @@
/// CardBG
/// </summary>
private Button CardBG;
-
+ /// <summary>
+ /// ClickBtn
+ /// </summary>
+ public Button ClickBtn;
/// <summary>
/// RoomMainView
/// </summary>
@@ -34,7 +38,7 @@
/// <summary>
/// init
/// </summary>
- public void Init()
+ public void Init(FrameLayout frameLayout, Common.Room room)
{
CardBG = new Button
{
@@ -45,7 +49,7 @@
};
AddChidren(CardBG);
- Icon = new Button
+ Icon = new ImageView
{
X = Application.GetMinRealAverage(14),
Width = Application.GetMinRealAverage(467),
@@ -69,9 +73,21 @@
X = Application.GetMinRealAverage(14),
Width = Application.GetMinRealAverage(141),
Height = Application.GetMinRealAverage(84),
- TextColor = ZigbeeColor.Current.GXCTextWhiteColor
+ TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
+ TextSize=14,
+ IsBold=true
};
AddChidren(RoomNameButton);
+
+ ClickBtn = new Button { };
+ AddChidren(ClickBtn);
+ ClickBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ CommonPage.Instance.CloseLeftMenu();
+ Common.Room.CurrentRoom = room;
+ Config.Instance.Home.CurrentFloorId = room.FloorId;
+ UserPage.Instance.Fresh();
+ };
}
/// <summary>
@@ -89,9 +105,8 @@
/// <param name="imagePath"></param>
public void SetRoomIcon(string imagePath)
{
- Icon.UnSelectedImagePath = imagePath;
+ Icon.ImagePath = imagePath;
}
-
}
}
--
Gitblit v1.8.0