From e96e11d6f8b965ea522c983e040d41e3b9ef105a Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 18 五月 2020 21:33:19 +0800
Subject: [PATCH] 2020-05-18-4
---
ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
index fd0135f..5b02be1 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -19,7 +19,7 @@
public void Show()
{
-
+
#region 鐣岄潰鐨勫竷灞�浠ｇ爜
TopView view = new TopView();
this.AddChidren(view.TopRowView());
@@ -29,7 +29,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);
@@ -74,6 +74,7 @@
UserView.HomePage.Instance.PageIndex += 1;
roomAndDeviceView.IfType = LogicView.IfString.Condition_Logic;
roomAndDeviceView.Show(Language.StringByID(MyInternationalizationString.devicestate));
+
};
securityView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
@@ -483,7 +484,7 @@
UserView.HomePage.Instance.AddChidren(logicCommunalPage);
UserView.HomePage.Instance.PageIndex += 1;
logicCommunalPage.Show(() => { });
- }, strname, true, latitude, longitude, r);
+ }, strname, Language.StringByID(R.MyInternationalizationString.uSave), true, latitude, longitude, r);
};
}
@@ -492,6 +493,7 @@
/// </summary>
void TimeView()
{
+
UserView.HomePage.Instance.ScrollEnabled = false;
Dictionary<string, string> SecurityConditionsInfo = new Dictionary<string, string>();
#region ------鐣岄潰甯冨眬閮ㄥ垎
--
Gitblit v1.8.0