From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs b/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
index a38cc00..d912084 100644
--- a/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
@@ -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____________________________________
@@ -262,7 +262,7 @@
ImagePath = room.BackgroundImageType == 0 ? room.BackgroundImage : System.IO.Path.Combine(Config.Instance.FullPath, room.BackgroundImage)
};
bodyFrameLayout.AddChidren(backGround);
-
+
if (room.BackgroundImageType != 0)
{
backGround.ImageBytes = Shared.IO.FileUtils.ReadFile(backGround.ImagePath);
@@ -297,7 +297,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;
}
@@ -357,7 +357,7 @@
};
if (string.IsNullOrEmpty(room.TemperatrueDevice) == false)
{
- temperatureRow.SetTitle(room.Temperatrue==0?"--鈩�":$"{room.Temperatrue}鈩�");
+ temperatureRow.SetTitle(room.Temperatrue == 0 ? "--鈩�" : $"{room.Temperatrue}鈩�");
//鍙戦�佽幏鍙栨俯搴︾殑鍛戒护
var dev = Common.LocalDevice.Current.GetDevice(room.TemperatrueDevice);
ReadDeviceAttributeLogic.Instance.SendTemperatureStatuComand(dev);
@@ -408,7 +408,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);
@@ -421,7 +421,7 @@
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(System.IO.Path.Combine(Config.Instance.FullPath, OldBackgroundImagePath));
}
if (IconPathType == 0)
@@ -600,4 +600,4 @@
#endregion
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0