From 8123d0298c0fed448bddc956059126a4875782c2 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 23 三月 2021 18:02:38 +0800
Subject: [PATCH] 2021-3-23-2
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs
index 95a465b..40ae860 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs
@@ -12,16 +12,17 @@
{
Tag = "PirMain";
}
-
+ Action backAction;
public void Show(Action action)
{
+ 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();
+ //action();
RemoveFromParent();
};
topView.topNameBtn.TextID = StringId.setlogic;
@@ -46,10 +47,16 @@
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)
+ {
+ versions = new Entity.VersionInfo();
+ }
///鐗堟湰鍙�:v1.3.5
FrameLayout50 banbenhaoFLayout = new FrameLayout50();
banbenhaoFLayout.btnNextIcon.Visible = false;
- banbenhaoFLayout.btnText.Text = Language.StringByID(StringId.banbenhao) + ":v1.3.5";
+ banbenhaoFLayout.btnText.Text = Language.StringByID(StringId.banbenhao) + ":"+ versions.version;
banbenhaoFLayout.frameLayout.Y = banbenshengjiFL.frameLayout.Bottom;
viewLayout.AddChidren(banbenhaoFLayout.FLayoutView());
//鍒犻櫎
@@ -129,6 +136,13 @@
#endregion
}
-
+ /// <summary>
+ /// 绉婚櫎鐣岄潰
+ /// </summary>
+ public override void RemoveFromParent()
+ {
+ backAction();
+ base.RemoveFromParent();
+ }
}
}
--
Gitblit v1.8.0