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/GuideRoomForm.cs | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideRoomForm.cs
similarity index 94%
rename from ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideMainForm.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideRoomForm.cs
index 797bbf9..cd7275a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideRoomForm.cs
@@ -5,9 +5,9 @@
namespace Shared.Phone.UserCenter.Guide
{
/// <summary>
- /// 寮曞鐣岄潰鐨勪富鐣岄潰
+ /// 鎴块棿寮曞鐣岄潰
/// </summary>
- public class GuideMainForm : GuideCommonForm
+ public class GuideRoomForm : GuideCommonForm
{
#region 鈻� 鍙橀噺澹版槑___________________________
@@ -21,8 +21,6 @@
public override void ShowFrom()
{
base.ShowFrom();
-
- Phone.Device.Room.RoomManagement.Instance.CanClick = false;
var frameTop = new FrameLayout();
frameTop.Height = Application.GetRealHeight(279);
--
Gitblit v1.8.0