From 412e0af11df2b1d7986adf002e7997d82344ab3e Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 13 七月 2020 09:47:40 +0800
Subject: [PATCH] 请合并最新版代码
---
ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
index adac499..feab18b 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
@@ -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;
@@ -360,6 +370,7 @@
}
///鏄剧ず鎴块棿鎵�鏈夎澶�
ConditionDeviceView(new List<DeviceType>(), devicelist);
+
}
/// <summary>
@@ -449,7 +460,6 @@
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
this.AddChidren(flMain);
CurrentDeviceState.CurrentDeviceView(flMain, common, false, IfType);
-
};
deviceFramelayout.MouseUpEventHandler += devicclick;
bjFramelayout.MouseUpEventHandler += devicclick;
--
Gitblit v1.8.0