From ddb46a700775aacfb6cc82d9586302a38c8fa0a7 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 23 十二月 2019 09:13:37 +0800
Subject: [PATCH] 2019.12.23
---
ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
index 1796fa6..9c011fd 100644
--- a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
@@ -88,6 +88,8 @@
/// sceneScrolView
/// </summary>
private VerticalScrolViewLayout sceneScrolView ;
+
+
#endregion
#region 鈼� 鎺ュ彛____________________________
@@ -419,7 +421,8 @@
Gravity = Gravity.CenterVertical,
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.GXCTextColor,
- Text = Config.Instance.Home.GetCurrentFloorName
+ Text = Config.Instance.Home.GetCurrentFloorName,
+ IsBold=true
};
if (Config.Instance.Home.FloorDics.Count > 0)
{
@@ -923,14 +926,25 @@
}
else
{
+ var dList = new List<DeviceUI> { };
+ foreach(var device in deviceList)
+ {
+ var info = Common.LocalDevice.Current.GetNotHdlMyDeviceEnumInfo(new List<CommonDevice> { device.CommonDevice });
+ if (info.BeloneType == DeviceBeloneType.A骞叉帴鐐� || info.BeloneType == DeviceBeloneType.A涓户鍣�)
+ {
+ continue;
+ }
+ dList.Add(device);
+ }
+
deviceVerticalScrolViewLayout = new VerticalScrolViewLayout { };
functionSceneBodyView.AddChidren(deviceVerticalScrolViewLayout);
- for (int i = 0; i < deviceList.Count; i++)
+ for (int i = 0; i < dList.Count; i++)
{
- var device = deviceList[i];
+ var device = dList[i];
//new System.Threading.Thread(() =>
//{
- Application.RunOnMainThread(() =>
+ Application.RunOnMainThread(() =>
{
try
{
--
Gitblit v1.8.0