From 2e7e5f9af5b32cfe1fc3c6ba40bf7eb984bbd0a4 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 11 五月 2020 17:52:06 +0800
Subject: [PATCH] ???????
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
index 7a4303f..b5e90d4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
@@ -132,7 +132,7 @@
/// 闂ㄩ攣鏄惁鏀寔甯稿紑[杩欓噷鏆傛椂鍙湁S-One闂ㄩ攣鏀寔锛孒06C涓嶆敮鎸�, 鍚庢湡閫氳繃鑳藉姏鍊兼敮鎸乚
/// </summary>
/// <param name="doorLock:褰撳墠闂ㄩ攣"></param>
- /// <returns></returns>
+ /// <returns>true:鏀寔甯稿紑锛沠alse锛� 涓嶆敮鎸佸父寮�</returns>
public static bool CanNormallyOpen(ZigBee.Device.DoorLock doorLock)
{
var listDevice = new List<CommonDevice> { };
@@ -165,7 +165,7 @@
/// <param name="doorLockMessType">瀵艰嚧闂ㄩ攣澶辨晥鐨勬搷浣滅被鍨�</param>
/// <param name="haveLogic">缃戝叧涓槸鍚﹀瓨鍦ㄩ�昏緫甯稿紑妯″紡</param>
/// <param name="action">鍥炶皟澶勭悊鏇存柊鍐呭</param>
- public static async void NomallyOpenModeInvalidDialog(ZigBee.Device.DoorLock doorLock, DoorLockMessType doorLockMessType, bool haveLogic, Action action = null)
+ public static async void NomallyOpenModeInvalidDialog(ZigBee.Device.DoorLock doorLock, DoorLockMessType doorLockMessType, bool haveLogic, Action<bool> action = null)
{
//甯稿紑妯″紡鍙兘涓讳汉鎿嶄綔
if (UserCenterResourse.UserInfo.AuthorityNo != 1)
@@ -202,7 +202,8 @@
//淇濇寔甯稿紑
NormallyOpenModeValue(doorLock, true);
}
- action?.Invoke();
+ action?.Invoke(doorLock.IsDoorLockNormallyMode);
+ action = null;
};
alert.CancelClickEvent += async () =>
@@ -226,7 +227,8 @@
NormallyOpenModeValue(doorLock, false);
CommonPage.Loading.Hide();
});
- action?.Invoke();
+ action?.Invoke(doorLock.IsDoorLockNormallyMode);
+ action = null;
return;
}
if (result.defaultControlResponseData.status != 0)
@@ -238,7 +240,8 @@
NormallyOpenModeValue(doorLock, false);
CommonPage.Loading.Hide();
});
- action?.Invoke();
+ action?.Invoke(doorLock.IsDoorLockNormallyMode);
+ action = null;
return;
}
else
@@ -259,7 +262,8 @@
//app鎿嶄綔涓嶅彇娑堚�滃父寮�妯″紡鈥�
DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
}
- action?.Invoke();
+ action?.Invoke(doorLock.IsDoorLockNormallyMode);
+ action = null;
};
alert.ConfirmClickEvent += async () =>
@@ -271,6 +275,7 @@
{
//娓╁眳鍩庢柟娉曪紵锛燂紵
//姝ゅ鏄惁瑕佸垹闄ゆ俯灞呭煄鐨勭壒娈婇�昏緫
+ var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll();
}
}
else
@@ -285,7 +290,8 @@
ShowTipMsg(Language.StringByID(R.MyInternationalizationString.GwResponseOvertime));
CommonPage.Loading.Hide();
});
- action?.Invoke();
+ action?.Invoke(doorLock.IsDoorLockNormallyMode);
+ action = null;
return;
}
if (result.defaultControlResponseData.status != 0)
@@ -296,7 +302,8 @@
ShowTipMsg(msg1);
CommonPage.Loading.Hide();
});
- action?.Invoke();
+ action?.Invoke(doorLock.IsDoorLockNormallyMode);
+ action = null;
return;
}
else
@@ -308,7 +315,7 @@
//鍒犻櫎璁剧疆甯稿紑妯″紡鍒涘缓鐨勯�昏緫
if (haveLogic)
{
- var resTemp1 = await Shared.Phone.Device.Logic.SkipView.Exist(3);
+ var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll();
//娓╁眳鍩庢柟娉曪紵锛燂紵
//姝ゅ鏄惁瑕佸垹闄ゆ俯灞呭煄鐨勭壒娈婇�昏緫
}
@@ -320,12 +327,12 @@
});
}
}
- action?.Invoke();
+ action?.Invoke(doorLock.IsDoorLockNormallyMode);
+ action = null;
};
}
-
-/// <summary>
+ /// <summary>
/// 鍒犻櫎甯稿紑妯″紡
/// </summary>
/// <param name="doorLock">褰撳墠闂ㄩ攣</param>
@@ -351,8 +358,7 @@
return false;
}
-
- /// <summary>
+ /// <summary>
/// 璁剧疆甯稿紑妯″紡
/// </summary>
/// <param name="doorLock">褰撳墠闂ㄩ攣</param>
@@ -361,7 +367,7 @@
public static async System.Threading.Tasks.Task<bool> SetNormallyOpenModeFuncAsync(ZigBee.Device.DoorLock doorLock)
{
//app璁剧疆鈥滃父寮�妯″紡鈥濆け璐�
- var result = await doorLock.SetNormallyOpenModeFuncAsync(false);
+ var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
if (result == null || result.defaultControlResponseData == null || result.defaultControlResponseData.status != 0)
{
return false;
@@ -375,6 +381,7 @@
}
return false;
}
+
/// <summary>
/// 鍚姩甯稿紑妯″紡銆愬脊绐椼��
/// </summary>
--
Gitblit v1.8.0