From a4924de3136289d10cabbf2f61a228387d44ded7 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 07 十一月 2019 13:48:36 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
index e31d18c..aeb5b99 100644
--- a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
@@ -311,7 +311,7 @@
}
});
}
-
+
}
/// <summary>
/// Changeds the IL ogic status.
@@ -919,7 +919,7 @@
/// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
private void GoToAddGateWay(object sender, MouseEventArgs mouseEventArgs)
{
- var selectNewGateWayForm = new UserCenter.GatewayAdd.NewGateWaySelectForm { };
+ var selectNewGateWayForm = new UserCenter.GatewayAdd.NewGateWayMenuSelectForm { };
selectNewGateWayForm.AddForm(selectNewGateWayForm);
}
@@ -972,7 +972,7 @@
else
{
deviceVerticalScrolViewLayout = new VerticalScrolViewLayout { };
-
+
functionSceneBodyView.AddChidren(deviceVerticalScrolViewLayout);
for(int i=0;i<deviceList.Count;i++)
{
@@ -996,7 +996,7 @@
deviceVerticalScrolViewLayout.AddChidren(itemView);
}
-
+
//鍒犻櫎璁惧
EventHandler<MouseEventArgs> delEvent = (sender, e) =>
{
--
Gitblit v1.8.0