From a4924de3136289d10cabbf2f61a228387d44ded7 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 07 十一月 2019 13:48:36 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs b/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs
old mode 100755
new mode 100644
index 5388d58..d166540
--- a/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs
@@ -12,8 +12,7 @@
/// </summary>
private FrameLayout bodyFrameLayout;
-
- public Action action;
+ public Action<string> action;
public CategorySceneSelectImgByLocal()
{
@@ -94,9 +93,9 @@
EventHandler<MouseEventArgs> selectIcon = (sender, e) =>
{
- CategoryAddScene.ImagePath = icon.UnSelectedImagePath;
- Room.AddRoomScene.ImagePath = icon.UnSelectedImagePath;
- action?.Invoke();
+ //CategoryAddScene.ImagePath = icon.UnSelectedImagePath;
+ //Room.AddRoomScene.ImagePath = icon.UnSelectedImagePath;
+ action?.Invoke(icon.UnSelectedImagePath);
action = null;
this.RemoveFromParent();
--
Gitblit v1.8.0