From c7f6a15a17344e55f0c2349392501100ba2a206e Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 27 九月 2021 09:33:27 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs
index f75583a..cc204e9 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs
@@ -45,7 +45,8 @@
//banbenshengjiFL.frameLayout.Y = editNameFLayout.frameLayout.Bottom;
//viewLayout.AddChidren(banbenshengjiFL.FLayoutView());
- var versions = Pir.currPir.versions.Find((c)=>c.module== "fw_version");
+
+ var versions = Pir.currPir.versions.Find((c) => c.module == "FW");
if (versions == null)
{
versions = new Entity.VersionInfo();
@@ -53,10 +54,15 @@
///鐗堟湰鍙�:v1.3.5
FrameLayout50 banbenhaoFLayout = new FrameLayout50();
banbenhaoFLayout.btnNextIcon.Visible = false;
- banbenhaoFLayout.btnText.Text = Language.StringByID(StringId.banbenhao) + ":"+ versions.version;
+ banbenhaoFLayout.btnText.Text = Language.StringByID(StringId.banbenhao) + ":";// + versions.version;
+ banbenhaoFLayout.btnEditText.Text = versions.version;
+ banbenhaoFLayout.btnEditText.TextAlignment = TextAlignment.CenterRight;
+ banbenhaoFLayout.btnEditText.X = Application.GetRealWidth(357 - 200 - 16);
+ banbenhaoFLayout.btnEditText.Width = Application.GetRealWidth(200);
banbenhaoFLayout.btnText.Width = Application.GetRealWidth(280);
banbenhaoFLayout.frameLayout.Y = editNameFLayout.frameLayout.Bottom;// banbenshengjiFL.frameLayout.Bottom;
viewLayout.AddChidren(banbenhaoFLayout.FLayoutView());
+
//鍒犻櫎
FrameLayout frameLayout = new FrameLayout
{
--
Gitblit v1.8.0