From b7b3e92bed9c4553e30e2901a1877f088a5f8823 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 04 十一月 2019 17:20:52 +0800
Subject: [PATCH] 2019.11.4
---
ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs | 36 ++++++++++++------------------------
1 files changed, 12 insertions(+), 24 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs b/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
index 376a148..2cbca49 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
@@ -452,12 +452,7 @@
//閫夋嫨鑳屾櫙鍥�
EventHandler<MouseEventArgs> backGroundIMGHander = (sender, e) =>
{
- if (curRoom == null)
- {
- RoomCommon.ShowTipNoRoom();
- return;
- }
- if (curRoom.IsSharedRoom)
+ if (curRoom != null && curRoom.IsSharedRoom)
{
RoomCommon.ShowTipRoomIsShared();
return;
@@ -552,30 +547,23 @@
selectPhotographBtn.MouseUpEventHandler += (send, ee) =>
{
selectFL.RemoveFromParent();
- var sceneView = new SelectScene();
- UserView.HomePage.Instance.AddChidren(sceneView);
- UserView.HomePage.Instance.PageIndex += 1;
- sceneView.beforeSceneTargetDeviceUIs = sceneTargetDevicesList;
- sceneView.Show();
- sceneView.selectedAction = (selectedScene) =>
+ IconPathType = 1;
+ //閫氳繃鐩告満鎷嶇収瑁佸壀
+ CropImage.TakePicture((imagePath) =>
{
- sceneTargetDevicesList.Add(selectedScene);
- RefreshTargetListView();
- };
-
+ Console.WriteLine("SelectPicture 瑁佸壀鍥剧墖杩斿洖璺緞: " + imagePath);
+ }, "HDLPIC");
};
+
selectAblumsBtn.MouseUpEventHandler += (send, ee) =>
{
selectFL.RemoveFromParent();
- var delayTimeView = new SelectDelayTime();
- UserView.HomePage.Instance.AddChidren(delayTimeView);
- UserView.HomePage.Instance.PageIndex += 1;
- delayTimeView.Show();
- delayTimeView.selectedTimeAction = (second) =>
+ IconPathType = 2;
+ //浠庣浉鍐岄�夋嫨鍥剧墖瑁佸壀
+ CropImage.SelectPicture((imagePath) =>
{
- sceneTargetDevicesList.Add(second);
- RefreshTargetListView();
- };
+ Console.WriteLine("SelectPicture 瑁佸壀鍥剧墖杩斿洖璺緞: " + imagePath);
+ }, "HDLPIC");
};
cancelBtn.MouseUpEventHandler += (send, ee) =>
--
Gitblit v1.8.0