From 7584dea0241cefc276a4b5311331aee1dcda6c80 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 16 三月 2021 11:44:41 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs | 89 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 83 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs
index ac1b20d..3958f65 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs
@@ -8,10 +8,24 @@
{
public AddControlComplete()
{
- Tag = "Pir";
+ Tag = "PirView";
}
public void Show(Control control, bool bool_library)
{
+ //鏁版嵁杞崲
+ Entity.Function function = new Entity.Function();
+ {
+ function.sid = control.sid;
+ function.deviceId = control.deviceId;
+ function.name = control.name;
+ function.spk = control.spk;
+ //function.attributes.AddRange(control.status);
+ //閬ユ帶鍣ㄦ坊鍔犲埌鍒楄〃锛�
+ if (null == Pir.currPir.FunctioList.Find((c) => c.sid == function.sid))
+ {
+ Pir.currPir.FunctioList.Add(function);
+ }
+ }
#region 鐣岄潰甯冨眬
this.BackgroundColor = CSS.CSS_Color.viewMiddle;
PirDevice.View.TopView topView = new View.TopView();
@@ -76,12 +90,71 @@
this.AddChidren(namePatchView.FLayoutView());
namePatchView.btnText1.TextID = StringId.yaokongqimingcheng;
namePatchView.btnText2.Text = control.name;
+ namePatchView.btnClick.MouseUpEventHandler += (sender,e) => {
+
+ List<string> list = new List<string>();
+
+ for (int i = 0; i < Pir.currPir.FunctioList.Count; i++)
+ {
+ list.Add(Pir.currPir.FunctioList[i].name);
+ }
+ Method method = new Method();
+ method.EditControlName(StringId.editName, list, control.name, (name, view) =>
+ {
+ //鍔犺浇log
+ Loading loading = new Loading();
+ view.AddChidren(loading);
+ HDL_ON.DAL.Server.ResponsePackNew responsePackNew = null;
+ loading.Start();
+ new System.Threading.Thread(() =>
+ {
+ try
+ {
+ responsePackNew = PirSend.DeviceRename(control.deviceId, control.name);
+ }
+ catch { }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ loading.Hide();
+ if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
+ {
+ view.Close();
+ namePatchView.btnText2.Text = name;
+ function.name = name;
+ }
+ else
+ {
+ Method methodError = new Method();
+ methodError.ErrorShow(responsePackNew);
+ }
+
+ });
+ }
+
+ })
+ { IsBackground = true }.Start();
+
+
+ }, () => { });
+ };
//鎵�灞炲尯鍩�
View.PatchView quyuPatchView = new View.PatchView();
quyuPatchView.frameLayout.Y = namePatchView.frameLayout.Bottom;
this.AddChidren(quyuPatchView.FLayoutView());
quyuPatchView.btnText1.TextID = StringId.suoshuquyu;
- quyuPatchView.btnText2.TextID = StringId.dianqi;
+ quyuPatchView.btnText2.Text=Intelligence.Automation.LogicMethod.GetGetRoomName(function);
+ quyuPatchView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ Method method = new Method();
+ method.ManagementPosition(function, () =>
+ {
+ //鏇存柊鍖哄煙
+ quyuPatchView.btnText2.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(function);
+ });
+ };
+
//缁х画娣诲姞
Button addBtn = new Button
@@ -116,10 +189,10 @@
else
{
Method method = new Method();
- method.AddControl(this, (control1) => {
+ method.AddControl(this, (controlDevice) => {
AddButton addButton = new AddButton();
MainPage.BasePageView.AddChidren(addButton);
- addButton.Show(control1);
+ addButton.Show(controlDevice);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
});
}
@@ -127,8 +200,12 @@
//瀹屾垚鐐瑰嚮浜嬩欢
saveView.btnClick.MouseUpEventHandler += (sender, e) =>
{
- MainPage.BasePageView.RemoveViewByTag("AddControl");
- MainPage.BasePageView.RemoveViewByTag("Pir");
+ //鍓嶉潰鐣岄潰
+ // this.RemoveFromParent();
+ MainPage.BasePageView.RemoveViewByTag("PirView");
+ //涓荤晫闈�
+ MainPage.BasePageView.RemoveViewByTag("PirMain");
+
};
#endregion
}
--
Gitblit v1.8.0