From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Common/Controls/BaseCommonControl/Base/ButtonBase.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
similarity index 98%
rename from ZigbeeApp/Shared/Phone/Common/Controls/BaseCommonControl/Base/ButtonBase.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
index 2caed23..3e07c81 100644
--- a/ZigbeeApp/Shared/Phone/Common/Controls/BaseCommonControl/Base/ButtonBase.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;
-namespace Shared.Phone
+namespace Shared.Phone.UserCenter
{
/// <summary>
/// Botton鐨勬渶鍒濆師鍨�(涓嶅缓璁慨鏀瑰拰鐩存帴浣跨敤):鏍囧噯瀛椾綋鍜岄鑹诧紝鏂囧瓧鍚戝乏闈犻綈,14鍙峰瓧
@@ -131,7 +131,7 @@
i_Width = Application.GetRealWidth(i_Width);
}
- this.Height = HdlControlResourse.NormalControlHeight;
+ this.Height = ControlCommonResourse.NormalControlHeight;
this.Width = i_Width;
}
@@ -188,7 +188,7 @@
return;
}
//2020.05.14杩藉姞IsFormAdding:鐣岄潰杩樺湪鍔犺浇涓�,涓嶈兘鍐嶇偣鍑�
- if (CanClick == true && HdlControlResourse.IsFormAdding == false)
+ if (CanClick == true && ControlCommonResourse.IsFormAdding == false)
{
//Log鍑哄姏
this.WriteLog(0);
--
Gitblit v1.8.0