From 0e1c6c25b1b0961d324811ff2132717a80f99efe Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期日, 26 四月 2020 14:15:05 +0800
Subject: [PATCH] 2020-04-26 1.添加住宅和修改住宅时，改为子线程操作。 2.远程连接模式时，禁用搜索网关和添加设备。3.修复切换住宅时，提示远程连接Loading不关闭问题。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs
index fe15eab..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 ()) {
@@ -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) {
@@ -575,7 +585,7 @@
deviceScrolView.AddChidren (btnRowLine);
});
} catch (Exception ex) {
- Console.WriteLine (ex.Message);
+ Utlis.WriteLine (ex.Message);
}
}
});
--
Gitblit v1.8.0