From e747e6d8524e3146bb48dc304a713f309966b1c6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 19 五月 2020 13:10:03 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs | 60 +++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 47 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
index b5e90d4..9989e00 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
@@ -151,11 +151,6 @@
public static void NormallyOpenModeValue(ZigBee.Device.DoorLock doorLock, bool value)
{
doorLock.IsDoorLockNormallyMode = value;
-
- if (LogicAction != null)
- {
- LogicAction(value);
- }
}
/// <summary>
@@ -196,6 +191,15 @@
{
//涓婃姤鈥滃父寮�妯″紡鈥濆凡琚彇娑堬紝app榛樿浜嗏�滃父寮�妯″紡鈥濊鍙栨秷
DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
+ if (LogicAction != null)
+ {
+ LogicAction(false);
+ }
+ if (haveLogic)
+ {
+ //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
+ var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll(doorLock);
+ }
}
else
{
@@ -213,8 +217,11 @@
//涓婃姤鈥滃父寮�妯″紡鈥濆凡琚彇娑�
Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
- //娓╁眳鍩庢柟娉曪紵锛燂紵
- //姝ゅ鏄惁瑕佸垹闄ゆ俯灞呭煄鐨勭壒娈婇�昏緫
+ if (haveLogic)
+ {
+ //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
+ var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll(doorLock);
+ }
//app閲嶆柊寮�鍚�滃父寮�妯″紡鈥�
var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
@@ -229,6 +236,10 @@
});
action?.Invoke(doorLock.IsDoorLockNormallyMode);
action = null;
+ if (LogicAction != null)
+ {
+ LogicAction(false);
+ }
return;
}
if (result.defaultControlResponseData.status != 0)
@@ -240,8 +251,13 @@
NormallyOpenModeValue(doorLock, false);
CommonPage.Loading.Hide();
});
+
action?.Invoke(doorLock.IsDoorLockNormallyMode);
action = null;
+ if (LogicAction != null)
+ {
+ LogicAction(false);
+ }
return;
}
else
@@ -254,6 +270,10 @@
ShowTipMsg(msg0);
NormallyOpenModeValue(doorLock, true);
CommonPage.Loading.Hide();
+ if (LogicAction != null)
+ {
+ LogicAction(true);
+ }
});
}
}
@@ -271,11 +291,14 @@
if (doorLockMessType == DoorLockMessType.DeviceReport || doorLockMessType == DoorLockMessType.ServicePush)
{
NormallyOpenModeValue(doorLock, false);
+ if (LogicAction != null)
+ {
+ LogicAction(false);
+ }
if (haveLogic)
{
- //娓╁眳鍩庢柟娉曪紵锛燂紵
- //姝ゅ鏄惁瑕佸垹闄ゆ俯灞呭煄鐨勭壒娈婇�昏緫
- var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll();
+ //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
+ var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll(doorLock);
}
}
else
@@ -292,6 +315,10 @@
});
action?.Invoke(doorLock.IsDoorLockNormallyMode);
action = null;
+ if (LogicAction != null)
+ {
+ LogicAction(false);
+ }
return;
}
if (result.defaultControlResponseData.status != 0)
@@ -304,6 +331,10 @@
});
action?.Invoke(doorLock.IsDoorLockNormallyMode);
action = null;
+ if (LogicAction != null)
+ {
+ LogicAction(false);
+ }
return;
}
else
@@ -315,9 +346,8 @@
//鍒犻櫎璁剧疆甯稿紑妯″紡鍒涘缓鐨勯�昏緫
if (haveLogic)
{
- var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll();
- //娓╁眳鍩庢柟娉曪紵锛燂紵
- //姝ゅ鏄惁瑕佸垹闄ゆ俯灞呭煄鐨勭壒娈婇�昏緫
+ //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
+ var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll(doorLock);
}
Application.RunOnMainThread(() =>
{
@@ -325,6 +355,10 @@
ShowTipMsg(msg2);
CommonPage.Loading.Hide();
});
+ if (LogicAction != null)
+ {
+ LogicAction(false);
+ }
}
}
action?.Invoke(doorLock.IsDoorLockNormallyMode);
--
Gitblit v1.8.0