From b129359c5a0df75f63d9131e5e41d3060ac38cc3 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 30 十二月 2019 14:14:06 +0800
Subject: [PATCH] 2019.12.30
---
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 7 ++++---
ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index c920a19..34d8eab 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -2,7 +2,7 @@
<MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.M7BBB18B19152766" />
<MonoDevelop.Ide.ItemProperties.GateWay.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.8c0bdb303f25d82c2a42fb8bfca449bfaca00260" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
- <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/CommonForm/SceneMainView.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/CommonForm/RoomView.cs">
<Files>
<File FileName="Shared/R.cs" Line="809" Column="16" />
<File FileName="GateWay.Droid/Assets/Language.ini" />
@@ -13,7 +13,8 @@
<File FileName="Shared/Phone/Device/Light/LightControl.cs" />
<File FileName="Shared/Phone/Device/Category/CategoryAddScene.cs" />
<File FileName="Shared/Phone/Device/CommonForm/FunctionMainView.cs" Line="162" Column="28" />
- <File FileName="Shared/Phone/Device/CommonForm/SceneMainView.cs" Line="1" Column="1" />
+ <File FileName="Shared/Phone/Device/CommonForm/SceneMainView.cs" Line="153" Column="28" />
+ <File FileName="Shared/Phone/Device/CommonForm/RoomView.cs" Line="1" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -24,7 +25,7 @@
<Node name="Phone" expanded="True">
<Node name="Device" expanded="True">
<Node name="CommonForm" expanded="True">
- <Node name="SceneMainView.cs" selected="True" />
+ <Node name="RoomView.cs" selected="True" />
</Node>
<Node name="DeviceLogic" expanded="True" />
<Node name="Light" expanded="True" />
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
index dd89ea7..56cbd8a 100644
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
@@ -262,7 +262,7 @@
Width = Application.GetRealWidth(120),
Height = Application.GetRealHeight(58),
Gravity = Gravity.CenterVertical,
- Text = Math.Abs(room.Temperatrue) <= 0 ? "--%" : $"{room.Humidity}%",
+ Text = Math.Abs(room.Humidity) <= 0 ? "--%" : $"{room.Humidity}%",
TextSize=14
};
roomTemperatureBackground.AddChidren(humidityText);
--
Gitblit v1.8.0