From fdc47d950498e088260a3b04028703adc0f878e0 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 30 三月 2020 10:54:27 +0800
Subject: [PATCH] 2020-03-30-1
---
ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs | 53 +++++++++++++++--------------------------------------
1 files changed, 15 insertions(+), 38 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs b/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
index b3aae17..1a22030 100755
--- a/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
@@ -46,9 +46,9 @@
/// </summary>
public int OldIconPathType;
- CommonDevice temperDevice;
+ public CommonDevice temperDevice;
- CommonDevice humidDevice;
+ public CommonDevice humidDevice;
DeviceInfoRow temperatureRow;
@@ -57,31 +57,7 @@
#endregion
#region 鈼� 鎺ュ彛__________________________
- /// <summary>
- /// 澶勭悊鍙樺寲浜嬩欢 --灏嗗純鐢� 鏀圭敤DeviceInfoChange()
- /// </summary>
- /// <returns>The changed.</returns>
- /// <param name="common">Common.</param>
- public void Changed(CommonDevice common)
- {
-
- }
- /// <summary>
- /// Changeds the IL ogic status.
- /// </summary>
- /// <param name="logic">Logic.</param>
- public void ChangedILogicStatus(ZigBee.Device.Logic logic)
- {
- //throw new NotImplementedException();
- }
- /// <summary>
- /// Changeds the IS cene status.
- /// </summary>
- /// <param name="scene">Scene.</param>
- public void ChangedISceneStatus(Scene scene)
- {
- //throw new NotImplementedException();
- }
+
/// <summary>
/// 璁惧鐘舵�佹洿鏂版帴鍙�
/// <para>type锛氬鏋滀负 DeviceInComingRespon:璁惧鏂颁笂鎶�</para>
@@ -107,7 +83,7 @@
//鏄惁涓哄綋鍓嶈澶�
if ((temperDevice?.DeviceEpoint != common.DeviceEpoint || temperDevice?.DeviceAddr != common.DeviceAddr) && (humidDevice?.DeviceEpoint != common.DeviceEpoint || humidDevice?.DeviceAddr != common.DeviceAddr))
{
- //return;
+ return;
}
//if (common.Type == DeviceType.TemperatureSensor)
@@ -251,7 +227,6 @@
};
bodyFrameLayout.AddChidren(backGround1);
-
backGround = new ImageView()
{
Y = Application.GetRealHeight(60),
@@ -309,7 +284,7 @@
{
infoFL.AddChidren(floorRow);
}
- floorRow.SetTitle(room.FloorName);
+ floorRow.SetTitle(HdlResidenceLogic.Current.GetFloorNameById(room.FloorId));
floorRow.ClickBtn.MouseUpEventHandler += (sender, e) =>
{
if (Config.Instance.Home.FloorDics != null)
@@ -325,7 +300,7 @@
PickerView.Show(floorNames, (index) =>
{
room.FloorId = floorIds[index];
- floorRow.SetTitle(room.FloorName);
+ floorRow.SetTitle(HdlResidenceLogic.Current.GetFloorNameById(room.FloorId));
}, floorIds.IndexOf(room.FloorId), Language.StringByID(R.MyInternationalizationString.BelongFloor), Language.StringByID(R.MyInternationalizationString.Confrim), Language.StringByID(R.MyInternationalizationString.Cancel));
}
};
@@ -350,6 +325,7 @@
return;
}
room.TemperatrueDevice = $"{selectTemp.DeviceAddr}{selectTemp.DeviceEpoint}";
+ temperDevice=Common.LocalDevice.Current.GetDevice(room.TemperatrueDevice);
temperatureRow.SetTitle(R.MyInternationalizationString.Getting);
//鍙戦�佽幏鍙栨俯搴︾殑鍛戒护
ReadDeviceAttributeLogic.Instance.SendTemperatureStatuComand(selectTemp);
@@ -359,8 +335,8 @@
{
temperatureRow.SetTitle(room.Temperatrue == 0 ? "--鈩�" : $"{room.Temperatrue}鈩�");
//鍙戦�佽幏鍙栨俯搴︾殑鍛戒护
- var dev = Common.LocalDevice.Current.GetDevice(room.TemperatrueDevice);
- ReadDeviceAttributeLogic.Instance.SendTemperatureStatuComand(dev);
+ temperDevice = Common.LocalDevice.Current.GetDevice(room.TemperatrueDevice);
+ ReadDeviceAttributeLogic.Instance.SendTemperatureStatuComand(temperDevice);
}
else
{
@@ -387,6 +363,7 @@
return;
}
room.HumidityDevice = $"{selectTemp.DeviceAddr}{selectTemp.DeviceEpoint}";
+ humidDevice = Common.LocalDevice.Current.GetDevice(room.HumidityDevice);
humidityRow.SetTitle(R.MyInternationalizationString.Getting);
//鍙戦�佽幏鍙栨箍搴︾殑鍛戒护
@@ -397,8 +374,8 @@
{
humidityRow.SetTitle(room.Humidity == 0 ? "--%" : $"{room.Humidity}%");
//鍙戦�佽幏鍙栨箍搴︾殑鍛戒护
- var dev = Common.LocalDevice.Current.GetDevice(room.HumidityDevice);
- ReadDeviceAttributeLogic.Instance.SendHumidityStatuComand(dev);
+ humidDevice = Common.LocalDevice.Current.GetDevice(room.HumidityDevice);
+ ReadDeviceAttributeLogic.Instance.SendHumidityStatuComand(humidDevice);
}
else
{
@@ -408,7 +385,7 @@
if (Config.Instance.Home.FloorDics.Count == 0 || room.IsLove)
{
temperatureRow.Y = Application.GetRealHeight(308);
- humidityRow.Y= Application.GetRealHeight(446);
+ humidityRow.Y = Application.GetRealHeight(446);
}
var confirm = new Device.CommonForm.CompleteButton(1700, 900, 127);
@@ -553,7 +530,7 @@
//閫氳繃鐩告満鎷嶇収瑁佸壀
CropImage.TakePicture((imagePath) =>
{
- if (string.IsNullOrEmpty(imagePath) == true)
+ if (string.IsNullOrEmpty(imagePath))
{
return;
}
@@ -578,7 +555,7 @@
//浠庣浉鍐岄�夋嫨鍥剧墖瑁佸壀
CropImage.SelectPicture((imagePath) =>
{
- if (string.IsNullOrEmpty(imagePath) == true)
+ if (string.IsNullOrEmpty(imagePath))
{
return;
}
--
Gitblit v1.8.0