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/DoorLock/DoorLockAlarmScene.cs |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/DoorLock/DoorLockAlarmScene.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/DoorLock/DoorLockAlarmScene.cs
index 00a90d9..1181e89 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/DoorLock/DoorLockAlarmScene.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/DoorLock/DoorLockAlarmScene.cs
@@ -323,6 +323,9 @@
                 if (common.Type == DeviceType.OnePortWirelessFR) {
                     var gateWay = Newtonsoft.Json.JsonConvert.DeserializeObject<OnePortWirelessFR> (gateWayString);
                     mac = gateWay.MAC.Replace (".", "");
+                } else if (common.Type == DeviceType.OnePortMqttFR) {
+                    var gateWay = Newtonsoft.Json.JsonConvert.DeserializeObject<OnePortMqttFR> (gateWayString);
+                    mac = gateWay.MAC.Replace (".", "");
                 } else if (common.Type == DeviceType.OnePortBus) {
                     var gateWay = Newtonsoft.Json.JsonConvert.DeserializeObject<OnePortBus> (gateWayString);
                     mac = gateWay.MAC.Replace (".", "");
@@ -344,7 +347,7 @@
                 try {
                     var recevieResult = requestWeb (mess);
                     var obj = Newtonsoft.Json.JsonConvert.DeserializeObject<PushMessageResult> (recevieResult);
-                    if (obj.StateCode == "SUCCESS") {
+                    if (obj.StateCode.ToUpper() == "SUCCESS") {
                         Application.RunOnMainThread (() => {
                             new Tip () { MaxWidth = 150, Text = Language.StringByID (R.MyInternationalizationString.SynchronousNotificationsSuccessfully), Direction = AMPopTipDirection.Down, CloseTime = 2 }.Show (btn);
                         });

--
Gitblit v1.8.0