From 9acd3887f1f8db40d59f991b1726a61aa7c7637c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 五月 2021 15:13:56 +0800
Subject: [PATCH] Merge branch 'CJL' into wxr4
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs | 33 ++++++++++++---------------------
1 files changed, 12 insertions(+), 21 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs
index 40ae860..74c6a9e 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs
@@ -10,19 +10,16 @@
{
public SetPir()
{
- Tag = "PirMain";
+ Tag = "PirView";
}
- Action backAction;
- public void Show(Action action)
+ public void Show()
{
- backAction = action;
#region 鐣岄潰甯冨眬
this.BackgroundColor = CSS.CSS_Color.viewMiddle;
Intelligence.Automation.LogicView.TopView topView = new Intelligence.Automation.LogicView.TopView();
this.AddChidren(topView.FLayoutView());
topView.clickBackBtn.MouseUpEventHandler += (e, sen) =>
{
- //action();
RemoveFromParent();
};
topView.topNameBtn.TextID = StringId.setlogic;
@@ -42,11 +39,11 @@
editNameFLayout.btnNextIcon.Width = Application.GetRealWidth(28);
editNameFLayout.btnNextIcon.UnSelectedImagePath = "LogicIcon/editname.png";
viewLayout.AddChidren(editNameFLayout.FLayoutView());
- ///鐗堟湰鍗囩骇
- FrameLayout50 banbenshengjiFL = new FrameLayout50();
- banbenshengjiFL.btnText.Text = Language.StringByID(StringId.banbenshengji);
- banbenshengjiFL.frameLayout.Y = editNameFLayout.frameLayout.Bottom;
- viewLayout.AddChidren(banbenshengjiFL.FLayoutView());
+ /////鐗堟湰鍗囩骇
+ //FrameLayout50 banbenshengjiFL = new FrameLayout50();
+ //banbenshengjiFL.btnText.Text = Language.StringByID(StringId.banbenshengji);
+ //banbenshengjiFL.frameLayout.Y = editNameFLayout.frameLayout.Bottom;
+ //viewLayout.AddChidren(banbenshengjiFL.FLayoutView());
var versions = Pir.currPir.versions.Find((c)=>c.module== "fw_version");
if (versions == null)
@@ -57,7 +54,7 @@
FrameLayout50 banbenhaoFLayout = new FrameLayout50();
banbenhaoFLayout.btnNextIcon.Visible = false;
banbenhaoFLayout.btnText.Text = Language.StringByID(StringId.banbenhao) + ":"+ versions.version;
- banbenhaoFLayout.frameLayout.Y = banbenshengjiFL.frameLayout.Bottom;
+ banbenhaoFLayout.frameLayout.Y = editNameFLayout.frameLayout.Bottom;// banbenshengjiFL.frameLayout.Bottom;
viewLayout.AddChidren(banbenhaoFLayout.FLayoutView());
//鍒犻櫎
FrameLayout frameLayout = new FrameLayout
@@ -113,16 +110,8 @@
Pir.pirDeviceList.Remove(Pir.currPir);
}
dialog.Close();
- action();
this.RemoveFromParent();
- for (int i = MainPage.BasePageView.ChildrenCount - 1; 0 <= i; i--)
- {
- var view = MainPage.BasePageView.GetChildren(i);
- if (view.GetType() == typeof(PirMain))
- {
- view.RemoveFromParent();
- }
- }
+ Method.RemoveView("PirMain");
}, "鍒犻櫎", "dialog", null, dialog);
}, () =>
@@ -141,8 +130,10 @@
/// </summary>
public override void RemoveFromParent()
{
- backAction();
+ //鍒锋柊PirMain鐣岄潰
+ Method.RefreshView("PirMain");
base.RemoveFromParent();
+
}
}
}
--
Gitblit v1.8.0