From c0021397eeb8335d6d1f20990c71533c3d94e7af Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 10 一月 2020 17:02:38 +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
old mode 100755
new mode 100644
index d7d3742..a14d05a
--- a/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
@@ -204,11 +204,11 @@
}
- public override void RemoveFromParent()
- {
- ZbGateway.StatusList.Remove(this);
+ public override void RemoveFromParent()
+ {
+ ZbGateway.StatusList.Remove(this);
CommonPage.Instance.IsDrawerLockMode = false;
- base.RemoveFromParent();
+ base.RemoveFromParent();
}
#region Add____________________________________
@@ -553,10 +553,10 @@
var fileName = $"RoomIcon_{tradeTime}.png";
//閫氳繃鐩告満鎷嶇収瑁佸壀
CropImage.TakePicture((imagePath) =>
- {
- if (string.IsNullOrEmpty(imagePath))
- {
- return;
+ {
+ if (string.IsNullOrEmpty(imagePath))
+ {
+ return;
}
if (IconPathType != 0)
{
@@ -579,9 +579,9 @@
//浠庣浉鍐岄�夋嫨鍥剧墖瑁佸壀
CropImage.SelectPicture((imagePath) =>
{
- if (string.IsNullOrEmpty(imagePath))
- {
- return;
+ if (string.IsNullOrEmpty(imagePath))
+ {
+ return;
}
if (IconPathType != 0)
{
--
Gitblit v1.8.0