From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2

---
 ZigbeeApp/Shared/Phone/Common/Controls/BaseCommonControl/Base/ButtonBase.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs b/ZigbeeApp/Shared/Phone/Common/Controls/BaseCommonControl/Base/ButtonBase.cs
similarity index 98%
rename from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
rename to ZigbeeApp/Shared/Phone/Common/Controls/BaseCommonControl/Base/ButtonBase.cs
index 3e07c81..2caed23 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
+++ b/ZigbeeApp/Shared/Phone/Common/Controls/BaseCommonControl/Base/ButtonBase.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Shared.Phone.UserCenter
+namespace Shared.Phone
 {
     /// <summary>
     /// Botton鐨勬渶鍒濆師鍨�(涓嶅缓璁慨鏀瑰拰鐩存帴浣跨敤):鏍囧噯瀛椾綋鍜岄鑹诧紝鏂囧瓧鍚戝乏闈犻綈,14鍙峰瓧
@@ -131,7 +131,7 @@
                 i_Width = Application.GetRealWidth(i_Width);
             }
 
-            this.Height = ControlCommonResourse.NormalControlHeight;
+            this.Height = HdlControlResourse.NormalControlHeight;
             this.Width = i_Width;
         }
 
@@ -188,7 +188,7 @@
                 return;
             }
             //2020.05.14杩藉姞IsFormAdding:鐣岄潰杩樺湪鍔犺浇涓�,涓嶈兘鍐嶇偣鍑�
-            if (CanClick == true && ControlCommonResourse.IsFormAdding == false)
+            if (CanClick == true && HdlControlResourse.IsFormAdding == false)
             {
                 //Log鍑哄姏
                 this.WriteLog(0);

--
Gitblit v1.8.0