From 5a53603b124acf4599b3397148f8574ac873eecb Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 04 十二月 2019 17:57:11 +0800
Subject: [PATCH] 2019-12-04-2
---
ZigbeeApp/Shared/Phone/Device/Category/Category.cs | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
index 3169618..8ca5e13 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
@@ -667,12 +667,11 @@
/// <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;
@@ -762,7 +761,6 @@
{
HidenFloor(true);
ShowAutotion();
-
}
}
@@ -1524,8 +1522,6 @@
ShowSameTypeFunction(functionTypeIMG.ImageBtn, null);
}
}
-
-
}
}
@@ -1744,11 +1740,12 @@
#endregion
#region 鈼� 鑷姩鍖朹_________________________
+
/// <summary>
/// 鑷姩鍖�
/// </summary>
private async void ShowAutotion()
- {
+ {
functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
var bjFrameLayout = new FrameLayout
@@ -1761,7 +1758,7 @@
Y = Application.GetRealHeight(30),
};
functionSceneAutoBodyView.AddChidren(bjFrameLayout);
- bjFrameLayout.SetCornerWithSameRadius(25, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerBottomLeft);
+ bjFrameLayout.SetCornerWithSameRadius(Application.GetRealHeight(58),HDLUtils.RectCornerBottomLeft);
var sigBtn = new Button
{
Width = Application.GetMinRealAverage(84),
@@ -1816,7 +1813,7 @@
Y = scenehorizontalScrol.Bottom,
};
functionSceneAutoBodyView.AddChidren(logicScrolView);
- logicScrolView.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerBottomLeft);
+ logicScrolView.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
recommendswitchBtn.MouseUpEventHandler += (sender, e) =>
@@ -1931,8 +1928,9 @@
//鑷姩鍖�
Automationview(logicScrolView);
CommonPage.Loading.Hide();
-
+
}
+
/// <summary>
/// 鑷姩鍖栧垪琛ㄧ晫闈�
/// </summary>
@@ -2539,6 +2537,6 @@
#endregion
-
+
}
}
--
Gitblit v1.8.0