From 5204bc34549ba4718158c447cbb3c74b39ffe163 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 02 十二月 2019 16:03:29 +0800
Subject: [PATCH] 2019.12.2
---
ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs | 54 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs b/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
index a9e7def..7145309 100644
--- a/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
@@ -29,11 +29,21 @@
/// <summary>
/// backGround
/// </summary>
- private Button backGround;
+ private ImageView backGround;
/// <summary>
/// IconPathType
/// </summary>
- public int IconPathType = 0;
+ public int IconPathType;
+ /// <summary>
+ /// OldBackgroundImagePath
+ /// </summary>
+ private string OldBackgroundImagePath;
+
+ /// <summary>
+ /// OldIconPathType
+ /// </summary>
+ public int OldIconPathType;
+
#endregion
@@ -49,6 +59,11 @@
{
room = r;
IconPathType = r.BackgroundImageType;
+ OldIconPathType= r.BackgroundImageType;
+ if (IconPathType != 0)
+ {
+ OldBackgroundImagePath = r.BackgroundImage;
+ }
AddTop();
AddBodyView();
@@ -60,6 +75,7 @@
HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");
+ CommonPage.Instance.IsDrawerLockMode = false;
base.RemoveFromParent();
}
@@ -93,26 +109,17 @@
};
AddChidren(bodyFrameLayout);
- var imgFL = new Button
- {
- Y = Application.GetRealHeight(60),
- Width = Application.GetMinRealAverage(916),
- Height = Application.GetMinRealAverage(487),
- Gravity = Gravity.CenterHorizontal,
- UnSelectedImagePath = "Room/Room_Rectangle.png"
- };
- bodyFrameLayout.AddChidren(imgFL);
-
- backGround = new Button()
+ backGround = new ImageView()
{
Y = Application.GetRealHeight(60),
Width = Application.GetMinRealAverage(887),
Height = Application.GetMinRealAverage(444),
Gravity = Gravity.CenterHorizontal,
Radius = (uint)Application.GetRealHeight(CommonFormResouce.BigFormRadius),
- UnSelectedImagePath = room.BackgroundImage
+ ImagePath = room.BackgroundImageType==0? room.BackgroundImage: System.IO.Path.Combine(Config.Instance.FullPath, room.BackgroundImage)
};
bodyFrameLayout.AddChidren(backGround);
+ backGround.SetViewShadow(true);
backGround.MouseUpEventHandler += backGroundIMGHander;
var infoFL = new FrameLayout
@@ -122,6 +129,8 @@
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
};
bodyFrameLayout.AddChidren(infoFL);
+ var rectCornerID = HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight;
+ infoFL.SetCornerWithSameRadius(Application.GetRealHeight(50), rectCornerID);
var infoEdit = new Button
{
@@ -173,7 +182,6 @@
var temperatureRow = new DeviceInfoRow(446);
temperatureRow.Init();
temperatureRow.SetTipTitle(R.MyInternationalizationString.Temperature);
- temperatureRow.SetTitle("26.8鈩�");
temperatureRow.NameText.TextAlignment = TextAlignment.CenterRight;
infoFL.AddChidren(temperatureRow);
temperatureRow.ClickBtn.MouseUpEventHandler += (sender, e) =>
@@ -285,7 +293,6 @@
var humidityRow = new DeviceInfoRow(585);
humidityRow.Init();
humidityRow.SetTipTitle(R.MyInternationalizationString.Humidity);
- humidityRow.SetTitle("66.5%");
humidityRow.NameText.TextAlignment = TextAlignment.CenterRight;
infoFL.AddChidren(humidityRow);
humidityRow.ClickBtn.MouseUpEventHandler += (sender, e) =>
@@ -293,6 +300,7 @@
var tem = new RoomHumiditySetting { };
HomePage.Instance.AddChidren(tem);
HomePage.Instance.PageIndex += 1;
+ tem.tempDevice = Common.LocalDevice.Current.GetDevice(room.HumidityDevice);
tem.Show(room);
tem.selectDeviceAction = (selectTemp) =>
{
@@ -381,8 +389,12 @@
confirm.MouseUpEventHandler += (sender, e) =>
{
var tradeTime = DateTime.Now.ToString("yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo);
- var fileName = $"Room_{tradeTime}";
+ var fileName = $"RoomIcon_{tradeTime}.png";
room.Name = nameRow.NameText.Text.Trim();
+ if (OldIconPathType != 0)
+ {
+ Shared.IO.FileUtils.DeleteFile(System.IO.Path.Combine(Config.Instance.FullPath,OldBackgroundImagePath));
+ }
if (IconPathType == 0)
{
room.BackgroundImage = backGround.UnSelectedImagePath;
@@ -390,10 +402,11 @@
else
{
Shared.IO.FileUtils.WriteFileByBytes(System.IO.Path.Combine(Config.Instance.FullPath, fileName), backGround.ImageBytes);
- room.BackgroundImage = System.IO.Path.Combine(Config.Instance.FullPath, fileName);
+ room.BackgroundImage = fileName;
}
room.BackgroundImageType = IconPathType;
room.Save();
+ action?.Invoke();
RemoveFromParent();
};
@@ -495,6 +508,7 @@
localPic.action = (imgPath) =>
{
IconPathType = 0;
+ backGround.ImageBytes = null;
backGround.UnSelectedImagePath = imgPath;
};
};
@@ -502,7 +516,7 @@
{
selectFL.RemoveFromParent();
var tradeTime = DateTime.Now.ToString("yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo);
- var fileName = $"Room_{tradeTime}";
+ var fileName = $"RoomIcon_{tradeTime}.png";
//閫氳繃鐩告満鎷嶇収瑁佸壀
CropImage.TakePicture((imagePath) =>
{
@@ -523,7 +537,7 @@
{
selectFL.RemoveFromParent();
var tradeTime = DateTime.Now.ToString("yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo);
- var fileName = $"Room_{tradeTime}";
+ var fileName = $"RoomIcon_{tradeTime}.png";
//浠庣浉鍐岄�夋嫨鍥剧墖瑁佸壀
CropImage.SelectPicture((imagePath) =>
{
--
Gitblit v1.8.0