From b186c02eb9e44268727b769be477d1956e97fbb0 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 09:08:05 +0800
Subject: [PATCH] 2019.1.2
---
ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs b/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
index 5742330..a38cc00 100644
--- a/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
@@ -131,7 +131,7 @@
//灏忔暟鐐归渶瑕佷竴浣�
strValue = strValue.Substring(0, strValue.Length - 1);
temperatureRow.NameText.Text = strValue.Insert(strValue.Length - 1, ".") + "鈩�";
- room.Temperatrue = int.Parse(strValue) * 0.1;
+ room.Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
}
else
{
@@ -139,7 +139,7 @@
string strValue = data.AttriButeData.ToString();
strValue = strValue.Substring(0, strValue.Length - 1);
temperatureRow.NameText.Text = strValue.Insert(strValue.Length - 1, ".") + "鈩�";
- room.Temperatrue = int.Parse(strValue) * 0.1;
+ room.Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
}
}
}
@@ -162,7 +162,7 @@
string strValue = data.AttriButeData.ToString();
strValue = strValue.Substring(0, strValue.Length - 1);
humidityRow.NameText.Text = strValue.Insert(strValue.Length - 1, ".") + "%";
- room.Humidity = int.Parse(strValue) * 0.1;
+ room.Humidity = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
}
}
}
@@ -241,17 +241,28 @@
};
AddChidren(bodyFrameLayout);
+ var backGround1 = new ImageView()
+ {
+ Y = Application.GetRealHeight(60),
+ Width = Application.GetMinRealAverage(916),
+ Height = Application.GetMinRealAverage(487),
+ Gravity = Gravity.CenterHorizontal,
+ ImagePath = "Room/Room_Rectangle.png"
+ };
+ bodyFrameLayout.AddChidren(backGround1);
+
+
backGround = new ImageView()
{
Y = Application.GetRealHeight(60),
Width = Application.GetMinRealAverage(887),
Height = Application.GetMinRealAverage(444),
Gravity = Gravity.CenterHorizontal,
- Radius = (uint)Application.GetRealHeight(CommonFormResouce.BigFormRadius),
+ Radius = (uint)Application.GetMinRealAverage(CommonFormResouce.BigFormRadius),
ImagePath = room.BackgroundImageType == 0 ? room.BackgroundImage : System.IO.Path.Combine(Config.Instance.FullPath, room.BackgroundImage)
};
bodyFrameLayout.AddChidren(backGround);
- backGround.SetViewShadow(true);
+
if (room.BackgroundImageType != 0)
{
backGround.ImageBytes = Shared.IO.FileUtils.ReadFile(backGround.ImagePath);
@@ -346,7 +357,7 @@
};
if (string.IsNullOrEmpty(room.TemperatrueDevice) == false)
{
- temperatureRow.SetTitle(R.MyInternationalizationString.Getting);
+ temperatureRow.SetTitle(room.Temperatrue==0?"--鈩�":$"{room.Temperatrue}鈩�");
//鍙戦�佽幏鍙栨俯搴︾殑鍛戒护
var dev = Common.LocalDevice.Current.GetDevice(room.TemperatrueDevice);
ReadDeviceAttributeLogic.Instance.SendTemperatureStatuComand(dev);
@@ -384,7 +395,7 @@
};
if (string.IsNullOrEmpty(room.HumidityDevice) == false)
{
- humidityRow.SetTitle(R.MyInternationalizationString.Getting);
+ humidityRow.SetTitle(room.Humidity == 0 ? "--%" : $"{room.Humidity}%");
//鍙戦�佽幏鍙栨箍搴︾殑鍛戒护
var dev = Common.LocalDevice.Current.GetDevice(room.HumidityDevice);
ReadDeviceAttributeLogic.Instance.SendHumidityStatuComand(dev);
@@ -401,7 +412,7 @@
}
var confirm = new Device.CommonForm.CompleteButton(1700, 900, 127);
- confirm.SetTitle(R.MyInternationalizationString.Confrim);
+ confirm.SetTitle(R.MyInternationalizationString.Save);
AddChidren(confirm);
confirm.MouseUpEventHandler += (sender, e) =>
{
@@ -411,6 +422,7 @@
if (OldIconPathType != 0)
{
Shared.IO.FileUtils.DeleteFile(System.IO.Path.Combine(Config.Instance.FullPath,OldBackgroundImagePath));
+ HdlAutoBackupLogic.DeleteFile(System.IO.Path.Combine(Config.Instance.FullPath, OldBackgroundImagePath));
}
if (IconPathType == 0)
{
@@ -419,6 +431,7 @@
else
{
Shared.IO.FileUtils.WriteFileByBytes(System.IO.Path.Combine(Config.Instance.FullPath, fileName), backGround.ImageBytes);
+ HdlAutoBackupLogic.AddOrEditorFile(System.IO.Path.Combine(Config.Instance.FullPath, fileName));
room.BackgroundImage = fileName;
}
room.BackgroundImageType = IconPathType;
--
Gitblit v1.8.0