From c2e6e14e8e68aca4f78f0fea028fc92ce15d3656 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 21 五月 2020 10:51:21 +0800
Subject: [PATCH] 请合并最新代码，调整了门锁推送功能
---
ZigbeeApp20200519/Shared/Phone/Device/Logic/SkipView.cs | 12 ++++++------
ZigbeeApp20200519/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs | 8 --------
ZigbeeApp20200519/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs | 19 +++++++++----------
3 files changed, 15 insertions(+), 24 deletions(-)
diff --git a/ZigbeeApp20200519/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp20200519/Shared/Phone/Device/Logic/SkipView.cs
index 57e405f..270af1c 100644
--- a/ZigbeeApp20200519/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp20200519/Shared/Phone/Device/Logic/SkipView.cs
@@ -315,7 +315,7 @@
Automationview(logicScrolView, no);
CommonPage.Loading.Hide();
}
- //static RowLayout selectedRow = new RowLayout() { Tag = "0" };//璁板綍宸︽粦鐘舵��
+ static RowLayout selectedRow = new RowLayout() { Tag = "0" };//璁板綍宸︽粦鐘舵��
/// <summary>
/// 鍔犺浇鑷姩鍖栧垪琛ㄧ晫闈�
/// </summary>
@@ -400,11 +400,11 @@
//宸︽粦鑿滃崟浜嬩欢
logicRowlayout.OpenMenuAction += () =>
{
- //if (selectedRow.Tag.ToString() != logicRowlayout.Tag.ToString())
- //{ //淇濈暀宸︽粦鍙湁涓�涓�;
- // selectedRow.HideMenu();//
- //}
- //selectedRow = logicRowlayout;
+ if (selectedRow.Tag.ToString() != logicRowlayout.Tag.ToString())
+ { //淇濈暀宸︽粦鍙湁涓�涓�;
+ selectedRow.HideMenu();//
+ }
+ selectedRow = logicRowlayout;
};
if (i == 1)
{
diff --git a/ZigbeeApp20200519/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs b/ZigbeeApp20200519/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
index de85ddf..7340706 100644
--- a/ZigbeeApp20200519/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
+++ b/ZigbeeApp20200519/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
@@ -832,23 +832,22 @@
var data = Newtonsoft.Json.JsonConvert.DeserializeObject<LogicPushResult>(receiveData["Data"].ToString());
if (data != null && data.ActionData != null)
{
- var deviceAddr = data.ActionData.MacStr;
- var epoint = 1; //data.ActionData.Epoint; 闂ㄩ攣鍙戦�佹椂鏄�200锛屼絾鏄笂浼犳椂瑕佹妸鐪熷疄鐨勭鐐圭粰缃戝叧涓婃姤
- var device = Common.LocalDevice.Current.GetDevice(deviceAddr, epoint);
- if (device.Type != DeviceType.DoorLock)
- {
- return;
- }
-
if (data.ActionData.Actiontype == 8 && data.ActionData.PassDataString == "055704010113")
{
+ var deviceAddr = data.ActionData.MacStr;
+ var device = Common.LocalDevice.Current.GetDevicesByMac(deviceAddr, false);
+ if (device.Count > 0 && device[0].Type != DeviceType.DoorLock)
+ {
+ return;
+ }
+
HdlThreadLogic.Current.RunThread(async () =>
{
- var result = await Shared.Phone.Device.Logic.SkipView.Exist(3, (ZigBee.Device.DoorLock)device);
+ 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, DoorLock.DoorLockCommonInfo.DoorLockMessType.ServicePush,
+ DoorLock.DoorLockCommonInfo.NomallyOpenModeInvalidDialog((ZigBee.Device.DoorLock)device[0], DoorLock.DoorLockCommonInfo.DoorLockMessType.ServicePush,
result != 0 ? true : false, ControlCommonResourse.UpdateDoorLockStatusAction);
});
});
diff --git a/ZigbeeApp20200519/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs b/ZigbeeApp20200519/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
index 20aa481..801c052 100644
--- a/ZigbeeApp20200519/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
+++ b/ZigbeeApp20200519/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
@@ -221,12 +221,6 @@
//涓婃姤鈥滃父寮�妯″紡鈥濆凡琚彇娑�
Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
- if (haveLogic)
- {
- //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
- var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll(doorLock);
- }
-
//app閲嶆柊寮�鍚�滃父寮�妯″紡鈥�
var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
if (result == null || result.defaultControlResponseData == null)
@@ -266,8 +260,6 @@
}
else
{
- //鍒涘缓甯稿紑妯″紡鐨勭壒娈婇�昏緫
- var resu = await Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
Application.RunOnMainThread(() =>
{
string msg0 = Language.StringByID(R.MyInternationalizationString.OpenNormallyOpenModeSuccess);
--
Gitblit v1.8.0