From 9137222ece9b978eb97b5598f2eee6e070bcf9d6 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期五, 28 二月 2020 15:22:16 +0800 Subject: [PATCH] 2020-02-28 更新 --- Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs index fe15eab..8d935e9 100644 --- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs +++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs @@ -357,7 +357,7 @@ } } Common commonDevice = Newtonsoft.Json.JsonConvert.DeserializeObject<Common> (System.Text.Encoding.UTF8.GetString (commonBytes)); - if (commonDevice.Type == DeviceType.OnePortBus || commonDevice.Type == DeviceType.OnePortWirelessFR || commonDevice.Type == DeviceType.RCU + if (commonDevice.Type == DeviceType.OnePortBus || commonDevice.Type == DeviceType.OnePortWirelessFR || commonDevice.Type == DeviceType.OnePortMqttFR || commonDevice.Type == DeviceType.RCU || commonDevice.Type == DeviceType.A31MusicModel || commonDevice.Type == DeviceType.MusicA31) { continue; } @@ -451,7 +451,8 @@ Gravity = Gravity.CenterHorizontal, Width = Application.GetRealWidth (350), Height = Application.GetRealHeight (70), - Text = commonDevice.Name, + //Text = commonDevice.Name, + Text = commonDevice.Name.TrimEnd (), TextAlignment = TextAlignment.Center, TextColor = SkinStyle.Current.TextColor, Radius = 1, @@ -461,7 +462,9 @@ dialogView.AddChidren (etDeviceName); etDeviceName.TextChangeEventHandler += (sender, e) => { byte [] remakeBytes = CommonPage.MyEncodingGB2312.GetBytes (etDeviceName.Text.Trim ()); + if (remakeBytes.Length > 20) { + etDeviceName.Text = CommonPage.MyEncodingGB2312.GetString (remakeBytes, 0, 20); new Alert ("", "Remark length exceeded the limit. ", "Close").Show (); } }; @@ -496,8 +499,15 @@ dialogBottomView.AddChidren (editor); editor.MouseUpEventHandler += (dff, ffd) => { - MainPage.Loading.Start (); byte [] remakeBytes = CommonPage.MyEncodingGB2312.GetBytes (etDeviceName.Text.Trim ()); + if (remakeBytes.Length > 20) { + new Alert ("", "Remark length exceeded the limit. ", "Close").Show (); + return; + } + + + MainPage.Loading.Start (); + //byte [] remakeBytes = CommonPage.MyEncodingGB2312.GetBytes (etDeviceName.Text.Trim ()); System.Threading.Tasks.Task.Run (() => { byte [] updateBytes = null; if (commonDevice.Type == DeviceType.LightSwitchSocket) { -- Gitblit v1.8.0