From a4d525d08da7b6fb985b0069c539c11b06306a9b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 13 十一月 2019 16:28:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/Shared/Phone/Device/Category/Category.cs | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 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 d725284..dd648c0
--- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
@@ -648,11 +648,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;
@@ -742,6 +743,7 @@
{
HidenFloor(true);
ShowAutotion();
+
}
}
@@ -1430,6 +1432,8 @@
ShowSameTypeFunction(functionTypeIMG.ImageBtn, null);
}
}
+
+
}
}
@@ -1494,7 +1498,7 @@
{
RefreshFunction(room);
}
-
+
}
roomBtn.MouseUpEventHandler += (sender, e) =>
{
@@ -1515,7 +1519,7 @@
}
};
}
-
+
}
#endregion
@@ -1600,7 +1604,7 @@
Tag = scene
};
leftFL.AddChidren(collectionBtn);
-
+
var sceneNameBtn = new Button()
{
Width = Application.GetRealWidth(176),
@@ -1762,7 +1766,7 @@
}
};
}
-
+
};
deleteBtn.MouseUpEventHandler += delEvent;
//缂栬緫鍦烘櫙
@@ -1819,12 +1823,11 @@
#endregion
#region 鈼� 鑷姩鍖朹_________________________
-
/// <summary>
/// 鑷姩鍖�
/// </summary>
private async void ShowAutotion()
- {
+ {
functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
var bjFrameLayout = new FrameLayout
@@ -2004,9 +2007,8 @@
//鑷姩鍖�
Automationview(logicScrolView);
CommonPage.Loading.Hide();
-
- }
+ }
/// <summary>
/// 鑷姩鍖栧垪琛ㄧ晫闈�
/// </summary>
@@ -2612,6 +2614,6 @@
#endregion
-
+
}
}
--
Gitblit v1.8.0