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 | 111 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 68 insertions(+), 43 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
index f6e3b65..d22a2ca 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
@@ -4,12 +4,13 @@
using Shared;
namespace HDL_ON.UI.UI2.PersonalCenter.PirDevice
{
- public class AddButton:FrameLayout
+ public class AddButton : FrameLayout
{
public AddButton()
{
+ Tag = "PirView";
}
- public void Show()
+ public void Show(Control control)
{
#region 鐣岄潰甯冨眬
this.BackgroundColor = CSS.CSS_Color.viewMiddle;
@@ -97,69 +98,93 @@
#endregion
View.Buttons buttons = new View.Buttons();
var buttonNameList = buttons.GetList("榛樿鎸夐挳");
- buttons.AddButton(buttonFLayout, buttonNameList, (s) => {
+ buttons.AddButton(buttonFLayout, buttonNameList, (s) =>
+ {
editText.Text = s;
- #if __Android__
+#if __Android__
editText.SetSelectionEnd();
- #endif
+#endif
});
///涓嬩竴姝ョ殑鐐瑰嚮浜嬩欢
saveBtn.MouseUpEventHandler += (sender, e) =>
{
- View.ReplicationView replication = new View.ReplicationView();
- //new寮曞鐣岄潰
- replication.GuideShow();
-
var texts = editText.Text.Trim();
- if (string.IsNullOrEmpty( editText.Text)) {
+ if (string.IsNullOrEmpty(editText.Text))
+ {
//鍚嶇О涓嶈兘涓虹┖
return;
}
- var butName = Pir.BuottonList.Find((c) => c.value == texts);
- if (butName!=null) {
+ var butName = control.status.Find((c) => c.value == texts);
+ if (butName != null)
+ {
//鍚嶇О宸茬粡瀛樺湪
return;
}
-
- //娣诲姞鏁版嵁瀵硅薄
- ButtonObj buttonObj = new ButtonObj();
- buttonObj.Key = "key" + Pir.BuottonList.Count.ToString();
- buttonObj.value = texts;
-
- HDL_ON.DAL.Server.ResponsePackNew responsePackNew = null;
- new System.Threading.Thread(() =>
- {
+ //new寮曞鐣岄潰
+ View.ReplicationView replication = new View.ReplicationView();
+ replication.Show();
- try
+ //娣诲姞鏁版嵁瀵硅薄
+ Entity.AttributesStatus buttonObj = new Entity.AttributesStatus();
+ buttonObj.key = "key" + control.status.Count.ToString();
+ buttonObj.value = texts;
+
+ PirSend.CodeStudy(control, buttonObj, (responsePackNew) =>
+ {
+ if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
{
- //鍙戦�佺孩澶栫爜瀛︿範鍛戒护
- responsePackNew = PirSend.CodeStudy(buttonObj);
- }
- catch { }
- finally
- {
- Application.RunOnMainThread(() =>
+ Method method = new Method();
+ Method.buttondata = "";
+ var mqttdate = method.MqttDate("鎸夐敭", control.sid, 25);
+ if (mqttdate != null)
{
- if (PirSend.Error(responsePackNew))
+ //浼戠湢鏄负鏄剧ず寮曞鐣岄潰
+ // System.Threading.Thread.Sleep(3000);
+ //绉婚櫎娣诲姞鎸夐挳寮曞鐣岄潰
+ replication.RemView();
+ var buttonName = control.status.Find((c) => c.value == buttonObj.value);
+ if (buttonName == null)
{
//娣诲姞鏁版嵁
- Pir.BuottonList.Add(buttonObj);
- //绉婚櫎娣诲姞鎸夐挳鐣岄潰
- this.RemoveFromParent();
- //鍔犺浇鏁版嵁鐣岄潰
- AddControl addControl = new AddControl();
- addControl.Show();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ control.status.Add(buttonObj);
}
- //绉婚櫎娣诲姞鎸夐挳寮曞鐣岄潰
- // replication.dialog.Close();
+ //绉婚櫎娣诲姞鎸夐挳鐣岄潰
+ 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));
+
+ }
+
+ }
+ else
+ {
+ Method method = new Method();
+ method.ErrorShow(responsePackNew, "");
}
- })
- { IsBackground = true }.Start();
-
+ });
+
+
};
}
--
Gitblit v1.8.0