From de564e6fd990960ea5796eadfa3b3fda7866a256 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 26 十月 2020 10:53:54 +0800
Subject: [PATCH] V2.510231 1.密码规则修改，修改为：密码必须为8-20个字符，包含字母、数字和符号。 2.APP本地增加登录，密码错误锁定，连续错误5次登录锁定，锁定5分钟。 3.登录界面，增加登录账号的邮箱格式匹配检测。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs
index 3acad0a..bccbcbb 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs
@@ -267,6 +267,15 @@
globalSceneFileList = new List<string> ();
}
List<string> RoomsSceneFileList = new List<string> ();
+ //2020-07-24 澧炲姞鎴块棿鍦烘櫙
+ foreach (var r in Room.Lists) {
+ if (string.IsNullOrEmpty (r.Name)) {
+ continue;
+ }
+ if (r != null) {
+ RoomsSceneFileList.AddRange (r.SceneFilePathList);
+ }
+ }
List<string> TargetList = new List<string> ();
if (selectedDeviceType == "Scene") {
@@ -343,11 +352,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 +460,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,
@@ -529,7 +539,23 @@
if (reBytes != null) {
Application.RunOnMainThread (() => {
btnEquipment.Text = commonDevice.Name = etDeviceName.Text.Trim ();
- IO.FileUtils.SaveEquipmentMessage (commonDevice, commonDevice.LoopID.ToString ());
+ if (commonDevice.Type == DeviceType.InfraredMode) {
+ //2020-07-03 淇绾㈠鐢佃淇敼鍚庡彉绾㈠妯″潡闂
+ InfraredMode mTV = Newtonsoft.Json.JsonConvert.DeserializeObject<InfraredMode> (System.Text.Encoding.UTF8.GetString (commonBytes));
+ if (mTV == null) {
+ IO.FileUtils.SaveEquipmentMessage (commonDevice, commonDevice.LoopID.ToString ());
+ } else {
+ mTV.Name = etDeviceName.Text.Trim ();
+ IO.FileUtils.SaveEquipmentMessage (mTV, mTV.LoopID.ToString ());
+ }
+ } else {
+ IO.FileUtils.SaveEquipmentMessage (commonDevice, commonDevice.LoopID.ToString ());
+ }
+
+
+
+
+ //IO.FileUtils.SaveEquipmentMessage (commonDevice, commonDevice.LoopID.ToString ());
MainPage.Loading.Hide ();
dialog.Close ();
});
@@ -584,7 +610,7 @@
deviceScrolView.AddChidren (btnRowLine);
});
} catch (Exception ex) {
- Console.WriteLine (ex.Message);
+ Utlis.WriteLine (ex.Message);
}
}
});
--
Gitblit v1.8.0