From f500e14c0a994487070380c50c85e0929cbc8e63 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 05 一月 2021 10:48:04 +0800
Subject: [PATCH] 2021-01-05 1.更新
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs
index f314b61..7dbb41c 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs
@@ -267,6 +267,15 @@
globalSceneFileList = new List<string> ();
}
List<string> RoomsSceneFileList = new List<string> ();
+ //2020-07-24 澧炲姞鎴块棿鍦烘櫙
+ foreach (var r in Room.Lists) {
+ if (string.IsNullOrEmpty (r.Name)) {
+ continue;
+ }
+ if (r != null) {
+ RoomsSceneFileList.AddRange (r.SceneFilePathList);
+ }
+ }
List<string> TargetList = new List<string> ();
if (selectedDeviceType == "Scene") {
@@ -465,7 +474,7 @@
if (remakeBytes.Length > 20) {
etDeviceName.Text = CommonPage.MyEncodingGB2312.GetString (remakeBytes, 0, 20);
- new Alert ("", "Remark length exceeded the limit. ", "Close").Show ();
+ new Alert ("", ErrorCode.RemarkLengthExceededTheLimit, "Close").Show ();
}
};
@@ -499,12 +508,18 @@
dialogBottomView.AddChidren (editor);
editor.MouseUpEventHandler += (dff, ffd) => {
- byte [] remakeBytes = CommonPage.MyEncodingGB2312.GetBytes (etDeviceName.Text.Trim ());
- if (remakeBytes.Length > 20) {
- new Alert ("", "Remark length exceeded the limit. ", "Close").Show ();
+ string remakeStr = etDeviceName.Text.Trim ();
+ if (string.IsNullOrEmpty (remakeStr)) {
+ //澶囨敞涓嶈兘涓虹┖
+ new Alert ("", ErrorCode.RemarksCannotBeEmpty, "Close").Show ();
return;
}
+ byte [] remakeBytes = CommonPage.MyEncodingGB2312.GetBytes (remakeStr);
+ if (remakeBytes.Length > 20) {
+ new Alert ("", ErrorCode.RemarkLengthExceededTheLimit, "Close").Show ();
+ return;
+ }
MainPage.Loading.Start ();
//byte [] remakeBytes = CommonPage.MyEncodingGB2312.GetBytes (etDeviceName.Text.Trim ());
--
Gitblit v1.8.0