From 4dce704aaf8587cf3f91cf88f2208315a03c4cbb Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 08 四月 2020 13:54:58 +0800
Subject: [PATCH] 先上传一个版本
---
ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs | 34 ++++++++--------------------------
1 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
index 67d8217..6af7fad 100755
--- a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
@@ -107,12 +107,18 @@
if (UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 0)
{
//娣诲姞鍦烘櫙
- Add_Scene();
+ var form = new AddOrEditorSceneForm();
+ form.AddForm(new object[] { null });
+ form.SceneChangedEvent += (scene, roomId) =>
+ {
+ //鍒锋柊bodyView
+ this.RefreshBodyView();
+ };
}
else if (UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 2)
{
//娣诲姞鑷姩鍖�
- Add_Automation();
+ Device.Logic.SkipView.SkipAddLogic(0);
}
};
}
@@ -897,30 +903,6 @@
timeStr += sec + secondText;
}
return timeStr;
- }
-
- /// <summary>
- /// 娣诲姞鍦烘櫙(閮洩鍩庣殑浠ｇ爜)
- /// </summary>
- private void Add_Scene()
- {
- var scene = new Device.Category.CategoryAddScene();
- UserView.HomePage.Instance.AddChidren(scene);
- UserView.HomePage.Instance.PageIndex += 1;
- scene.Show();
- scene.AddAction = () =>
- {
- //鍒锋柊bodyView
- this.RefreshBodyView();
- };
- }
-
- /// <summary>
- /// 娣诲姞鑷姩鍖�(閮洩鍩庣殑浠ｇ爜)
- /// </summary>
- private void Add_Automation()
- {
- Shared.Phone.Device.Logic.SkipView.SkipAddLogic(0);
}
#endregion
--
Gitblit v1.8.0