From c0ce2f57a4f836ebeb9e7b8b4b5a4407fd78dc86 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 23 九月 2020 10:06:05 +0800
Subject: [PATCH] 上传
---
ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
index 5e7bdea..adbd012 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -7,6 +7,7 @@
using ZigBee.Device;
using Shared.Phone.Device.Logic.LogicView;
+
namespace Shared.Phone.Device.Logic
{
@@ -18,16 +19,17 @@
}
public void Show()
{
+
#region 鐣岄潰鐨勫竷灞�浠ｇ爜
TopView view = new TopView();
this.AddChidren(view.TopRowView());
view.toptitleNameBtn.TextID = MyInternationalizationString.selection;
- view.clickBtn.MouseDownEventHandler += (sender, e) => { RemoveFromParent(); };
+ view.clickBtn.MouseDownEventHandler += (sender, e) => { RemoveFromParent(); };
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);
@@ -72,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) =>
{
@@ -475,8 +478,10 @@
accounts.Add("Latitude", latitudW.ToString());
accounts.Add("Longitude", longitudeH.ToString());
accounts.Add("Radius", mRadius.ToString());
+
LogicIfon.Addaccounts(accounts);
LogicIfon.AddLocationconditions(LocationConditionsInfo);
+
var logicCommunalPage = new LogicCommunalPage();
UserView.HomePage.Instance.AddChidren(logicCommunalPage);
UserView.HomePage.Instance.PageIndex += 1;
@@ -490,6 +495,7 @@
/// </summary>
void TimeView()
{
+
UserView.HomePage.Instance.ScrollEnabled = false;
Dictionary<string, string> SecurityConditionsInfo = new Dictionary<string, string>();
#region ------鐣岄潰甯冨眬閮ㄥ垎
@@ -571,6 +577,7 @@
};
}
+
}
}
--
Gitblit v1.8.0