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/GenericDialog.cs | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/GenericDialog.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/GenericDialog.cs
index 798a7d9..6e22cda 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/GenericDialog.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/GenericDialog.cs
@@ -54,6 +54,7 @@
Radius = 1,
BorderWidth = 1,
BorderColor = SkinStyle.Current.BorderColor,
+
};
dialogView.AddChidren (etDeviceName);
etDeviceName.TextChangeEventHandler += (sender, e) => {
@@ -61,7 +62,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 ();
}
};
@@ -95,9 +96,16 @@
dialogBottomView.AddChidren (editor);
editor.MouseUpEventHandler += (dff, ffd) => {
- byte [] remakeBytes = CommonPage.MyEncodingGB2312.GetBytes (etDeviceName.Text.Trim ());
+ 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 ("", "Remark length exceeded the limit. ", "Close").Show ();
+ new Alert ("", ErrorCode.RemarkLengthExceededTheLimit, "Close").Show ();
return;
}
@@ -168,7 +176,7 @@
try {
foreach (var room in Room.Lists) {
foreach (var common in room.DeviceList) {
- if (common.SubnetID != commonDevice.SubnetID || common.DeviceID != commonDevice.DeviceID || common.LoopID != commonDevice.LoopCount) {
+ if (common.CommonLoopID != commonDevice.CommonLoopID || common.Type != commonDevice.Type) {
continue;
}
common.Name = commonDevice.Name;
--
Gitblit v1.8.0