From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码
---
ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
index 5b5bf36..45f0f72 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
@@ -52,7 +52,7 @@
{
X = Application.GetRealWidth(58),
Y = Application.GetRealHeight(184 + 200 + 280 + 40),
- Height = Application.GetRealHeight(1920 - 40 - 184 - 280 - 200),
+ Height = Application.GetRealHeight(Method.H - 40 - 184 - 280 - 200),
BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
};
@@ -245,7 +245,7 @@
};
fra.AddChidren(roomnameBtn);
- if (i == 0)//
+ if (i == 0)//榛樿閫変腑绗竴涓埧闂�
{
roombjButton.IsSelected = false;
roombjButton = roombjBtn;
@@ -343,7 +343,17 @@
TextSize = 10,
};
deviceRowLayout.AddChidren(devicetypename);
-
+
+
+ //if (i == 0)//榛樿閫変腑绗竴涓澶囩被鍨�
+ //{
+ // devicetypeButton.IsSelected = false;
+ // devicetypeButton = backgroundColor;
+ // backgroundColor.IsSelected = true;
+ // var list = Method.GetDeviceType(devicetypename.Text);
+ // ConditionDeviceView(list, devicelist);
+ //}
+
EventHandler<MouseEventArgs> devicetypeclick = (sender13, e13) =>
{
devicetypeButton.IsSelected = false;
@@ -361,6 +371,7 @@
///鏄剧ず鎴块棿鎵�鏈夎澶�
ConditionDeviceView(new List<DeviceType>(), devicelist);
+
}
/// <summary>
/// 鍔犺浇璇ョ被鍨嬭澶囪鍥炬柟娉�
@@ -369,6 +380,7 @@
/// <param name="devicelist">璁惧鍒楄〃</param>
void ConditionDeviceView(List<DeviceType> deviceTypelist, List<CommonDevice> devicelist)
{
+
middle.RemoveAll();
foreach (var common in devicelist)
{
@@ -448,8 +460,7 @@
devicename.IsSelected = true;
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
this.AddChidren(flMain);
- CurrentDeviceState.CurrentDeviceView(flMain, common, false, IfType);
-
+ CurrentDeviceState.CurrentDeviceView(flMain, common, false, IfType,0);
};
deviceFramelayout.MouseUpEventHandler += devicclick;
bjFramelayout.MouseUpEventHandler += devicclick;
--
Gitblit v1.8.0