From f5ba05c33393e55de28db91433901600bfb0658f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 22 五月 2020 17:43:11 +0800
Subject: [PATCH] 请合并最新代码「20200522:添加门锁晚上9点上报常开功能，优化PM2.5测试功能」
---
ZigbeeApp20200519/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp20200519/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs b/ZigbeeApp20200519/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
index 77e3daa..63c7c0b 100644
--- a/ZigbeeApp20200519/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
+++ b/ZigbeeApp20200519/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Text;
using Newtonsoft.Json.Linq;
+using Shared.Common;
using ZigBee.Device;
namespace Shared.Phone.UserCenter
@@ -839,14 +840,21 @@
}
HdlThreadLogic.Current.RunThread(async () =>
- {
- var result = await Shared.Phone.Device.Logic.SkipView.Exist(3, (ZigBee.Device.DoorLock)device[0]);
- HdlThreadLogic.Current.RunMain(() =>
- {
- //寮瑰嚭寰愭鐨勯偅涓獥鍙�
- DoorLock.DoorLockCommonInfo.NomallyOpenModeInvalidDialog((ZigBee.Device.DoorLock)device[0], DoorLock.DoorLockCommonInfo.DoorLockMessType.ServicePush,
- result != 0 ? true : false, ControlCommonResourse.UpdateDoorLockStatusAction);
- });
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //鎻愮ず闂ㄩ攣宸茬粡澶辨晥
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.NormallyClosed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
+ });
+
+ //鏇存柊闂ㄩ攣鐨勬繁搴︽帶鍒堕〉
+ ControlCommonResourse.UpdateDoorLockStatusAction?.Invoke(false);
+
+ //閫昏緫鎵ц鐨勫け鏁堣鏇存柊鐘舵��
+ if (DoorLock.DoorLockCommonInfo.LogicAction != null)
+ {
+ DoorLock.DoorLockCommonInfo.LogicAction(false);
+ }
});
}
}
--
Gitblit v1.8.0