From 9904031f5291daaf56985146bb671f25e18ebbdf Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 02 四月 2020 19:51:31 +0800
Subject: [PATCH] 最新代码
---
ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
index d781ff4..4e7e1b2 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
@@ -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