From 3c58dd269afcb1d19e05d1417bb8994145bbe48d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 08 七月 2021 18:10:05 +0800
Subject: [PATCH] 2021-7-9-1
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs | 31 ++++++++++++++++++++++++++++---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 15 +++++++++++++--
2 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 7e8004d..c6443c0 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,6 +1,12 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.FE1D0763-7181-4B0C-AB18-E30AA773A6FA" />
- <MonoDevelop.Ide.Workbench>
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs">
+ <Files>
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs" Line="196" Column="76" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs" Line="57" Column="19" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs" Line="1" Column="1" />
+ </Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
@@ -12,9 +18,14 @@
</Node>
<Node name="UI" expanded="True">
<Node name="UI2" expanded="True">
+ <Node name="3-Intelligence" expanded="True">
+ <Node name="Automation" expanded="True">
+ <Node name="LogicMethod.cs" selected="True" />
+ </Node>
+ </Node>
<Node name="4-PersonalCenter" expanded="True">
<Node name="PirDevice" expanded="True">
- <Node name="AddButton.cs" selected="True" />
+ <Node name="View" expanded="True" />
</Node>
</Node>
<Node name="FuntionControlView" expanded="True" />
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
index 50fd91a..859f2aa 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
@@ -113,7 +113,8 @@
///涓嬩竴姝ョ殑鐐瑰嚮浜嬩欢
saveBtn.MouseUpEventHandler += (sender, e) =>
{
- if (control.status.Count>29) {
+ if (control.status.Count > 29)
+ {
///瓒呭嚭30涓孩澶栧疂鍐呭瓨婊′簡浼氬嚭鐜板紓甯�
new PirMethod().ErrorShow(null, "娣诲姞鎸夐挳瓒呭嚭30涓�");
return;
@@ -137,7 +138,8 @@
//娣诲姞鏁版嵁瀵硅薄
Entity.AttributesStatus buttonObj = new Entity.AttributesStatus();
- buttonObj.key = "key" + control.status.Count.ToString();
+ string keyName = GetKeyName(control.status);
+ buttonObj.key = keyName;
buttonObj.value = texts;
PirSend.CodeStudy(control, buttonObj, (mqttdate) =>
@@ -168,7 +170,7 @@
{
replication.RemView();
PirMethod method = new PirMethod();
- method.ErrorShow(null,"娣诲姞澶辫触");
+ method.ErrorShow(null, "娣诲姞澶辫触");
}
});
@@ -185,5 +187,28 @@
PirMethod.RefreshView("PirMain");
base.RemoveFromParent();
}
+
+ /// <summary>
+ /// 鏌ユ壘鍞竴鍋ュ悕鍊�
+ /// </summary>
+ /// <param name="listKeyName">宸茬粡瀛樺湪鍋ュ悕鍒楄〃</param>
+ /// <returns></returns>
+ private string GetKeyName(List<Entity.AttributesStatus> listKeyName)
+ {
+ //鐩墠绾㈠瀹濆涔犳寜閽渶澶氭槸30涓紱
+ for (int i = 0; i < 50; i++)
+ {
+ string keyName = "key" + i.ToString();
+ ///鏌ユ壘鏄惁瀛樺湪
+ var currKeyName = listKeyName.Find((c) => c.key == keyName);
+ if (currKeyName == null)
+ {
+ return keyName;
+ }
+ }
+
+ return "key" + listKeyName.Count;
+ }
+
}
}
--
Gitblit v1.8.0