From 5da99fed2eb0d08b6338064da5f998891252c7b8 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 18 五月 2020 16:39:59 +0800
Subject: [PATCH] 2020-05-18-2
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 102 ++++++++++++++++++++++++--------------------------
1 files changed, 49 insertions(+), 53 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index 821bca3..e4b1243 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -218,7 +218,7 @@
ClickHandle();
- if (doorLock.IsOnline == 1)
+ if (Common.LocalDevice.Current.CheckDeviceIsOnline(doorLock) == true)
{
ReadDoorLockUserInfo();
}
@@ -605,15 +605,11 @@
{
return;
}
- string key = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
- if (doorLock.IsDoorLockNormallyMode.ContainsKey(key))
+ if (doorLock.IsDoorLockNormallyMode)
{
- if (doorLock.IsDoorLockNormallyMode[key] == true)
- {
- if (canOpenNormallyMode)
- {
- Application.RunOnMainThread(() => { NomallyOpenModeInvalidDialog(true); });
- }
+ if (canOpenNormallyMode)
+ {
+ Application.RunOnMainThread(() => { NomallyOpenModeInvalidDialog(true); });
}
}
}
@@ -688,7 +684,7 @@
DoorLockCommonInfo.NormallyOpenModeValue(doorLock, tempRes);
Application.RunOnMainThread(async () =>
{
- var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(2);
+ var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3,doorLock);
if (resTemp == 1)
{
HaveLogicNormallyOpenMode = true;
@@ -774,6 +770,7 @@
/// </summary>
public void ClickHandle()
{
+
//闂ㄩ攣鏍囬
btnDoorLockTitle.Text = Common.LocalDevice.Current.GetDeviceMacName(doorLock);
@@ -849,20 +846,11 @@
//寮�閿佷簨浠�
EventHandler<MouseEventArgs> hander1 = async (sender, e) =>
{
-
- string key = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
- if (doorLock.IsDoorLockNormallyMode.ContainsKey(key))
+ if (doorLock.IsDoorLockNormallyMode)
{
- if (doorLock.IsDoorLockNormallyMode[key] == true)
- {
- if (canOpenNormallyMode)
- {
- NomallyOpenModeInvalidDialog(false);
- }
- else
- {
- OpenDoorLockHandle(progressButton, btnDoorLockPic, btnStatus);
- }
+ if (canOpenNormallyMode)
+ {
+ NomallyOpenModeInvalidDialog(false);
}
else
{
@@ -886,13 +874,9 @@
{
if (canOpenNormallyMode)
{
- var key = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
- if (doorLock.IsDoorLockNormallyMode.ContainsKey(key))
+ if (doorLock.IsDoorLockNormallyMode)
{
- if (doorLock.IsDoorLockNormallyMode[key] == true)
- {
- NomallyOpenModeInvalidDialog();
- }
+ NomallyOpenModeInvalidDialog();
}
}
else
@@ -1041,8 +1025,6 @@
/// </summary>
private async void NomallyOpenDialog()
{
- #region 鍚庣画鐗堟湰
-
if (UserCenterResourse.UserInfo.AuthorityNo != 1)
{
this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.OnlyMasterOperate));
@@ -1057,18 +1039,36 @@
action = () =>
{
-
- Shared.Phone.Device.Logic.SkipView.SkipAddLogic(2, doorLock);
//绯荤粺瀵嗙爜鏀寔鎿嶄綔闂ㄩ攣鍚庯紝璋冪敤娓╁眳鍩庣殑鐣岄潰銆愬父寮�鑷姩鍖栥��
- // functionSetting.aaaAction = () =>
- //{
- // UpdateNomallyOpenStatus();
- //};
- };
- HdlCheckLogic.Current.CheckSecondarySecurity(action);
- #endregion
+ if (doorLock == null)
+ {
+ ///闃叉鎶涘紓甯�
+ return;
+ }
+ ///澶囨敞锛歐JC鐨�
+ Shared.Phone.Device.Logic.Send.CurrentDoorLock = doorLock;
+ ///杩涙潵鍒锋柊涓�娆¤澶囧垪琛紱
+ Common.Logic.LogicDviceList.Clear();
+ if (Common.Logic.LogicDviceList.Count == 0)
+ {
+ Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
+ }
+
+ var addLogicPage = new Shared.Phone.Device.Logic.SoneLogicList();
+ UserView.HomePage.Instance.AddChidren(addLogicPage);
+ UserView.HomePage.Instance.PageIndex += 1;
+ addLogicPage.Show();
+ addLogicPage.action += (w) =>
+ {
+ doorLock.IsDoorLockNormallyMode = w;
+ ///鐣欑粰寰愭鐢ㄧ殑
+ UpdateNomallyOpenStatus();
+ };
-
+ };
+ HdlCheckLogic.Current.CheckSecondarySecurity(action);
+
+
}
/// <summary>
@@ -1104,7 +1104,7 @@
//鍒犻櫎宸茬粡澶辨晥鐨勨�滃父寮�妯″紡鈥濈殑閫昏緫
if (HaveLogicNormallyOpenMode)
{
- var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
+ var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3,doorLock);
//if (resTemp == 3)
//{
// string msg0 = Language.StringByID(R.MyInternationalizationString.CancelLogicNormallyModeFailed);
@@ -1132,7 +1132,7 @@
//鍏堝垹闄ゅ凡澶辨晥鐨勨�滃父寮�妯″紡鈥濈殑閫昏緫
if (HaveLogicNormallyOpenMode)
{
- var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
+ var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3,doorLock);
//if (resTemp == 3)
//{
// string msg0 = Language.StringByID(R.MyInternationalizationString.CancelLogicNormallyModeFailed2);
@@ -1209,7 +1209,7 @@
//鍒犻櫎宸茬粡澶辨晥鐨勨�滃父寮�妯″紡鈥濈殑閫昏緫
if (HaveLogicNormallyOpenMode)
{
- var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
+ var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3,doorLock);
//if (resTemp == 3)
//{
// string msg0 = Language.StringByID(R.MyInternationalizationString.CancelLogicNormallyModeFailed);
@@ -1248,7 +1248,7 @@
//鍒犻櫎璁剧疆甯稿紑妯″紡鍒涘缓鐨勯�昏緫
if (HaveLogicNormallyOpenMode)
{
- var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
+ var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3,doorLock);
//鍥犱负鐩墠鏈哄埗闂锛岄�昏緫缁忓父澶辫触锛屾墍浠ヤ笉鎻愮ず锛屽悗鏈熸満鍒惰鏀癸紝閲嶆柊鍋氫竴涓繖涓晫闈�
//if (resTemp == 3)
//{
@@ -1321,7 +1321,7 @@
DoorLockCommonInfo.NormallyOpenModeInvalidTime = temp;
//榛樿鍒涘缓甯稿紑妯″紡鐨勭壒娈婇�昏緫
var res = await Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
- if (!res)
+ if (res==0)
{
//榛樿鍒涘缓甯稿紑妯″紡澶辫触
string msg0 = Language.StringByID(R.MyInternationalizationString.AddLogicNormallyModeFailed);
@@ -1343,12 +1343,7 @@
btnNormallyOpenFrameLayout.Width = Application.GetRealWidth(0);
return;
}
- string key = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
- if (!doorLock.IsDoorLockNormallyMode.ContainsKey(key))
- {
- return;
- }
- if (doorLock.IsDoorLockNormallyMode[key] == true)
+ if (doorLock.IsDoorLockNormallyMode)
{
btnNormallyOpen.IsSelected = true;
btnDoorLockPic.IsSelected = true;
@@ -1356,7 +1351,7 @@
btnStatus.Text = Language.StringByID(R.MyInternationalizationString.Current) + Language.StringByID(R.MyInternationalizationString.DoorLockOpen);
}
- else if (doorLock.IsDoorLockNormallyMode[key] == false)
+ else if (!doorLock.IsDoorLockNormallyMode)
{
btnStatus.Text = Language.StringByID(R.MyInternationalizationString.Current) + Language.StringByID(R.MyInternationalizationString.CLose);
btnDoorLockPic.IsSelected = false;
@@ -1445,6 +1440,7 @@
CommonPage.Instance.IsDrawerLockMode = false;
}
ZbGateway.StatusList.Remove(this);
+ DoorLockCommonInfo.LogicAction = null;
base.RemoveFromParent();
}
#endregion
--
Gitblit v1.8.0