From d2173d587656c744f2caca25c0f522afd5216154 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 24 三月 2021 16:27:25 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 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..ab952eb 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;
@@ -41,16 +42,22 @@
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)
+ {
+ 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.frameLayout.Y = banbenshengjiFL.frameLayout.Bottom;
+ banbenhaoFLayout.btnText.Text = Language.StringByID(StringId.banbenhao) + ":"+ versions.version;
+ banbenhaoFLayout.frameLayout.Y = editNameFLayout.frameLayout.Bottom;// banbenshengjiFL.frameLayout.Bottom;
viewLayout.AddChidren(banbenhaoFLayout.FLayoutView());
//鍒犻櫎
FrameLayout frameLayout = new FrameLayout
@@ -129,6 +136,13 @@
#endregion
}
-
+ /// <summary>
+ /// 绉婚櫎鐣岄潰
+ /// </summary>
+ public override void RemoveFromParent()
+ {
+ backAction();
+ base.RemoveFromParent();
+ }
}
}
--
Gitblit v1.8.0