From e172a0f48fdd01733e04bda2370846b9f36b840f Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 15 十月 2021 14:44:03 +0800
Subject: [PATCH] 2021-10-15 1.修改乐橙推送字段，psk参数取值不能取cname和deviceName
---
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage_AddIrButton.cs | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage_AddIrButton.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage_AddIrButton.cs
index c4482f9..58df0a8 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage_AddIrButton.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage_AddIrButton.cs
@@ -9,8 +9,11 @@
{
public class AcControlPage_AddIrButton : FrameLayout
{
- public AcControlPage_AddIrButton()
+ Action action;
+
+ public AcControlPage_AddIrButton(Action act)
{
+ action = act;
}
public void Show(Function control)
{
@@ -130,6 +133,18 @@
//娣诲姞鏁版嵁瀵硅薄
AttributesStatus buttonObj = new AttributesStatus();
+
+ //闃叉key涓嶅敮涓�
+ var attrCount = control.attributes.Count;
+ var keyString = "key" + attrCount;
+ while (true)
+ {
+ if (control.attributes.Find((obj) => obj.key == keyString) == null)
+ {
+ break;
+ }
+ keyString = "key" + (++attrCount);
+ }
buttonObj.key = "key" + control.attributes.Count.ToString();
buttonObj.value = texts;
@@ -139,6 +154,8 @@
{
control.attributes.Add(new FunctionAttributes() { key = buttonObj.key, value = new System.Collections.Generic.List<string>() { buttonObj.value } });
this.RemoveFromParent();
+ action?.Invoke();
+ //new TipPopView().FlashingBox(Language.StringByID(StringId.tianjiachenggong));
}
else
{
--
Gitblit v1.8.0