From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs
index affc396..4c69fe1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs
@@ -111,11 +111,17 @@
{
if (e.Focus == false)
{
- btnLineTemp.BackgroundColor = UserCenterColor.Current.ButtomLine;
+ if (btnLineTemp != null)
+ {
+ btnLineTemp.BackgroundColor = UserCenterColor.Current.ButtomLine;
+ }
}
else
{
- btnLineTemp.BackgroundColor = UserCenterColor.Current.TextFrameSelectColor;
+ if (btnLineTemp != null)
+ {
+ btnLineTemp.BackgroundColor = UserCenterColor.Current.TextFrameSelectColor;
+ }
}
}
@@ -135,7 +141,7 @@
return;
}
//Y杞撮噸缃�
- this.Y = UserCenterLogic.GetControlChidrenYaxis(this.Parent.Height, this.Height, alignment, Space);
+ this.Y = HdlControlLogic.Current.GetControlChidrenYaxis(this.Parent.Height, this.Height, alignment, Space);
}
#endregion
}
--
Gitblit v1.8.0