From f14dcfd967404e197e7ec995ca8d6f2b090d3b7d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 11 九月 2020 09:16:59 +0800
Subject: [PATCH] 优化多功能面板：绑定温湿度传感器目标，和设备列表回路显示。优化数据矫正功能温湿度度不设置的情况。优化门锁时间设置最后一天和最后最后一个月的时间显示等 细节
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MostRightIconControl.cs | 68 +++++++++++++++++++--------------
1 files changed, 39 insertions(+), 29 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MostRightIconControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MostRightIconControl.cs
index f14a19a..a4de505 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MostRightIconControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MostRightIconControl.cs
@@ -4,18 +4,18 @@
namespace Shared.Phone.UserCenter
{
- /// <summary>
- /// 鍋氭垚鏀惧湪鐢婚潰鍙宠竟鐨勭殑鍥炬爣鎺т欢(娉ㄦ剰,瀹冧笉鑳界敤鏉ュ仛銆愬悜鍙炽�戠殑鍥炬爣)
- /// </summary>
- public class MostRightIconControl : FrameLayoutControl
- {
+ /// <summary>
+ /// 鍋氭垚鏀惧湪鐢婚潰鍙宠竟鐨勭殑鍥炬爣鎺т欢(娉ㄦ剰,瀹冧笉鑳界敤鏉ュ仛銆愬悜鍙炽�戠殑鍥炬爣)
+ /// </summary>
+ public class MostRightIconControl : FrameLayoutStatuControl
+ {
/// <summary>
/// 鍥炬爣鎺т欢(杩笉寰楀繁锛岃繖涓笢瑗垮紑鏀惧嚭鍘�)
- /// </summary>
- public IconControlCommon btnIcon = null;
+ /// </summary>
+ public IconControlCommon btnIcon = null;
/// <summary>
/// UnSelectedImagePath
- /// </summary>
+ /// </summary>
public string UnSelectedImagePath
{
get { return btnIcon.UnSelectedImagePath; }
@@ -23,7 +23,7 @@
}
/// <summary>
/// SelectedImagePath
- /// </summary>
+ /// </summary>
public string SelectedImagePath
{
get { return btnIcon.SelectedImagePath; }
@@ -31,39 +31,49 @@
}
/// <summary>
/// IsSelected
- /// </summary>
+ /// </summary>
public bool IsSelected
{
get { return btnIcon.IsSelected; }
set { btnIcon.IsSelected = value; }
- }
-
+ }
+
+ /// <summary>
+ /// X杞寸殑鐪熷疄鍋忕Щ閲�(璇风‘淇濆凡缁忚皟鐢↖nitControl鍒濆鍖栧嚱鏁�,鐢ㄦ硶:钃濇箹涓婄殑X杞�,鍑忔帀杩欎釜鍊煎嵆鍙�)
+ /// </summary>
+ public int XOffset
+ {
+ get { return (this.Width - btnIcon.Width) / 2; }
+ }
+
/// <summary>
/// 鍋氭垚鏀惧湪鐢婚潰鍙宠竟鐨勭殑鍥炬爣鎺т欢(娉ㄦ剰,瀹冧笉鑳界敤鏉ュ仛銆愬悜鍙炽�戠殑鍥炬爣)
/// </summary>
- /// <param name="i_width">鎺т欢绌哄害</param>
- /// <param name="i_height">鎺т欢楂樺害</param>
- public MostRightIconControl(int i_width, int i_height)
- {
- this.Width = Application.GetMinRealAverage(110);
- this.Height = ControlCommonResourse.ListViewRowHeight;
- this.Gravity = Gravity.CenterVertical;
-
- var XX = Application.CurrentWidth - Application.GetMinRealAverage(i_width) - ControlCommonResourse.XXLeft;
- this.X = XX - Application.GetMinRealAverage((110 - i_width) / 2);
+ /// <param name="i_width">鎺т欢绌哄害</param>
+ /// <param name="i_height">鎺т欢楂樺害</param>
+ public MostRightIconControl(int i_width, int i_height)
+ {
+ this.UseClickStatu = false;
+
+ this.Width = this.GetPictrueRealSize(110);
+ this.Height = this.Parent != null ? this.Parent.Height : ControlCommonResourse.ListViewRowHeight;
+ this.Gravity = Gravity.CenterVertical;
+
+ var XX = Application.CurrentWidth - this.GetPictrueRealSize(i_width) - ControlCommonResourse.XXLeft;
+ this.X = XX - this.GetPictrueRealSize((110 - i_width) / 2);
this.btnIcon = new IconControlCommon();
- btnIcon.Width = Application.GetMinRealAverage(i_width);
- btnIcon.Height = Application.GetMinRealAverage(i_height);
+ btnIcon.Width = this.GetPictrueRealSize(i_width);
+ btnIcon.Height = this.GetPictrueRealSize(i_height);
btnIcon.Gravity = Gravity.Center;
- }
-
+ }
+
/// <summary>
/// 鍒濆鍖�
- /// </summary>
+ /// </summary>
public void InitControl()
{
- this.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);
- }
+ this.AddChidren(btnIcon, ChidrenBindMode.BindEvent);
+ }
}
}
--
Gitblit v1.8.0