From c1de48884fa145a16a0f8bcee93274dcfaa0ff82 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 07 五月 2020 10:40:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
index 5e7bdea..51f374d 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -27,7 +27,7 @@
var middle = new FrameLayout
{
Y = view.topRowLayout.Bottom,
- Height = Application.GetRealHeight(1920 - 184),
+ Height = Application.GetRealHeight(Method.H - 184),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
this.AddChidren(middle);
@@ -490,6 +490,7 @@
/// </summary>
void TimeView()
{
+
UserView.HomePage.Instance.ScrollEnabled = false;
Dictionary<string, string> SecurityConditionsInfo = new Dictionary<string, string>();
#region ------鐣岄潰甯冨眬閮ㄥ垎
--
Gitblit v1.8.0