From 9b44e30275621a48335fbea7b32b5065a2859c9c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 16 三月 2021 16:54:33 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs | 105 ++++++++++++++++++++++++++--------------------------
1 files changed, 53 insertions(+), 52 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs
index 6a20e68..6ea0cc1 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs
@@ -8,17 +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(function.attributes);
+ {
+ 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();
@@ -58,7 +65,7 @@
TextAlignment = TextAlignment.Center,
};
fLayout.AddChidren(text1Btn);
- //鍙埌鍒嗙被-鍔熻兘-鐢靛櫒鎿嶄綔浣跨敤
+ //鍙埌鍒嗙被-鍔熻兘-鎿嶄綔浣跨敤
Button text2Btn = new Button
{
Width = Application.GetRealWidth(375 - 32),
@@ -83,13 +90,41 @@
this.AddChidren(namePatchView.FLayoutView());
namePatchView.btnText1.TextID = StringId.yaokongqimingcheng;
namePatchView.btnText2.Text = control.name;
- namePatchView.btnClick.MouseUpEventHandler += (sender,e) => {
+
+ //鎵�灞炲尯鍩�
+ View.PatchView quyuPatchView = new View.PatchView();
+ quyuPatchView.frameLayout.Y = namePatchView.frameLayout.Bottom;
+ this.AddChidren(quyuPatchView.FLayoutView());
+ quyuPatchView.btnText1.TextID = StringId.suoshuquyu;
+ quyuPatchView.btnText2.Text=Intelligence.Automation.LogicMethod.GetGetRoomName(function);
+
+ //缁х画娣诲姞
+ Button addBtn = new Button
+ {
+ Y = quyuPatchView.frameLayout.Bottom + Application.GetRealHeight(125),
+ X = Application.GetRealWidth(16),
+ Width = Application.GetRealWidth(375 - 32),
+ Height = Application.GetRealHeight(20),
+ TextID = StringId.jixutianjia,
+ TextSize = TextSize.text14,
+ TextColor = CSS.CSS_Color.textConfirmColor,
+ TextAlignment = TextAlignment.Center,
+ };
+ this.AddChidren(addBtn);
+ //瀹屾垚
+ View.SaveView saveView = new View.SaveView();
+ this.AddChidren(saveView.FLayoutView());
+ saveView.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(24), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
+ #endregion
+ #region 鐣岄潰鐐瑰嚮浜嬩欢
+ //閬ユ帶鍣ㄥ悕绉扮偣鍑讳簨浠�
+ namePatchView.btnClick.MouseUpEventHandler += (sender, e) => {
List<string> list = new List<string>();
- for (int i = 0; i < Pir.currPir.FunctioList.Count; i++)
+ for (int i = 0; i < PirDevice.Pir.currPir.FunctioList.Count; i++)
{
- list.Add(Pir.currPir.FunctioList[i].name);
+ list.Add(PirDevice.Pir.currPir.FunctioList[i].name);
}
Method method = new Method();
method.EditControlName(StringId.editName, list, control.name, (name, view) =>
@@ -120,7 +155,7 @@
else
{
Method methodError = new Method();
- methodError.ErrorShow(responsePackNew);
+ methodError.ErrorShow(responsePackNew, "");
}
});
@@ -132,12 +167,7 @@
}, () => { });
};
- //鎵�灞炲尯鍩�
- View.PatchView quyuPatchView = new View.PatchView();
- quyuPatchView.frameLayout.Y = namePatchView.frameLayout.Bottom;
- this.AddChidren(quyuPatchView.FLayoutView());
- quyuPatchView.btnText1.TextID = StringId.suoshuquyu;
- quyuPatchView.btnText2.Text=Intelligence.Automation.LogicMethod.GetGetRoomName(function);
+ //鎵�灞炲尯鍩熺偣鍑讳簨浠�
quyuPatchView.btnClick.MouseUpEventHandler += (sender, e) =>
{
Method method = new Method();
@@ -147,31 +177,6 @@
quyuPatchView.btnText2.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(function);
});
};
-
-
- //缁х画娣诲姞
- Button addBtn = new Button
- {
- Y = quyuPatchView.frameLayout.Bottom + Application.GetRealHeight(125),
- X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(375 - 32),
- Height = Application.GetRealHeight(20),
- TextID = StringId.jixutianjia,
- TextSize = TextSize.text14,
- TextColor = CSS.CSS_Color.textConfirmColor,
- TextAlignment = TextAlignment.Center,
- };
- this.AddChidren(addBtn);
- //瀹屾垚
- View.SaveView saveView = new View.SaveView();
- this.AddChidren(saveView.FLayoutView());
- saveView.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(24), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
- #endregion
- #region 鐣岄潰鐐瑰嚮浜嬩欢
- //閬ユ帶鍣ㄥ悕绉扮偣鍑讳簨浠�
- namePatchView.btnClick.MouseUpEventHandler += (sender, e) => { };
- //鎵�灞炲尯鍩熺偣鍑讳簨浠�
- quyuPatchView.btnClick.MouseUpEventHandler += (sender, e) => { };
//缁х画娣诲姞鐐瑰嚮浜嬩欢
addBtn.MouseUpEventHandler += (sender, e) =>
{
@@ -193,16 +198,12 @@
//瀹屾垚鐐瑰嚮浜嬩欢
saveView.btnClick.MouseUpEventHandler += (sender, e) =>
{
- MainPage.BasePageView.RemoveViewByTag("AddControl");
- MainPage.BasePageView.RemoveViewByTag("Pir");
- if (null == Pir.currPir.FunctioList.Find((c) => c.sid == function.sid))
- {
- Pir.currPir.FunctioList.Add(function);
- }
- //Entity.FunctionAttributes functionAttributes = new Entity.FunctionAttributes();
- //functionAttributes.key
-
-
+ //鍓嶉潰鐣岄潰
+ // this.RemoveFromParent();
+ MainPage.BasePageView.RemoveViewByTag("PirView");
+ //涓荤晫闈�
+ MainPage.BasePageView.RemoveViewByTag("PirMain");
+
};
#endregion
}
--
Gitblit v1.8.0