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 | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs
index 74c6a9e..f75583a 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs
@@ -54,6 +54,7 @@
FrameLayout50 banbenhaoFLayout = new FrameLayout50();
banbenhaoFLayout.btnNextIcon.Visible = false;
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());
//鍒犻櫎
@@ -81,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;
@@ -102,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)
@@ -111,7 +112,7 @@
}
dialog.Close();
this.RemoveFromParent();
- Method.RemoveView("PirMain");
+ PirMethod.RemoveView("PirMain");
}, "鍒犻櫎", "dialog", null, dialog);
}, () =>
@@ -131,7 +132,7 @@
public override void RemoveFromParent()
{
//鍒锋柊PirMain鐣岄潰
- Method.RefreshView("PirMain");
+ PirMethod.RefreshView("PirMain");
base.RemoveFromParent();
}
--
Gitblit v1.8.0