From 1d4908c193ffbc8c351fadcd1e8d9ba12af835d2 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 15 十二月 2020 14:17:28 +0800
Subject: [PATCH] 2020-12-15 1.客服反馈问题修改。2.翻译字段纠正。3.修改备注增加判空处理

---
 Crabtree/SmartHome/UI/SimpleControl/Phone/Room/GenericDialog.cs |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/GenericDialog.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/GenericDialog.cs
index e4a9e60..6e22cda 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/GenericDialog.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/GenericDialog.cs
@@ -62,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 ();
                 }
             };
 
@@ -96,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;
                 }
 

--
Gitblit v1.8.0