From 533735b4bbaea0f7a87ccd3d1781ea7d469f75b5 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 06 七月 2021 09:34:37 +0800
Subject: [PATCH] 合并乐橙代码
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/EditControl.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/EditControl.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/EditControl.cs
index 547e878..519e855 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/EditControl.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/EditControl.cs
@@ -11,7 +11,7 @@
{
Tag = "PirView";
}
- public void Show(Entity.Function control,Action<Entity.Function> action)
+ public void Show(Entity.Function control, Action<Entity.Function> action)
{
#region 鐣岄潰甯冨眬
this.BackgroundColor = CSS.CSS_Color.viewMiddle;
@@ -33,7 +33,7 @@
};
this.AddChidren(viewLayout);
//閬ユ帶鍣ㄥ悕绉�:
- FrameLayout50 editNameFLayout = new FrameLayout50();
+ FrameLayout50 editNameFLayout = new FrameLayout50();
editNameFLayout.btnText.Text = Language.StringByID(StringId.yaokongqimingcheng) + ":";
editNameFLayout.btnEditText.Text = control.name;
editNameFLayout.btnNextIcon.Height = Application.GetRealWidth(28);
@@ -41,9 +41,9 @@
editNameFLayout.btnNextIcon.UnSelectedImagePath = "LogicIcon/editname.png";
viewLayout.AddChidren(editNameFLayout.FLayoutView());
//閬ユ帶鍣ㄦ墍灞炲尯鍩�:
- FrameLayout50 areaFLayout = new FrameLayout50();
+ FrameLayout50 areaFLayout = new FrameLayout50();
areaFLayout.btnText.Text = Language.StringByID(StringId.yaokongqiquyu);
- areaFLayout.btnEditText.Text = Intelligence.Automation.LogicMethod.CurrLogicMethod.GetGetRoomName(control);
+ areaFLayout.btnEditText.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(control);
areaFLayout.frameLayout.Y = editNameFLayout.frameLayout.Bottom;
viewLayout.AddChidren(areaFLayout.FLayoutView());
#endregion
@@ -58,7 +58,7 @@
list.Add(Pir.currPir.FunctioList[i].name);
}
PirMethod method = new PirMethod();
- method.EditControlName(StringId.editName,list, control.name, (name, dialog) =>
+ method.EditControlName(StringId.editName, list, control.name, (name, dialog) =>
{
PirMethod.ThreadSend(new Control { deviceId = control.deviceId, name = name }, (responsePackNew) =>
{
@@ -67,8 +67,8 @@
control.name = name;
}, "淇敼鍚嶇О", "dialog", null, dialog);
-
- },()=> { });
+
+ }, () => { });
};
//閬ユ帶鍣ㄦ墍灞炲尯鍩熼�変腑浜嬩欢
areaFLayout.btnClick.MouseUpEventHandler += (sender, e) =>
@@ -77,7 +77,7 @@
method.ManagementPosition(control, () =>
{
//鏇存柊鍖哄煙
- areaFLayout.btnEditText.Text = Intelligence.Automation.LogicMethod.CurrLogicMethod.GetGetRoomName(control);
+ areaFLayout.btnEditText.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(control);
});
};
#endregion
--
Gitblit v1.8.0