From 05ce435c3b58e53eeab04c672affdeeab75f3036 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 15 十一月 2019 14:41:39 +0800
Subject: [PATCH] 2019.11.15-1
---
ZigbeeApp/Shared/Phone/Device/Room/AddRoomScene.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/AddRoomScene.cs b/ZigbeeApp/Shared/Phone/Device/Room/AddRoomScene.cs
old mode 100755
new mode 100644
index 1df900c..26b318e
--- a/ZigbeeApp/Shared/Phone/Device/Room/AddRoomScene.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/AddRoomScene.cs
@@ -202,10 +202,10 @@
//鏃堕棿闂撮殧
else if (targetDevice.Type == 1)
{
- var delayTimeView = new CategorySceneSelectedDelayTime();
+ var delayTimeView = new SelectDelayTime();
UserView.HomePage.Instance.AddChidren(delayTimeView);
UserView.HomePage.Instance.PageIndex += 1;
- delayTimeView.Show(1, targetDevice.SceneTargetDeviceUIID,-1,true);
+ //delayTimeView.Show(1, targetDevice.SceneTargetDeviceUIID,-1,true);
}
//鍦烘櫙
else if (targetDevice.Type == 2)
@@ -468,9 +468,9 @@
Shared.Phone.UserView.HomePage.Instance.AddChidren(localPic);
Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
localPic.Show();
- localPic.action = () =>
+ localPic.action = (imgPath) =>
{
- backGround.UnSelectedImagePath = ImagePath;
+ backGround.UnSelectedImagePath = imgPath;
IconType = 0;
};
@@ -704,10 +704,10 @@
selectedTimerBtn.MouseUpEventHandler += (send, ee) =>
{
selectFL.RemoveFromParent();
- var delayTimeView = new CategorySceneSelectedDelayTime();
+ var delayTimeView = new SelectDelayTime();
UserView.HomePage.Instance.AddChidren(delayTimeView);
UserView.HomePage.Instance.PageIndex += 1;
- delayTimeView.Show(-1,"",-1,true);
+ //delayTimeView.Show(-1,"",-1,true);
};
cancelBtn.MouseUpEventHandler += (send, ee) =>
{
--
Gitblit v1.8.0