From 2d414e3b007f750cdad4f9e4a7c04db696bca5e4 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 23 四月 2020 16:13:59 +0800
Subject: [PATCH] 2020-04-23 1.优化远程连接提示，改为Loading方案，防止连接过程用户点击重连图标。 2.点击网络检测图标会判断，是否正在远程连接，如果是，会弹窗提示用户”正在远程连接，是否仍要重新检测“。 3.Help 增加隐藏长按功能，长按后，可以开启远程过程异常弹窗提示。长按后关闭。
---
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