From bff8993501334c4f3c5f902216fe03253be747f8 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 15 四月 2020 16:59:01 +0800
Subject: [PATCH] 合并新代码
---
ZigbeeApp20200414/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs b/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs
index 46ead4f..be1e0ef 100755
--- a/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs
+++ b/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs
@@ -17,7 +17,7 @@
/// <summary>
/// 鍒楄〃鎺т欢
/// </summary>
- private VerticalListControl listview = null;
+ private FrameListControl listview = null;
/// <summary>
/// 褰撳墠閫夋嫨鐨勮澶�
/// </summary>
@@ -80,12 +80,16 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
+ var listBackControl = new VerticalFrameControl();
+ listBackControl.Height = bodyFrameLayout.Height;
+ bodyFrameLayout.AddChidren(listBackControl);
+
//鍒濆鍖栨甯�
this.tableContr = new InformationEditorControl();
- this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 562, 1175);
+ this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 1175);
//鍒濆鍖栬澶囧洖璺浘鏍�
- this.InitDeviceEpointIcon();
+ this.InitDeviceEpointIcon(listBackControl);
//淇濆瓨
var btnFinish = new BottomClickButton();
@@ -211,7 +215,7 @@
//娣诲姞鑳屽厜鐏
this.AddBackLightRow();
//鍒濆鍖栨甯冨畬鎴�
- tableContr.FinishInitControl(bodyFrameLayout, this.listview);
+ tableContr.FinishInitControl();
}
#endregion
@@ -431,7 +435,7 @@
/// <summary>
/// 鍒濆鍖栬澶囧洖璺浘鏍�
/// </summary>
- private void InitDeviceEpointIcon()
+ private void InitDeviceEpointIcon(VerticalFrameControl listBackControl)
{
//鑾峰彇鎸夌粍鍒嗛厤鐨勮澶�
var listIcon = this.GetAllDeviceGroup();
@@ -442,9 +446,7 @@
frameBorder.Width = Application.GetRealWidth(887);
frameBorder.Height = Application.GetRealHeight(423);
frameBorder.Radius = (uint)Application.GetRealHeight(6);
- frameBorder.BorderWidth = 1;
- frameBorder.BorderColor = 0xffd0d0d0;
- bodyFrameLayout.AddChidren(frameBorder);
+ listBackControl.frameTable.AddChidren(frameBorder);
var frameBack = new FrameLayout();
frameBack.Height = frameBorder.Height;
@@ -454,7 +456,7 @@
//闇�瑕佹粦鍔ㄦ帶浠�
var listControl = new VerticalScrolViewLayout();
listControl.Height = frameBorder.Height;
- bodyFrameLayout.AddChidren(listControl);
+ listBackControl.frameTable.AddChidren(listControl);
listControl.AddChidren(frameBack);
}
@@ -468,8 +470,8 @@
for (int i = 0; i < listIcon.Count; i++)
{
var frame = new FrameLayout();
- frame.Width = Application.GetMinRealAverage(887);
- frame.Height = Application.GetMinRealAverage(124);
+ frame.Width = this.GetPictrueRealSize(887);
+ frame.Height = this.GetPictrueRealSize(124);
frameBack.AddChidren(frame);
//鍒濆鍖栦竴琛岃澶囧浘鏍�
this.InitDeviceIconFrame(frame, listIcon[i], ref index);
@@ -480,14 +482,14 @@
}
else
{
- frame.Y = Application.GetMinRealAverage(58) + (frameBack.ChildrenCount - 1) * (frame.Height + Application.GetMinRealAverage(60));
+ frame.Y = this.GetPictrueRealSize(58) + (frameBack.ChildrenCount - 1) * (frame.Height + this.GetPictrueRealSize(60));
}
}
if (listIcon.Count > 2)
{
//璁＄畻鐪熷疄楂樺害
- int realHeight = Application.GetMinRealAverage(58 + 58) + (frameBack.ChildrenCount - 1) * Application.GetMinRealAverage(124 + 60);
+ int realHeight = this.GetPictrueRealSize(58 + 58) + (frameBack.ChildrenCount - 1) * this.GetPictrueRealSize(124 + 60);
if (realHeight > frameBack.Height)
{
//鍙樻洿楂樺害
@@ -507,7 +509,7 @@
{
NormalViewControl btnTemp = null;
//闂磋窛
- int space = Application.GetMinRealAverage(84);
+ int space = this.GetPictrueRealSize(84);
int defultXX = (frame.Width - frame.Height * listDevice.Count - (listDevice.Count - 1) * space) / 2;
for (int i = 0; i < listDevice.Count; i++)
{
--
Gitblit v1.8.0