From 3dcbd186c42c598c0c08d1cd37034cf2baa09e54 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 15:47:51 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/Device/CommonForm/RoomMainView.cs | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomMainView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomMainView.cs
index 9d32604..8096d1c 100755
--- 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
{
@@ -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
{
@@ -74,6 +82,10 @@
IsBold=true
};
AddChidren(RoomNameButton);
+
+ ClickBtn = new Button { };
+ AddChidren(ClickBtn);
+
}
/// <summary>
@@ -93,7 +105,6 @@
{
Icon.ImagePath = imagePath;
}
-
}
}
--
Gitblit v1.8.0