From d2173d587656c744f2caca25c0f522afd5216154 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 24 三月 2021 16:27:25 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs | 70 ++++++++++++++---------------------
1 files changed, 28 insertions(+), 42 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
index cfacb7f..ed65648 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
@@ -130,62 +130,48 @@
buttonObj.key = "key" + control.status.Count.ToString();
buttonObj.value = texts;
- PirSend.CodeStudy(control.deviceId, buttonObj, (responsePackNew) =>
+ PirSend.CodeStudy(control, buttonObj, (mqttdate) =>
{
- if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
+ if (mqttdate != null)
{
- Method method = new Method();
- Method.buttondata = "";
- var mqttdate = method.MqttDate("鎸夐敭", control.sid, 25);
- if (mqttdate != null)
+ //浼戠湢鏄负鏄剧ず寮曞鐣岄潰
+ // System.Threading.Thread.Sleep(3000);
+ //绉婚櫎娣诲姞鎸夐挳寮曞鐣岄潰
+ replication.RemView();
+ var buttonName = control.status.Find((c) => c.value == buttonObj.value);
+ if (buttonName == null)
{
- //浼戠湢鏄负鏄剧ず寮曞鐣岄潰
- // System.Threading.Thread.Sleep(3000);
- //绉婚櫎娣诲姞鎸夐挳寮曞鐣岄潰
- replication.RemView();
- var buttonName = control.status.Find((c) => c.value == buttonObj.value);
- if (buttonName == null)
- {
- //娣诲姞鏁版嵁
- 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 TipPopView().FlashingBox(Language.StringByID(StringId.tianjiachenggong));
- view.RemoveFromParent();
- }
-
- }
-
- //鍔犺浇鏁版嵁鐣岄潰
- AddControl addControl = new AddControl();
- MainPage.BasePageView.AddChidren(addControl);
- addControl.Show(control);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ //娣诲姞鏁版嵁
+ control.status.Add(buttonObj);
}
- else
+ //绉婚櫎娣诲姞鎸夐挳鐣岄潰
+ this.RemoveFromParent();
+
+ for (int i = MainPage.BasePageView.ChildrenCount - 1; 0 <= i; i--)
{
- replication.RemView();
- new TipPopView().FlashingBox(Language.StringByID(StringId.tianjiashibai));
+ var view = MainPage.BasePageView.GetChildren(i);
+ if (view.GetType() == typeof(AddControl))
+ {
+ //鎵惧埌绉婚櫎
+ view.RemoveFromParent();
+ }
}
+ //鍔犺浇鏁版嵁鐣岄潰
+ 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, "");
+ replication.RemView();
+ new TipPopView().FlashingBox(Language.StringByID(StringId.tianjiashibai));
+
}
});
-
-
};
}
--
Gitblit v1.8.0