From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs
index cbbce46..cde8171 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs
@@ -15,7 +15,7 @@
/// <summary>
/// 鍒楄〃鎺т欢
/// </summary>
- private VerticalListControl listview = null;
+ private FrameListControl listview = null;
/// <summary>
/// 褰撳墠閫夋嫨鐨勮澶�
/// </summary>
@@ -40,6 +40,10 @@
/// 璁惧闇�瑕佷繚瀛樼殑璁惧鍔熻兘
/// </summary>
private Dictionary<int, DeviceFunctionType> dicDeviceFuncType = new Dictionary<int, DeviceFunctionType>();
+ /// <summary>
+ /// 淇℃伅缂栬緫鎺т欢
+ /// </summary>
+ private InformationEditorControl tableContr = null;
#endregion
@@ -71,16 +75,16 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
+ var listBackControl = new VerticalFrameControl();
+ listBackControl.Height = bodyFrameLayout.Height;
+ bodyFrameLayout.AddChidren(listBackControl);
+
//鍒濆鍖栨甯�
- var tableContr = new InformationEditorControl();
- this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 708, 1028);
+ this.tableContr = new InformationEditorControl();
+ this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 1028);
//鍒濆鍖栬澶囧洖璺浘鏍�
- this.InitDeviceEpointIcon();
-
- //鍒濆鍖栨甯冨畬鎴�
- tableContr.FinishInitControl(bodyFrameLayout, this.listview);
- tableContr = null;
+ this.InitDeviceEpointIcon(listBackControl);
//淇濆瓨
var btnFinish = new BottomClickButton();
@@ -198,11 +202,13 @@
rowBeloneArea.SelectRoomEvent += (roomKeys) =>
{
//鍙樻洿鎴块棿
- Common.Room.CurrentRoom.ChangedRoom(nowSelectDevice, roomKeys);
+ HdlRoomLogic.Current.ChangedRoom(nowSelectDevice, roomKeys);
};
//娣诲姞鍔熻兘绫诲瀷琛�
this.AddFunctionTypeRow();
+ //鍒濆鍖栨甯冨畬鎴�
+ tableContr.FinishInitControl();
}
#endregion
@@ -357,7 +363,7 @@
/// <summary>
/// 鍒濆鍖栬澶囧洖璺浘鏍�
/// </summary>
- private void InitDeviceEpointIcon()
+ private void InitDeviceEpointIcon(VerticalFrameControl listBackControl)
{
bool hadDevice = false;
var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceObj.DeviceAddr);
@@ -396,10 +402,10 @@
frameBorder.Gravity = Gravity.CenterHorizontal;
frameBorder.Width = Application.GetMinRealAverage(426);
frameBorder.Height = Application.GetMinRealAverage(426);
- bodyFrameLayout.AddChidren(frameBorder);
+ listBackControl.frameTable.AddChidren(frameBorder);
var btnPic = new PicViewControl(frameBorder.Width, frameBorder.Height, false);
- btnPic.UnSelectedImagePath = "Device/PanelTable.png";
+ btnPic.UnSelectedImagePath = "DeviceItem/PanelTable.png";
frameBorder.AddChidren(btnPic);
if (listSort.Count == 4)
--
Gitblit v1.8.0