From bba578c2f0acf2eca747edcb69426771e0cadd32 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 23 三月 2020 18:20:50 +0800
Subject: [PATCH] 2020-03-23-3
---
ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs
index 15640bb..f94a50e 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs
@@ -83,7 +83,7 @@
this.RemoveFromParent();
}
};
-
+
//寤舵椂鏃堕棿
this.btnDelayTime = new NormalViewControl(200, 58, true);
btnDelayTime.X = Application.GetRealWidth(780);
@@ -297,6 +297,30 @@
{
this.InitControl(s, r);
}
+ }
+ else
+ {
+ CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.FailedPleaseTryAgain));
+ }
+
+ var sceneView = new CategoryAddScene();
+ Phone.UserView.HomePage.Instance.AddChidren(sceneView);
+ Phone.UserView.HomePage.Instance.PageIndex += 1;
+ sceneView.isModify = true;
+ sceneView.modifyRoom = room;
+ sceneView.modifySceneUI = scene;
+ sceneView.modifySceneTargetDevicesList = targetList;
+ sceneView.Show();
+ sceneView.EditorAction = (s, r) =>
+ {
+ if (r.Id != room.Id)
+ {
+ RemoveFromParent();
+ }
+ else
+ {
+ Init(s, r);
+ }
};
}
catch (Exception ex)
@@ -333,7 +357,7 @@
#endregion
/// <summary>
- ///
+ ///
/// </summary>
/// <param name="btnScenePic"></param>
/// <param name="btnSceneName"></param>
@@ -350,7 +374,7 @@
{
return;
}
-
+
scene.RemainTime = scene.SceneDelayTime;
scene.SceneDelayTime = 0;
if (scene.RemainTime <= 0)
--
Gitblit v1.8.0