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/AddButton.cs | 66 ++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 26 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
index 28d0f31..d22a2ca 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
@@ -8,7 +8,7 @@
{
public AddButton()
{
- Tag = "Pir";
+ Tag = "PirView";
}
public void Show(Control control)
{
@@ -114,7 +114,7 @@
//鍚嶇О涓嶈兘涓虹┖
return;
}
- var butName = Pir.BuottonList.Find((c) => c.value == texts);
+ var butName = control.status.Find((c) => c.value == texts);
if (butName != null)
{
//鍚嶇О宸茬粡瀛樺湪
@@ -126,46 +126,60 @@
//娣诲姞鏁版嵁瀵硅薄
Entity.AttributesStatus buttonObj = new Entity.AttributesStatus();
- buttonObj.key = "key" + Pir.BuottonList.Count.ToString();
+ buttonObj.key = "key" + control.status.Count.ToString();
buttonObj.value = texts;
PirSend.CodeStudy(control, buttonObj, (responsePackNew) =>
{
- //浼戠湢鏄负鏄剧ず寮曞鐣岄潰
- System.Threading.Thread.Sleep(5000);
- //绉婚櫎娣诲姞鎸夐挳寮曞鐣岄潰
- replication.RemView();
if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
{
- var buttonName = Pir.BuottonList.Find((c) => c.value == buttonObj.value);
- if (buttonName == null)
+ Method method = new Method();
+ Method.buttondata = "";
+ var mqttdate = method.MqttDate("鎸夐敭", control.sid, 25);
+ if (mqttdate != null)
{
- //娣诲姞鏁版嵁
- Pir.BuottonList.Add(buttonObj);
- }
- //绉婚櫎娣诲姞鎸夐挳鐣岄潰
- this.RemoveFromParent();
-
- for (int i = MainPage.BasePageView.ChildrenCount - 1; 0 <= i; i--)
- {
- var view = MainPage.BasePageView.GetChildren(i);
- if (view.GetType() == typeof(AddControl))
+ //浼戠湢鏄负鏄剧ず寮曞鐣岄潰
+ // System.Threading.Thread.Sleep(3000);
+ //绉婚櫎娣诲姞鎸夐挳寮曞鐣岄潰
+ replication.RemView();
+ var buttonName = control.status.Find((c) => c.value == buttonObj.value);
+ if (buttonName == null)
{
- view.RemoveFromParent();
+ //娣诲姞鏁版嵁
+ control.status.Add(buttonObj);
+ }
+ //绉婚櫎娣诲姞鎸夐挳鐣岄潰
+ this.RemoveFromParent();
+
+ for (int i = MainPage.BasePageView.ChildrenCount - 1; 0 <= i; i--)
+ {
+ var view = MainPage.BasePageView.GetChildren(i);
+ if (view.GetType() == typeof(AddControl))
+ {
+ new Intelligence.Automation.LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.tianjiashibai));
+ view.RemoveFromParent();
+ }
+
}
+ //鍔犺浇鏁版嵁鐣岄潰
+ AddControl addControl = new AddControl();
+ MainPage.BasePageView.AddChidren(addControl);
+ addControl.Show(control);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ }
+ else
+ {
+ replication.RemView();
+ new TipPopView().FlashingBox(Language.StringByID(StringId.tianjiashibai));
+
}
- //鍔犺浇鏁版嵁鐣岄潰
- AddControl addControl = new AddControl();
- MainPage.BasePageView.AddChidren(addControl);
- addControl.Show(control);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
}
else
{
Method method = new Method();
- method.ErrorShow(responsePackNew);
+ method.ErrorShow(responsePackNew, "");
}
});
--
Gitblit v1.8.0