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/AddControlComplete.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs
index ba1829d..c770e5a 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs
@@ -82,7 +82,7 @@
quyuPatchView.frameLayout.Y = namePatchView.frameLayout.Bottom;
this.AddChidren(quyuPatchView.FLayoutView());
quyuPatchView.btnText1.TextID = StringId.suoshuquyu;
- quyuPatchView.btnText2.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(GetFunction(control.deviceId));
+ quyuPatchView.btnText2.Text = Intelligence.Automation.LogicMethod.CurrLogicMethod.GetGetRoomName(GetFunction(control.deviceId));
//缁х画娣诲姞
Button addBtn = new Button
@@ -113,11 +113,11 @@
//娣诲姞鎵�鏈夐仴鎺у悕绉板垪琛�
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();
@@ -133,11 +133,11 @@
//鎵�灞炲尯鍩熺偣鍑讳簨浠�
quyuPatchView.btnClick.MouseUpEventHandler += (sender, e) =>
{
- Method method = new Method();
+ PirMethod method = new PirMethod();
method.ManagementPosition(GetFunction(control.deviceId), () =>
{
//鏇存柊鍖哄煙
- quyuPatchView.btnText2.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(GetFunction(control.deviceId));
+ quyuPatchView.btnText2.Text = Intelligence.Automation.LogicMethod.CurrLogicMethod.GetGetRoomName(GetFunction(control.deviceId));
});
};
//缁х画娣诲姞鐐瑰嚮浜嬩欢
@@ -145,12 +145,12 @@
{
if (bool_library)
{//缁х画娣诲姞搴撶殑閬ユ帶鍣�
- Method.RefreshView("PirMain");//鍒锋柊鎸囩偣鐣岄潰
+ PirMethod.RefreshView("PirMain");//鍒锋柊鎸囩偣鐣岄潰
this.RemoveFromParent();
}
else
{//缁х画娣诲姞鑷畾涔夌殑閬ユ帶鍣�
- Method method = new Method();
+ PirMethod method = new PirMethod();
method.AddControl(this, (controlDevice) =>
{
AddButton addButton = new AddButton();
@@ -164,7 +164,7 @@
saveView.btnClick.MouseUpEventHandler += (sender, e) =>
{
//鍒锋柊鎸囩偣鐣岄潰
- Method.RefreshView("PirMain");
+ PirMethod.RefreshView("PirMain");
//绉婚櫎鎵�鏈夌晫闈�
MainPage.BasePageView.RemoveViewByTag("PirView");
};
@@ -191,7 +191,7 @@
public override void RemoveFromParent()
{
//鍒锋柊鎸囧畾鐣岄潰
- Method.RefreshView("PirMain");
+ PirMethod.RefreshView("PirMain");
base.RemoveFromParent();
}
}
--
Gitblit v1.8.0