From 49add64d7f25448baa06ac5a9ebbeac0a3ae97e0 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 13 一月 2020 13:50:29 +0800
Subject: [PATCH] Version 2.50113 1.优化更新。 2.第一次引导或者添加住宅，默认添加2个房间。编辑住宅不处理。 3.设备名超过20字节限制。 4.修复编辑住宅名字重复不提示问题。 5.优化添加住宅逻辑。
---
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