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/DeviceTarget.cs | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceTarget.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceTarget.cs
old mode 100644
new mode 100755
index 6d8fc64..5a9690d
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceTarget.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceTarget.cs
@@ -67,7 +67,7 @@
};
#endregion
-
+
var middle = new FrameLayout
{
Y = topRowLayout.Bottom,
@@ -76,7 +76,7 @@
};
this.AddChidren(middle);
- #region ----- 璁惧------
+ #region ----- 璁惧------
var deviceframelayout = new FrameLayout
{
Height = Application.GetRealHeight(160),
@@ -127,11 +127,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 logicDevicePage = new LogicDevicePage();
UserView.HomePage.Instance.AddChidren(logicDevicePage);
UserView.HomePage.Instance.PageIndex += 1;
@@ -207,7 +202,7 @@
sceneiconBtn.MouseUpEventHandler += sceneclick;
#endregion
- #region ----- 瀹夐槻妯″紡------
+ #region ----- 瀹夐槻妯″紡------
var securityframelayout = new FrameLayout
{
Height = Application.GetRealHeight(160),
@@ -269,7 +264,7 @@
securityrow.MouseUpEventHandler += securityclick;
#endregion
- #region ----- 宸叉湁鑷姩鍖�------
+ #region ----- 宸叉湁鑷姩鍖�------
///宸叉湁鑷姩鍖�
var existenceRowLayout = new RowLayout
@@ -380,6 +375,6 @@
#endregion
}
-
+
}
}
--
Gitblit v1.8.0