From 737c036a39176fd2085ce82b7c60391da8cb508c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 31 十二月 2019 19:17:47 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs
index fa5e841..f2d4623 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs
@@ -23,6 +23,10 @@
/// 鍔熻兘
/// </summary>
public NormalViewControl btnFunction = null;
+ /// <summary>
+ /// 浣忓畢鍚嶇О
+ /// </summary>
+ public NormalViewControl btnHouse = null;
#endregion
@@ -33,6 +37,8 @@
/// </summary>
public virtual void ShowFrom()
{
+ Phone.Device.Room.RoomManagement.Instance.CanClick = false;
+
UserView.UserPage.Instance.AddChidren(this);
this.BackgroundColor = Common.ZigbeeColor.Current.GXCGrayBackgroundColor;
@@ -49,7 +55,7 @@
btnMsg.UnSelectedImagePath = "Item/Message.png";
this.AddChidren(btnMsg);
//浣忓畢鍚嶅瓧
- var btnHouse = new NormalViewControl(300, 95, true);
+ this.btnHouse = new NormalViewControl(300, 95, true);
btnHouse.TextSize = 24;
btnHouse.X = ControlCommonResourse.XXLeft;
btnHouse.Y = Application.GetRealHeight(161);
@@ -88,6 +94,8 @@
roomPageView.AddChidren(roomView3);
roomView3.Init(room3);
+ roomPageView.PageIndex = 1;
+
//鍦烘櫙鍜屽姛鑳界殑鎺т欢
this.contrSwitch = new FrameLayout();
contrSwitch.Y = roomPageView.Bottom + Application.GetRealHeight(52);
--
Gitblit v1.8.0