From 3272ca5b51e19f7f8a827b0f68400570a547fe60 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 28 四月 2020 15:02:44 +0800
Subject: [PATCH] 2020-04-28-1
---
ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
old mode 100644
new mode 100755
index d781ff4..9c244a8
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
@@ -47,7 +47,7 @@
var middle = new VerticalScrolViewLayout
{
Y = view.topRowLayout.Bottom,
- Height = Application.GetRealHeight(1920 - 184 - 180),
+ Height = Application.GetRealHeight(Method.H - 184 - 180),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
this.AddChidren(middle);
@@ -215,7 +215,7 @@
{
var deviceinof = Method.GetCommonDevice(conditions["MacAddr"], conditions["Epoint"]);
selecteddevice.deviceNameBtn.Visible = true;
- selecteddevice.deviceNameBtn.Text = deviceinof.DeviceEpointName;
+ selecteddevice.deviceNameBtn.Text = LocalDevice.Current.GetDeviceEpointName(deviceinof);
selecteddevice.regionNameBtn.Visible = true;
Method.RoomNmae(selecteddevice.regionNameBtn, deviceinof);
selecteddevice.iconBtn.UnSelectedImagePath ="ZigeeLogic/sensor13.png";
@@ -289,10 +289,11 @@
alert.ConfirmClickEvent += () =>
{
Common.Logic.CurrentLogic.Conditions.Remove(conditions);
- var templatePage = new TemplatePage();
- UserView.HomePage.Instance.AddChidren(templatePage);
- UserView.HomePage.Instance.PageIndex += 1;
- templatePage.Show();
+ selecteddevice.selecetdFrameLayout.RemoveFromParent();
+ //var templatePage = new TemplatePage();
+ //UserView.HomePage.Instance.AddChidren(templatePage);
+ //UserView.HomePage.Instance.PageIndex += 1;
+ //templatePage.Show();
};
};
}
@@ -356,7 +357,7 @@
{
var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
actiondevice.deviceNameBtn.Visible = true;
- actiondevice.deviceNameBtn.Text = deviceinof.DeviceEpointName;
+ actiondevice.deviceNameBtn.Text = LocalDevice.Current.GetDeviceEpointName(deviceinof);
actiondevice.regionNameBtn.Visible = true;
Method.RoomNmae(actiondevice.regionNameBtn, deviceinof);
switch (deviceinof.Type)
@@ -418,10 +419,11 @@
alert.ConfirmClickEvent += () =>
{
Common.Logic.CurrentLogic.Actions.Remove(actions);
- var templatePage = new TemplatePage();
- UserView.HomePage.Instance.AddChidren(templatePage);
- UserView.HomePage.Instance.PageIndex += 1;
- templatePage.Show();
+ actiondevice.selecetdFrameLayout.RemoveFromParent();
+ //var templatePage = new TemplatePage();
+ //UserView.HomePage.Instance.AddChidren(templatePage);
+ //UserView.HomePage.Instance.PageIndex += 1;
+ //templatePage.Show();
};
};
@@ -432,11 +434,11 @@
#region -----姣忓ぉ 璁剧疆鍛ㄦ湡-----
- var fraline1 = new FrameLayout
+ var fraHeight = new FrameLayout
{
Height = Application.GetRealHeight(30),
};
- middle.AddChidren(fraline1);
+ middle.AddChidren(fraHeight);
LogicView.Addview weekview = new LogicView.Addview();
--
Gitblit v1.8.0