From fbbfd430f289f3c0cc0f826b2207944ef7205c9d Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 10 十二月 2019 10:17:50 +0800
Subject: [PATCH] 2019.12.10
---
ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs | 52 +++++++++++++++++++++++++++++-----------------------
1 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs b/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
index 6561293..589c395 100644
--- a/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
@@ -162,30 +162,31 @@
var floorRow = new DeviceInfoRow(308);
floorRow.Init();
floorRow.SetTipTitle($"{Language.StringByID(R.MyInternationalizationString.BelongFloor)} :");
- infoFL.AddChidren(floorRow);
- if (!room.IsLove)
+ if (Config.Instance.Home.FloorDics.Count > 0 && room.IsLove == false)
{
- floorRow.SetTitle(room.FloorName);
- floorRow.ClickBtn.MouseUpEventHandler += (sender, e) =>
- {
- if (Config.Instance.Home.FloorDics != null)
- {
- List<string> floorIds = new List<string> { };
- List<string> floorNames = new List<string> { };
- foreach (var floor in Config.Instance.Home.FloorDics)
- {
- floorIds.Add(floor.Key);
- floorNames.Add(floor.Value);
- }
-
- PickerView.Show(floorNames, (index) =>
- {
- room.FloorId = floorIds[index];
- floorRow.SetTitle(room.FloorName);
- }, floorIds.IndexOf(room.FloorId), Language.StringByID(R.MyInternationalizationString.BelongFloor), Language.StringByID(R.MyInternationalizationString.Confrim), Language.StringByID(R.MyInternationalizationString.Cancel));
- }
- };
+ infoFL.AddChidren(floorRow);
}
+ floorRow.SetTitle(room.FloorName);
+ floorRow.ClickBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ if (Config.Instance.Home.FloorDics != null)
+ {
+ List<string> floorIds = new List<string> { };
+ List<string> floorNames = new List<string> { };
+ foreach (var floor in Config.Instance.Home.FloorDics)
+ {
+ floorIds.Add(floor.Key);
+ floorNames.Add(floor.Value);
+ }
+
+ PickerView.Show(floorNames, (index) =>
+ {
+ room.FloorId = floorIds[index];
+ floorRow.SetTitle(room.FloorName);
+ }, floorIds.IndexOf(room.FloorId), Language.StringByID(R.MyInternationalizationString.BelongFloor), Language.StringByID(R.MyInternationalizationString.Confrim), Language.StringByID(R.MyInternationalizationString.Cancel));
+ }
+ };
+
var temperatureRow = new DeviceInfoRow(446);
temperatureRow.Init();
@@ -249,7 +250,6 @@
(selectTemp as ZigBee.Device.TemperatureSensor).ReadTemperatureOrHumidity();
};
};
-
if (string.IsNullOrEmpty(room.TemperatrueDevice) == false)
{
HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
@@ -297,6 +297,7 @@
(dev as ZigBee.Device.TemperatureSensor).ReadTemperatureOrHumidity();
}
}
+
var humidityRow = new DeviceInfoRow(585);
humidityRow.Init();
@@ -390,6 +391,11 @@
}
}
+ if (Config.Instance.Home.FloorDics.Count == 0 || room.IsLove)
+ {
+ temperatureRow.Y = Application.GetRealHeight(308);
+ humidityRow.Y= Application.GetRealHeight(446);
+ }
var confirm = new Device.CommonForm.CompleteButton(1700, 700, 127);
confirm.SetTitle(R.MyInternationalizationString.Confrim);
--
Gitblit v1.8.0