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/Fan/UserFan.cs |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Fan/UserFan.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Fan/UserFan.cs
index 594ed1d..af2a9fe 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Fan/UserFan.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Fan/UserFan.cs
@@ -220,8 +220,8 @@
             btnBottomSwitch = new Button () {
                 X = Application.GetRealWidth (212),
                 Y = speedView.Bottom + Application.GetRealHeight (250),
-                Width = Application.GetRealWidth (215),
-                Height = Application.GetRealHeight (95),
+                Width = Application.GetMinRealAverage (215),
+                Height = Application.GetMinRealAverage (95),
                 SelectedImagePath = "Fan/FanSwitchOn.png",
                 UnSelectedImagePath = "Fan/FanSwitch.png",
                 IsSelected = fanModule.Switch != 0
@@ -243,6 +243,8 @@
                     ////Control.ControlBytesSend (Command.SetSingleLight, fanModule.SubnetID, fanModule.DeviceID,new byte [] { fanModule.LoopID, fanModule.WindSpeed });
                     //SendControlFan (fanModule, fanModule.WindSpeed);
                     //speedView.BackgroundImagePath = "Fan/Speed" + fanModule.WindSpeed.ToString () + ".png";
+                    if (fanModule.WindSpeed == 0) fanModule.WindSpeed = 1;
+
                     SendControlFan (fanModule, fanModule.WindSpeed);
                 }
                 //IO.FileUtils.SaveEquipmentMessage (fanModule, fanModule.LoopID.ToString ());
@@ -262,6 +264,9 @@
                     ////Control.ControlBytesSend (Command.SetSingleLight, fanModule.SubnetID, fanModule.DeviceID, new byte [] { fanModule.LoopID, fanModule.WindSpeed });
                     //SendControlFan (fanModule, fanModule.WindSpeed);
                     //speedView.BackgroundImagePath = "Fan/Speed" + fanModule.Switch.ToString () + ".png";
+
+                    if (fanModule.WindSpeed == 0) fanModule.WindSpeed = 1;
+
                     SendControlFan (fanModule, fanModule.WindSpeed);
                 }
                 //IO.FileUtils.SaveEquipmentMessage (fanModule, fanModule.LoopID.ToString ());

--
Gitblit v1.8.0