From 45e4e387f3ef259b9e225fdd543e20be285a5112 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 29 十月 2019 13:42:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
index 54dd41d..5fc1f2c 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -161,7 +161,7 @@
};
deviceframelayout.AddChidren(devicerow);
-
+
///璁惧鐘舵�佹潯浠�
var btndevice = new Button {
//Text = "璁惧鐘舵�佹潯浠�",
@@ -183,11 +183,6 @@
EventHandler<MouseEventArgs> devicestateclick = (sender, e) =>
{
- Common.Logic.LogicDviceList.Clear();
- if (Common.Logic.LogicDviceList.Count == 0)
- {
- Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
- }
var deviceStateCondition = new DeviceStateCondition();
UserView.HomePage.Instance.AddChidren(deviceStateCondition);
UserView.HomePage.Instance.PageIndex += 1;
@@ -360,7 +355,7 @@
existencerowlayout.MouseUpEventHandler += logicclick;
#endregion
-
+
#endregion
@@ -701,7 +696,7 @@
UserView.HomePage.Instance.PageIndex += 1;
logicCommunalPage.Show(() => { });
};
-
+
}
/// <summary>
/// 鍦扮悊鍥存爮View
@@ -785,7 +780,7 @@
typeRow.AddChidren(Btncomplete);
#endregion
- #region ------鍦ㄥ 绂诲
+ #region ------鍦ㄥ 绂诲
#region ------鍦ㄥ
var athomeFrameLayout = new FrameLayout
@@ -819,7 +814,7 @@
athomeRowLayout.AddChidren(athomeSelected);
#endregion
- #region -------绂诲
+ #region -------绂诲
var leavehomeFrameLayout = new FrameLayout
{
Height = Application.GetRealHeight(160),
@@ -1063,14 +1058,14 @@
Width = Application.GetRealWidth(200),
TextAlignment = TextAlignment.CenterRight,
X = Btntitle.Right + Application.GetRealWidth(100),
-
+
};
timetype.AddChidren(Btncomplete);
#endregion
#region -------绔嬪嵆鎵ц 鏃堕棿鑼冨洿
- #region -------绔嬪嵆鎵ц
+ #region -------绔嬪嵆鎵ц
var timepointFrameLayout = new FrameLayout
{
Height = Application.GetRealHeight(160),
@@ -1136,7 +1131,7 @@
time1row.AddChidren(timeSelected);
#endregion
-
+
///绔嬪嵆鎵ц鐐瑰嚮浜嬩欢
EventHandler<MouseEventArgs> timepointclick = (sedner14, e14) =>
{
--
Gitblit v1.8.0