From 5e5b950e83dff438e64ce7e088aaa31455091b0c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 07 七月 2021 14:57:42 +0800
Subject: [PATCH] 2021-7-7-1
---
HDL-ON_iOS/Resources/Language.ini | 2 ++
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs | 6 ++++++
HDL-ON_Android/Assets/Language.ini | 3 ++-
HDL_ON/Common/R.cs | 2 ++
.vs/HDL_APP_Project/xs/UserPrefs.xml | 17 ++++++++++-------
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs | 3 +++
6 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 72e5888..7e8004d 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -6,24 +6,27 @@
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
+ <Node name="Common" expanded="True" />
<Node name="Entity" expanded="True">
<Node name="Function" expanded="True" />
</Node>
<Node name="UI" expanded="True">
<Node name="UI2" expanded="True">
- <Node name="3-Intelligence" expanded="True">
- <Node name="Automation" expanded="True">
- <Node name="LogicView" expanded="True" />
- <Node name="LogicMethod.cs" selected="True" />
- </Node>
- </Node>
<Node name="4-PersonalCenter" expanded="True">
- <Node name="PirDevice" expanded="True" />
+ <Node name="PirDevice" expanded="True">
+ <Node name="AddButton.cs" selected="True" />
+ </Node>
</Node>
<Node name="FuntionControlView" expanded="True" />
</Node>
</Node>
</Node>
+ <Node name="HDL-ON_Android" expanded="True">
+ <Node name="Assets" expanded="True" />
+ </Node>
+ <Node name="HDL-ON_iOS" expanded="True">
+ <Node name="Resources" expanded="True" />
+ </Node>
</Node>
</State>
</Pad>
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 332b907..6470f74 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -792,6 +792,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
@@ -1858,7 +1859,7 @@
6092=璁惧涓嶅瓨鍦�
6093=璁惧涓嶅湪绾�
6094=缃戝叧璁惧涓嶅瓨鍦�
-
+6095=娣诲姞鎸夐挳瓒呭嚭30涓�
7000=鏂板缓鑷姩鍖�
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 8bef956..79536dc 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -792,6 +792,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
@@ -1858,6 +1859,7 @@
6092=璁惧涓嶅瓨鍦�
6093=璁惧涓嶅湪绾�
6094=缃戝叧璁惧涓嶅瓨鍦�
+6095=娣诲姞鎸夐挳瓒呭嚭30涓�
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 3b2cf9b..340f4bb 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -1350,6 +1350,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..50fd91a 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
@@ -113,6 +113,12 @@
///涓嬩竴姝ョ殑鐐瑰嚮浜嬩欢
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))
{
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs
index d8193c1..cbf992b 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs
@@ -544,6 +544,9 @@
{
str = Language.StringByID(StringId.tianjiashibai);
}
+ else if (text== "娣诲姞鎸夐挳瓒呭嚭30涓�") {
+ str = Language.StringByID(StringId.anniuchaochu30);
+ }
else
{
if (responsePackNew != null)
--
Gitblit v1.8.0