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/FrameLayoutControls/FrameRowControl.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Common/Controls/FrameLayoutControls/FrameRowControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
similarity index 93%
rename from ZigbeeApp/Shared/Phone/Common/Controls/FrameLayoutControls/FrameRowControl.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
index 94bbdba..07f6d9e 100644
--- a/ZigbeeApp/Shared/Phone/Common/Controls/FrameLayoutControls/FrameRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
@@ -1,7 +1,7 @@
锘縰sing System;
using System.Collections.Generic;
-namespace Shared.Phone
+namespace Shared.Phone.UserCenter
{
/// <summary>
/// 鍋氭垚涓�涓猂owLayout鍨嬬殑FrameLayout
@@ -45,7 +45,7 @@
/// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(銆愬垪琛ㄦ帶浠剁殑rowSpace/2銆戝嵆鍙�,涓嶆噦榛樿涓�0鍗冲彲)</param>
public FrameRowControl(int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)
{
- this.Height = HdlControlResourse.ListViewRowHeight;
+ this.Height = ControlCommonResourse.ListViewRowHeight;
this.Width = Application.CurrentWidth;
}
@@ -64,16 +64,16 @@
//宸茬粡娣诲姞浜嗗簳绾�
return btnBottomLine;
}
- int lineWidth = this.Width - HdlControlResourse.XXLeft * 2 - LeftOffset - RightOffset;
- int XX = HdlControlResourse.XXLeft + LeftOffset;
+ int lineWidth = this.Width - ControlCommonResourse.XXLeft * 2 - LeftOffset - RightOffset;
+ int XX = ControlCommonResourse.XXLeft + LeftOffset;
if (leftIconSize > 0)
{
lineWidth = lineWidth - leftIconSize - Application.GetRealWidth(35);
XX = XX + leftIconSize + Application.GetRealWidth(35);
}
- this.btnBottomLine = new NormalViewControl(lineWidth, HdlControlResourse.BottomLineHeight, false);
+ this.btnBottomLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
btnBottomLine.X = XX;
- btnBottomLine.Y = this.Height - HdlControlResourse.BottomLineHeight;
+ btnBottomLine.Y = this.Height - ControlCommonResourse.BottomLineHeight;
btnBottomLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
base.AddChidren(btnBottomLine);
@@ -117,7 +117,7 @@
/// <returns></returns>
public NormalViewControl AddLeftCaption(string i_caption, int i_width, int i_height, bool real = true)
{
- int XX = HdlControlResourse.XXLeft + LeftOffset;
+ int XX = ControlCommonResourse.XXLeft + LeftOffset;
if (this.leftIconSize > 0)
{
XX += this.leftIconSize + Application.GetRealWidth(35);
@@ -147,7 +147,7 @@
{
i_width = Application.GetRealWidth(i_width);
}
- int XX = HdlControlResourse.XXLeft + LeftOffset;
+ int XX = ControlCommonResourse.XXLeft + LeftOffset;
if (this.leftIconSize > 0)
{
XX += this.leftIconSize + Application.GetRealWidth(35);
@@ -178,7 +178,7 @@
public IconViewControl AddLeftIcon(int i_Iconsize = 81, string i_IconPath = null)
{
var btnIcon = new IconViewControl(i_Iconsize);
- btnIcon.X = HdlControlResourse.XXLeft + LeftOffset;
+ btnIcon.X = ControlCommonResourse.XXLeft + LeftOffset;
btnIcon.Gravity = Gravity.CenterVertical;
if (i_IconPath != null)
{
@@ -205,7 +205,7 @@
{
var btnRight = new IconViewControl(58);
btnRight.Gravity = Gravity.CenterVertical;
- btnRight.X =this.Width - btnRight.IconSize - HdlControlResourse.XXLeft + RightOffset;
+ btnRight.X =this.Width - btnRight.IconSize - ControlCommonResourse.XXLeft + RightOffset;
btnRight.UnSelectedImagePath = "Item/RightNext.png";
this.AddChidren(btnRight, ChidrenBindMode.BindEvent);
@@ -308,7 +308,7 @@
i_height = Application.GetRealHeight(i_height);
}
var btnContr = new NormalViewControl(i_width, i_height, false);
- btnContr.X = this.Width - HdlControlResourse.XXLeft - i_width - rightIconSize + RightOffset;
+ btnContr.X = this.Width - ControlCommonResourse.XXLeft - i_width - rightIconSize + RightOffset;
btnContr.Height = i_height;
btnContr.TextAlignment = TextAlignment.CenterRight;
btnContr.TextColor = UserCenterColor.Current.TextGrayColor1;
--
Gitblit v1.8.0