From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs | 68 ++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 23 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs b/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
index 5742330..a14d05a 100644
--- 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;
@@ -107,7 +107,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)
@@ -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, "."));
}
}
}
@@ -193,7 +193,7 @@
{
room = r;
IconPathType = r.BackgroundImageType;
- OldIconPathType= r.BackgroundImageType;
+ OldIconPathType = r.BackgroundImageType;
if (IconPathType != 0)
{
OldBackgroundImagePath = r.BackgroundImage;
@@ -204,11 +204,11 @@
}
- public override void RemoveFromParent()
+ public override void RemoveFromParent()
{
- ZbGateway.StatusList.Remove(this);
- CommonPage.Instance.IsDrawerLockMode = false;
- base.RemoveFromParent();
+ ZbGateway.StatusList.Remove(this);
+ CommonPage.Instance.IsDrawerLockMode = false;
+ base.RemoveFromParent();
}
#region Add____________________________________
@@ -241,17 +241,27 @@
};
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);
@@ -286,7 +296,7 @@
nameRow.SetTipTitle($"{Language.StringByID(R.MyInternationalizationString.RoomName)} :");
nameRow.SetTitle(room.Name);
infoFL.AddChidren(nameRow);
- if(room.IsLove)
+ if (room.IsLove)
{
nameRow.NameText.Enable = false;
}
@@ -339,6 +349,7 @@
return;
}
room.TemperatrueDevice = $"{selectTemp.DeviceAddr}{selectTemp.DeviceEpoint}";
+ temperDevice=Common.LocalDevice.Current.GetDevice(room.TemperatrueDevice);
temperatureRow.SetTitle(R.MyInternationalizationString.Getting);
//鍙戦�佽幏鍙栨俯搴︾殑鍛戒护
ReadDeviceAttributeLogic.Instance.SendTemperatureStatuComand(selectTemp);
@@ -346,10 +357,10 @@
};
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);
+ temperDevice = Common.LocalDevice.Current.GetDevice(room.TemperatrueDevice);
+ ReadDeviceAttributeLogic.Instance.SendTemperatureStatuComand(temperDevice);
}
else
{
@@ -376,6 +387,7 @@
return;
}
room.HumidityDevice = $"{selectTemp.DeviceAddr}{selectTemp.DeviceEpoint}";
+ humidDevice = Common.LocalDevice.Current.GetDevice(room.HumidityDevice);
humidityRow.SetTitle(R.MyInternationalizationString.Getting);
//鍙戦�佽幏鍙栨箍搴︾殑鍛戒护
@@ -384,10 +396,10 @@
};
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);
+ humidDevice = Common.LocalDevice.Current.GetDevice(room.HumidityDevice);
+ ReadDeviceAttributeLogic.Instance.SendHumidityStatuComand(humidDevice);
}
else
{
@@ -397,11 +409,11 @@
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);
- confirm.SetTitle(R.MyInternationalizationString.Confrim);
+ confirm.SetTitle(R.MyInternationalizationString.Save);
AddChidren(confirm);
confirm.MouseUpEventHandler += (sender, e) =>
{
@@ -410,7 +422,8 @@
room.Name = nameRow.NameText.Text.Trim();
if (OldIconPathType != 0)
{
- Shared.IO.FileUtils.DeleteFile(System.IO.Path.Combine(Config.Instance.FullPath,OldBackgroundImagePath));
+ Shared.IO.FileUtils.DeleteFile(System.IO.Path.Combine(Config.Instance.FullPath, OldBackgroundImagePath));
+ HdlAutoBackupLogic.DeleteFile(OldBackgroundImagePath);
}
if (IconPathType == 0)
{
@@ -419,6 +432,7 @@
else
{
Shared.IO.FileUtils.WriteFileByBytes(System.IO.Path.Combine(Config.Instance.FullPath, fileName), backGround.ImageBytes);
+ HdlAutoBackupLogic.AddOrEditorFile(fileName);
room.BackgroundImage = fileName;
}
room.BackgroundImageType = IconPathType;
@@ -540,6 +554,10 @@
//閫氳繃鐩告満鎷嶇収瑁佸壀
CropImage.TakePicture((imagePath) =>
{
+ if (string.IsNullOrEmpty(imagePath))
+ {
+ return;
+ }
if (IconPathType != 0)
{
Global.DeleteFilebyHomeId(backGround.ImagePath);
@@ -561,6 +579,10 @@
//浠庣浉鍐岄�夋嫨鍥剧墖瑁佸壀
CropImage.SelectPicture((imagePath) =>
{
+ if (string.IsNullOrEmpty(imagePath))
+ {
+ return;
+ }
if (IconPathType != 0)
{
Global.DeleteFilebyHomeId(backGround.ImagePath);
--
Gitblit v1.8.0