From a85935c79da4215686d6ed961232c9a77866ff7f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:34 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs | 88 +++++++++++++++++++++++---------------------
1 files changed, 46 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 4f2aec5..1783c17 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
@@ -8,16 +8,21 @@
{
public AddButton()
{
- Tag = "Pir";
+ Tag = "PirView";
}
public void Show(Control control)
{
+
#region 鐣岄潰甯冨眬
this.BackgroundColor = CSS.CSS_Color.viewMiddle;
PirDevice.View.TopView topView = new View.TopView();
topView.topNameBtn.TextID = StringId.tianjiayaokongqi;
this.AddChidren(topView.FLayoutView());
- topView.clickBackBtn.MouseUpEventHandler += (sender, e) => { this.RemoveFromParent(); };
+ topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
+ {
+
+ RemoveFromParent();
+ };
FrameLayout editfLayout = new FrameLayout
{
@@ -114,7 +119,7 @@
//鍚嶇О涓嶈兘涓虹┖
return;
}
- var butName = Pir.BuottonList.Find((c) => c.value == texts);
+ var butName = control.status.Find((c) => c.value == texts);
if (butName != null)
{
//鍚嶇О宸茬粡瀛樺湪
@@ -122,58 +127,57 @@
}
//new寮曞鐣岄潰
View.ReplicationView replication = new View.ReplicationView();
- replication.Show();
+ replication.Show(this);
//娣诲姞鏁版嵁瀵硅薄
- ButtonObj buttonObj = new ButtonObj();
- buttonObj.Key = "key" + Pir.BuottonList.Count.ToString();
+ Entity.AttributesStatus buttonObj = new Entity.AttributesStatus();
+ buttonObj.key = "key" + control.status.Count.ToString();
buttonObj.value = texts;
- PirSend.CodeStudy(buttonObj, (responsePackNew) =>
+ PirSend.CodeStudy(control, buttonObj, (mqttdate) =>
{
- ///杩欓噷锛氱洃鍚琈TTP鎺ㄩ�佷笅鏉ヤ富棰橈紝鎵嶇煡閬撴槸鍚︽坊鍔犳垚鍔�
- ///
- //浼戠湢鏄负鏄剧ず寮曞鐣岄潰
- 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)
+ 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();
+ //绉婚櫎涔嬪墠鍙兘瀛樺湪鐨勭晫闈�
+ PirMethod.RemoveView("AddControl");
+ //鍔犺浇鏁版嵁鐣岄潰
+ AddControl addControl = new AddControl();
+ MainPage.BasePageView.AddChidren(addControl);
+ addControl.Show(control);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
}
-
- //鍔犺浇鏁版嵁鐣岄潰
- AddControl addControl = new AddControl();
- MainPage.BasePageView.AddChidren(addControl);
- addControl.Show(control);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- //}
- //else
- //{
- // PirSend.Error(responsePackNew);
- //}
+ else
+ {
+ replication.RemView();
+ PirMethod method = new PirMethod();
+ method.ErrorShow(null,"娣诲姞澶辫触");
+ }
});
-
-
};
}
+
+ /// <summary>
+ /// 绉婚櫎鐣岄潰
+ /// </summary>
+ public override void RemoveFromParent()
+ {
+ //鍒锋柊鎸囧畾鐣岄潰
+ PirMethod.RefreshView("PirMain");
+ base.RemoveFromParent();
+ }
}
}
--
Gitblit v1.8.0