From 82fcf183284b24b3b6e61a64d971c1f96feb488f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 09 七月 2021 10:17:33 +0800
Subject: [PATCH] 合并温居城代码

---
 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs |   35 +++++++++++++++++++++++++++++++++--
 1 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
index 1783c17..859f2aa 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
@@ -113,6 +113,13 @@
             ///涓嬩竴姝ョ殑鐐瑰嚮浜嬩欢
             saveBtn.MouseUpEventHandler += (sender, e) =>
             {
+                if (control.status.Count > 29)
+                {
+                    ///瓒呭嚭30涓孩澶栧疂鍐呭瓨婊′簡浼氬嚭鐜板紓甯�
+                    new PirMethod().ErrorShow(null, "娣诲姞鎸夐挳瓒呭嚭30涓�");
+                    return;
+                }
+
                 var texts = editText.Text.Trim();
                 if (string.IsNullOrEmpty(editText.Text))
                 {
@@ -131,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) =>
@@ -162,7 +170,7 @@
                     {
                         replication.RemView();
                         PirMethod method = new PirMethod();
-                        method.ErrorShow(null,"娣诲姞澶辫触");
+                        method.ErrorShow(null, "娣诲姞澶辫触");
                     }
 
                 });
@@ -179,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