From 3c9ad99d4a5eeeb53f7380315197e7133f84d10c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 27 十月 2020 14:57:33 +0800
Subject: [PATCH] 2020-10-27 1V2.510271 1.密码规则修改,修改为:密码必须为8-20个字符,包含字母、数字和符号。 2.APP本地增加登录,密码错误锁定,连续错误5次登录锁定,锁定5分钟。 3.登录界面,增加登录账号的邮箱格式匹配检测。 4.增加iOS越狱和Androidr Root检测,强制关闭APP。

---
 Crabtree/SmartHome/UI/SimpleControl/Phone/DoorLock/DoorLockScene.cs |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/DoorLock/DoorLockScene.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/DoorLock/DoorLockScene.cs
index cf7a6a6..4ecdb7a 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/DoorLock/DoorLockScene.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/DoorLock/DoorLockScene.cs
@@ -586,7 +586,7 @@
                     try {
                         var recevieResult = requestWeb (mess, "https://developer.hdlcontrol.com/api/GetOnePushMsg");
                         var obj = Newtonsoft.Json.JsonConvert.DeserializeObject<PushMessageResult> (recevieResult);
-                        if (obj.StateCode == "SUCCESS") {
+                        if (obj.StateCode.ToUpper() == "SUCCESS") {
                             var msgEntity = Newtonsoft.Json.JsonConvert.DeserializeObject<List<MessageInfoRes>> (obj.ResponseData.ToString ());
                             if (msgEntity.Count == 0) {
                                 Application.RunOnMainThread (() => {
@@ -740,6 +740,10 @@
                 var gateWay = Newtonsoft.Json.JsonConvert.DeserializeObject<OnePortWirelessFR> (gateWayString);
                 mac = gateWay.MAC.Replace (".", "");
                 return mac;
+            } else if (common.Type == DeviceType.OnePortMqttFR) {
+                var gateWay = Newtonsoft.Json.JsonConvert.DeserializeObject<OnePortMqttFR> (gateWayString);
+                mac = gateWay.MAC.Replace (".", "");
+                return mac;
             } else if (common.Type == DeviceType.OnePortBus) {
                 var gateWay = Newtonsoft.Json.JsonConvert.DeserializeObject<OnePortBus> (gateWayString);
                 mac = gateWay.MAC.Replace (".", "");
@@ -776,7 +780,7 @@
                 try {
                      var recevieResult = requestWeb (mess, "https://developer.hdlcontrol.com/api/AddPushMessage");
                      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.SendNotificationsSuccessfully), Direction = AMPopTipDirection.Down, CloseTime = 2 }.Show (btn);
                          });

--
Gitblit v1.8.0