From 34e965100d635346e2d4cd6e6013bdaed66b3004 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:52:13 +0800
Subject: [PATCH] 2019.1.2-3
---
ZigbeeApp/Shared/Phone/Device/CommonForm/RoomMainView.cs | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomMainView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomMainView.cs
old mode 100755
new mode 100644
index a39d1ff..8096d1c
--- 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,14 @@
/// CardBG
/// </summary>
private Button CardBG;
-
+ /// <summary>
+ /// ClickBtn
+ /// </summary>
+ public Button ClickBtn;
+ /// <summary>
+ /// 鏄惁鍙互瑙﹀彂鐐瑰嚮浜嬩欢
+ /// </summary>
+ public bool CanClick = true;
/// <summary>
/// RoomMainView
/// </summary>
@@ -34,7 +42,7 @@
/// <summary>
/// init
/// </summary>
- public void Init()
+ public void Init(FrameLayout frameLayout, Common.Room room)
{
CardBG = new Button
{
@@ -45,7 +53,7 @@
};
AddChidren(CardBG);
- Icon = new Button
+ Icon = new ImageView
{
X = Application.GetMinRealAverage(14),
Width = Application.GetMinRealAverage(467),
@@ -69,9 +77,15 @@
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);
+
}
/// <summary>
@@ -89,9 +103,8 @@
/// <param name="imagePath"></param>
public void SetRoomIcon(string imagePath)
{
- Icon.UnSelectedImagePath = imagePath;
+ Icon.ImagePath = imagePath;
}
-
}
}
--
Gitblit v1.8.0