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_iOS/Resources/Language.ini | 2 ++
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs | 35 +++++++++++++++++++++++++++++++++--
HDL-ON_Android/Assets/Language.ini | 3 ++-
HDL_ON/Common/R.cs | 2 ++
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs | 3 +++
5 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 229d6ae..3ed920d 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -801,6 +801,7 @@
6092=The device does not exist
6093=The device is not online
6094=The gateway device does not exist
+6095=More than 30 add buttons
7108=Leak/No Leak
@@ -1877,7 +1878,7 @@
6092=璁惧涓嶅瓨鍦�
6093=璁惧涓嶅湪绾�
6094=缃戝叧璁惧涓嶅瓨鍦�
-
+6095=娣诲姞鎸夐挳瓒呭嚭30涓�
7000=鏂板缓鑷姩鍖�
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 61032f9..4d6e2f9 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -800,6 +800,7 @@
6092=The device does not exist
6093=The device is not online
6094=The gateway device does not exist
+6095=More than 30 add buttons
7108=Leak/No Leak
@@ -1876,6 +1877,7 @@
6092=璁惧涓嶅瓨鍦�
6093=璁惧涓嶅湪绾�
6094=缃戝叧璁惧涓嶅瓨鍦�
+6095=娣诲姞鎸夐挳瓒呭嚭30涓�
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 2c291a5..9464539 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -1397,6 +1397,8 @@
public const int shebeibucunzai = 6092;
public const int shebeibuzaixian = 6093;
public const int wangguanshebeibuzaixian = 6094;
+ public const int anniuchaochu30 = 6095;
+
public const int newAutomation = 7000;
public const int editAutomation = 7001;
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;
+ }
+
}
}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs
index 6397cc6..4d7538c 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs
@@ -543,6 +543,9 @@
{
str = Language.StringByID(StringId.tianjiashibai);
}
+ else if (text== "娣诲姞鎸夐挳瓒呭嚭30涓�") {
+ str = Language.StringByID(StringId.anniuchaochu30);
+ }
else
{
if (responsePackNew != null)
--
Gitblit v1.8.0