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/Category/CategoryAddScene.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs b/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
index be89045..316aa1c 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
@@ -95,7 +95,7 @@
/// <summary>
/// 淇敼鍦烘櫙action
/// </summary>
- public Action<SceneUI, Common.Room> EditorAction;
+ public Action<SceneUI, Common.Room> EditorAction;
#endregion
@@ -256,7 +256,7 @@
}
}
}
-
+
if (sceneTargetDevicesList.Count > 1)
{
var targetRowLayout = new RowLayout()
@@ -582,7 +582,7 @@
var fileName = $"SceneIcon_{tradeTime}.png";
//閫氳繃鐩告満鎷嶇収瑁佸壀
CropImage.TakePicture((imagePath) =>
- {
+ {
if (isModify)
{
if (IconPathType != 0)
@@ -607,7 +607,7 @@
var fileName = $"SceneIcon_{tradeTime}.png";
//浠庣浉鍐岄�夋嫨鍥剧墖瑁佸壀
CropImage.SelectPicture((imagePath) =>
- {
+ {
if (isModify)
{
if (IconPathType != 0)
--
Gitblit v1.8.0