From 83df0ebfbd306d0fb5a51a21a7ef2271c0c507ec Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 09 三月 2021 19:39:26 +0800
Subject: [PATCH] 2021-3-9-1
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs | 61 ++++++++++++++++++------------
1 files changed, 37 insertions(+), 24 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..aecbe5b 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
@@ -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,41 +126,54 @@
//娣诲姞鏁版嵁瀵硅薄
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();
+ var mqttdate = method.MqttDate(control.sid, 20);
+ 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 Intelligence.Automation.LogicView.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
{
--
Gitblit v1.8.0