From 6bca8fcd37a48808a0b9c9342fc1be0adddfece6 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 08 五月 2020 17:46:44 +0800
Subject: [PATCH] 请合并最新代码，优化绑定信息
---
ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
old mode 100755
new mode 100644
index 5784b2d..0bdcf5f
--- a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
@@ -131,7 +131,7 @@
//搴旇鏄痓ody鍚�
this.bodyFrameLayout = new FrameLayout();
bodyFrameLayout.Y = topFrameLayout.Bottom;
- bodyFrameLayout.Height = Application.GetRealHeight(1549);
+ bodyFrameLayout.Height = this.Height - topFrameLayout.Bottom;
bodyFrameLayout.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
this.AddChidren(bodyFrameLayout);
@@ -316,7 +316,7 @@
functionSceneBodyView.Height = functionSceneAutoBodyView.Height - roomSwitchContr.Bottom;
functionSceneAutoBodyView.AddChidren(functionSceneBodyView);
- //鎵ц鍒濆鍖�
+ //鎵ц鍒濆鍖�
roomSwitchContr.InitControl();
}
@@ -529,7 +529,11 @@
{
cardContr = new Controls.DeviceFreshAirRowControl();
}
- //褰╃伅(璋冨厜鍣�)
+ // PM2.5
+ else if (device.Type == DeviceType.PMSensor)
+ {
+ }
+ //褰╃伅(璋冨厜鍣�)
else if (device.Type == DeviceType.DimmableLight)
{
cardContr = new Controls.DeviceColorLightRowControl();
@@ -639,8 +643,8 @@
{
listview2 = new VerticalListControl();
functionSceneBodyView.AddChidren(listview2);
- }
-
+ }
+
foreach (var scene in listScene)
{
//鍦烘櫙鍗＄墖鎺т欢
--
Gitblit v1.8.0