From 126f59cbba2e1505c191b22c9794d810cdedb4c3 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 24 四月 2020 15:39:05 +0800
Subject: [PATCH] 2020-04-24 1.优化远程连接和控制,增加远程连接让用户等待的Loading提示。

---
 Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs
index 2314279..d37d926 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs
@@ -343,11 +343,11 @@
                         }
                         var commonBytes = IO.FileUtils.ReadFile (deviceFilePath);
                         if (commonBytes.Length == 0) {
-                            Console.WriteLine ("length loss");
+                            Utlis.WriteLine ("length loss");
                             continue;
                         }
                         if (commonBytes.Length == 1) {
-                            Console.WriteLine ("length loss 1");
+                            Utlis.WriteLine ("length loss 1");
                             continue;
                         }
                         if (str [1] == DeviceType.InfraredMode.ToString ()) {
@@ -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) {
@@ -575,7 +585,7 @@
                             deviceScrolView.AddChidren (btnRowLine);
                         });
                     } catch (Exception ex) {
-                        Console.WriteLine (ex.Message);
+                        Utlis.WriteLine (ex.Message);
                     }
                 }
             });

--
Gitblit v1.8.0