From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs
index 7a7fcc6..4398438 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs
@@ -44,6 +44,10 @@
/// 璁惧闇�瑕佷繚瀛樼殑璁惧鍔熻兘
/// </summary>
private Dictionary<int, DeviceFunctionType> dicDeviceFuncType = new Dictionary<int, DeviceFunctionType>();
+ /// <summary>
+ /// 淇℃伅缂栬緫鎺т欢
+ /// </summary>
+ private InformationEditorControl tableContr = null;
#endregion
@@ -78,15 +82,11 @@
this.ClearBodyFrame();
//鍒濆鍖栨甯�
- var tableContr = new InformationEditorControl();
+ this.tableContr = new InformationEditorControl();
this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 708, 1128);
//鍒濆鍖栬澶囧洖璺浘鏍�
this.InitDeviceEpointIcon();
-
- //鍒濆鍖栨甯冨畬鎴�
- tableContr.FinishInitControl(bodyFrameLayout, this.listview);
- tableContr = null;
//淇濆瓨
var btnFinish = new BottomClickButton();
@@ -209,6 +209,8 @@
//娣诲姞鍔熻兘绫诲瀷琛�
this.AddFunctionTypeRow();
+ //鍒濆鍖栨甯冨畬鎴�
+ tableContr.FinishInitControl(bodyFrameLayout, this.listview);
}
#endregion
@@ -249,7 +251,7 @@
//{
// menuCount = 2;
//}
- var frame = new TopRightMenuControl(menuCount);
+ var frame = new TopRightMenuControl(menuCount, 1);
if (canTest == true)
{
//瀹氫綅
@@ -371,9 +373,10 @@
var frameBorder = new FrameLayout();
frameBorder.Y = Application.GetRealHeight(147);
frameBorder.Gravity = Gravity.CenterHorizontal;
- frameBorder.Width = Application.GetMinRealAverage(887);
- frameBorder.Height = Application.GetMinRealAverage(423);
- frameBorder.BorderWidth = 3;
+ 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);
@@ -449,7 +452,7 @@
btnIcon.Name = "btn" + listDevice[i].DeviceEpoint;
btnIcon.X = defultXX + i * (frame.Height + space);
btnIcon.Radius = (uint)frame.Height / 2;
- btnIcon.BorderWidth = (uint)Application.GetMinRealAverage(6);
+ btnIcon.BorderWidth = 2;
btnIcon.BorderColor = 0xff979797;
btnIcon.TextAlignment = TextAlignment.Center;
btnIcon.TextColor = UserCenterColor.Current.TextGrayColor3;
--
Gitblit v1.8.0