From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs | 54 ++++++++++++++++++++++++++++++------------------------
1 files changed, 30 insertions(+), 24 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..f75583a 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs
@@ -10,10 +10,9 @@
{
public SetPir()
{
- Tag = "PirMain";
+ Tag = "PirView";
}
-
- public void Show(Action action)
+ public void Show()
{
#region 鐣岄潰甯冨眬
this.BackgroundColor = CSS.CSS_Color.viewMiddle;
@@ -21,7 +20,6 @@
this.AddChidren(topView.FLayoutView());
topView.clickBackBtn.MouseUpEventHandler += (e, sen) =>
{
- action();
RemoveFromParent();
};
topView.topNameBtn.TextID = StringId.setlogic;
@@ -41,16 +39,23 @@
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.btnText.Width = Application.GetRealWidth(280);
+ banbenhaoFLayout.frameLayout.Y = editNameFLayout.frameLayout.Bottom;// banbenshengjiFL.frameLayout.Bottom;
viewLayout.AddChidren(banbenhaoFLayout.FLayoutView());
//鍒犻櫎
FrameLayout frameLayout = new FrameLayout
@@ -77,10 +82,10 @@
editNameFLayout.btnClick.MouseUpEventHandler += (sender, e) =>
{
List<string> list = new List<string>();
- Method method = new Method();
+ PirMethod method = new PirMethod();
method.EditControlName(StringId.editName, list, Pir.currPir.name, (name, dialog) =>
{
- Method.ThreadSend(new Control { deviceId = Pir.currPir.deviceId, name = name }, (responsePackNew) =>
+ PirMethod.ThreadSend(new Control { deviceId = Pir.currPir.deviceId, name = name }, (responsePackNew) =>
{
dialog.Close();
editNameFLayout.btnEditText.Text = name;
@@ -98,7 +103,7 @@
tipPopView.TipBox(StringId.tip, text, (dialog) =>
{
- Method.ThreadSend(new Control { deviceId = Pir.currPir.deviceId }, (responsePackNew) =>
+ PirMethod.ThreadSend(new Control { deviceId = Pir.currPir.deviceId }, (responsePackNew) =>
{
var pir = Pir.pirDeviceList.Find((c) => c.deviceId == Pir.currPir.deviceId);
if (pir != null)
@@ -106,16 +111,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();
- }
- }
+ PirMethod.RemoveView("PirMain");
}, "鍒犻櫎", "dialog", null, dialog);
}, () =>
@@ -129,6 +126,15 @@
#endregion
}
-
+ /// <summary>
+ /// 绉婚櫎鐣岄潰
+ /// </summary>
+ public override void RemoveFromParent()
+ {
+ //鍒锋柊PirMain鐣岄潰
+ PirMethod.RefreshView("PirMain");
+ base.RemoveFromParent();
+
+ }
}
}
--
Gitblit v1.8.0