From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceSelectUnallocatedControl.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceSelectUnallocatedControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceSelectUnallocatedControl.cs
index aafb758..0f3b72a 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceSelectUnallocatedControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceSelectUnallocatedControl.cs
@@ -64,7 +64,7 @@
/// <summary>
/// 鏈垎閰嶇晫闈㈢殑璁惧閫夋嫨鎺т欢
/// </summary>
- /// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(鐪熷疄鍊�,鏈変簺鐣岄潰闇�瑕佽繖绉嶇壒娈婃搷浣�)</param>
+ /// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(銆愬垪琛ㄦ帶浠剁殑rowSpace/2銆戝嵆鍙�,涓嶆噦榛樿涓�0鍗冲彲)</param>
public DeviceSelectUnallocatedControl(int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)
{
this.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
@@ -79,11 +79,11 @@
this.device = i_device;
//璁惧鍥炬爣鑳屾櫙鎺т欢
this.frameIconBackGroud = new FrameLayout();
- frameIconBackGroud.Height = Application.GetMinRealAverage(112);
- frameIconBackGroud.Width = Application.GetMinRealAverage(112);
+ frameIconBackGroud.Height = this.GetPictrueRealSize(112);
+ frameIconBackGroud.Width = this.GetPictrueRealSize(112);
frameIconBackGroud.Gravity = Gravity.CenterVertical;
frameIconBackGroud.X = Application.GetRealWidth(46);
- frameIconBackGroud.Radius = (uint)Application.GetMinRealAverage(112 / 2);
+ frameIconBackGroud.Radius = (uint)this.GetPictrueRealSize(112 / 2);
frameIconBackGroud.BackgroundColor = Common.ZigbeeColor.Current.GXCGrayBackgroundColor;
this.AddChidren(frameIconBackGroud, ChidrenBindMode.NotBind);
if (chidrenYaxis != 0)
@@ -94,18 +94,18 @@
//璁惧鍥炬爣鎺т欢
this.btnDeviceIcon = new IconViewControl(78);
btnDeviceIcon.Gravity = Gravity.Center;
- Common.LocalDevice.Current.SetDeviceIconToControl(btnDeviceIcon, i_device);
+ HdlDeviceCommonLogic.Current.SetDeviceIconToControl(btnDeviceIcon, i_device);
frameIconBackGroud.AddChidren(btnDeviceIcon);
//閲嶆柊缁戝畾浜嬩欢
- this.ChangedChidrenBindMode(frameIconBackGroud, ChidrenBindMode.BindEventOnly);
+ this.ChangedChidrenBindMode(frameIconBackGroud, ChidrenBindMode.BindEvent);
//璁惧鍚嶅瓧
this.btnDeviceName = new NormalViewControl(Application.GetRealWidth(600), this.Height, false);
btnDeviceName.X = Application.GetRealWidth(181);
- btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(i_device);
+ btnDeviceName.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(i_device);
btnDeviceName.SelectedTextColor = Common.ZigbeeColor.Current.GXCTextSelectedColor;
btnDeviceName.Gravity = Gravity.CenterVertical;
- this.AddChidren(btnDeviceName, ChidrenBindMode.BindEventOnly);
+ this.AddChidren(btnDeviceName, ChidrenBindMode.BindEvent);
if (chidrenYaxis != 0)
{
btnDeviceName.Y += chidrenYaxis;
@@ -120,16 +120,16 @@
this.AddChidren(btnSelect, ChidrenBindMode.NotBind);
btnSelect.InitControl();
//澶嶅悎鎺т欢闇�瑕佺壒娈婂鐞�
- this.ChangedChidrenBindMode(btnSelect, ChidrenBindMode.BindEventOnly);
+ this.ChangedChidrenBindMode(btnSelect, ChidrenBindMode.BindEvent);
if (chidrenYaxis != 0)
{
btnSelect.btnIcon.Y += chidrenYaxis;
}
//搴曠嚎
- var btnBottomLine = new NormalViewControl(Application.GetRealWidth(835), ControlCommonResourse.BottomLineHeight, false);
+ var btnBottomLine = new NormalViewControl(Application.GetRealWidth(835), HdlControlResourse.BottomLineHeight, false);
btnBottomLine.X = Application.GetRealWidth(181);
- btnBottomLine.Y = this.Height - ControlCommonResourse.BottomLineHeight;
+ btnBottomLine.Y = this.Height - HdlControlResourse.BottomLineHeight;
btnBottomLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
this.AddChidren(btnBottomLine, ChidrenBindMode.NotBind);
}
--
Gitblit v1.8.0