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/EditControl.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/EditControl.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/EditControl.cs
index 09c130c..547e878 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/EditControl.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/EditControl.cs
@@ -43,7 +43,7 @@
//閬ユ帶鍣ㄦ墍灞炲尯鍩�:
FrameLayout50 areaFLayout = new FrameLayout50();
areaFLayout.btnText.Text = Language.StringByID(StringId.yaokongqiquyu);
- areaFLayout.btnEditText.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(control);
+ areaFLayout.btnEditText.Text = Intelligence.Automation.LogicMethod.CurrLogicMethod.GetGetRoomName(control);
areaFLayout.frameLayout.Y = editNameFLayout.frameLayout.Bottom;
viewLayout.AddChidren(areaFLayout.FLayoutView());
#endregion
@@ -57,10 +57,10 @@
{
list.Add(Pir.currPir.FunctioList[i].name);
}
- Method method = new Method();
+ PirMethod method = new PirMethod();
method.EditControlName(StringId.editName,list, control.name, (name, dialog) =>
{
- Method.ThreadSend(new Control { deviceId = control.deviceId, name = name }, (responsePackNew) =>
+ PirMethod.ThreadSend(new Control { deviceId = control.deviceId, name = name }, (responsePackNew) =>
{
dialog.Close();
editNameFLayout.btnEditText.Text = name;
@@ -73,11 +73,11 @@
//閬ユ帶鍣ㄦ墍灞炲尯鍩熼�変腑浜嬩欢
areaFLayout.btnClick.MouseUpEventHandler += (sender, e) =>
{
- Method method = new Method();
+ PirMethod method = new PirMethod();
method.ManagementPosition(control, () =>
{
//鏇存柊鍖哄煙
- areaFLayout.btnEditText.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(control);
+ areaFLayout.btnEditText.Text = Intelligence.Automation.LogicMethod.CurrLogicMethod.GetGetRoomName(control);
});
};
#endregion
--
Gitblit v1.8.0