From 18d4b849131c1d44b0a8dc1abee4a57207d1c497 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 11 十一月 2019 17:23:59 +0800
Subject: [PATCH] 2019-11-11-1
---
ZigbeeApp/Shared/Phone/Device/Category/Category.cs | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
old mode 100755
new mode 100644
index 7150dfc..5a338c3
--- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
@@ -450,7 +450,7 @@
/// <param name="selectedBtn">閫変腑閭ｄ釜鐣岄潰 0--鍔熻兘 1--鍦烘櫙 2--鑷姩鍖� </param>
public void Show(int selectedBtn = 1)
{
-
+
ZbGateway.StatusList.Add(this);
RemoveAll();
@@ -653,11 +653,12 @@
/// <param name="sender">Sender.</param>
/// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
private void AutomationBtn_MouseUpEventHandler(object sender, MouseEventArgs mouseEventArgs)
- {
- Common.Logic.LogicDviceList.Clear();
- if (Common.Logic.LogicDviceList.Count == 0)
- {
- Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
+ {
+ ///绗竴娆¤繘鏉ュ垵濮嬪寲璁惧鍒楄〃锛�
+ Common.Logic.LogicDviceList.Clear();
+ if (Common.Logic.LogicDviceList.Count == 0)
+ {
+ Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
}
functionBtn.IsSelected = false;
sceneBtn.IsSelected = false;
@@ -747,6 +748,7 @@
{
HidenFloor(true);
ShowAutotion();
+
}
}
@@ -1421,6 +1423,8 @@
ShowSameTypeFunction(functionTypeIMG.ImageBtn, null);
}
}
+
+
}
}
@@ -1485,7 +1489,7 @@
{
RefreshFunction(room);
}
-
+
}
roomBtn.MouseUpEventHandler += (sender, e) =>
{
@@ -1506,7 +1510,7 @@
}
};
}
-
+
}
#endregion
@@ -1591,7 +1595,7 @@
Tag = scene
};
leftFL.AddChidren(collectionBtn);
-
+
var sceneNameBtn = new Button()
{
Width = Application.GetRealWidth(176),
@@ -1740,7 +1744,7 @@
}
};
}
-
+
};
deleteBtn.MouseUpEventHandler += delEvent;
//缂栬緫鍦烘櫙
@@ -1802,7 +1806,7 @@
/// 鑷姩鍖�
/// </summary>
private async void ShowAutotion()
- {
+ {
functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
var bjFrameLayout = new FrameLayout
@@ -1982,7 +1986,7 @@
//鑷姩鍖�
Automationview(logicScrolView);
CommonPage.Loading.Hide();
-
+
}
/// <summary>
@@ -2590,6 +2594,6 @@
#endregion
-
+
}
}
--
Gitblit v1.8.0