From e96e11d6f8b965ea522c983e040d41e3b9ef105a Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 18 五月 2020 21:33:19 +0800
Subject: [PATCH] 2020-05-18-4
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 60 +++++++++++++++++++++++++++++++-----------------------------
1 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
old mode 100755
new mode 100644
index 37601a4..096bed2
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -684,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;
@@ -770,6 +770,7 @@
/// </summary>
public void ClickHandle()
{
+
//闂ㄩ攣鏍囬
btnDoorLockTitle.Text = Common.LocalDevice.Current.GetDeviceMacName(doorLock);
@@ -1024,18 +1025,17 @@
/// </summary>
private async void NomallyOpenDialog()
{
- #region 鍚庣画鐗堟湰
- //if (UserCenterResourse.UserInfo.AuthorityNo != 1)
- //{
- // this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.OnlyMasterOperate));
- // return;
- //}
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ {
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.OnlyMasterOperate));
+ return;
+ }
- //if (!UserCenterResourse.AccountOption.DoorUnLockByRemote)
- //{
- // SystemSecondAuthentication();
- // return;
- //}
+ if (!UserCenterResourse.AccountOption.DoorUnLockByRemote)
+ {
+ SystemSecondAuthentication();
+ return;
+ }
action = () =>
{
@@ -1052,20 +1052,22 @@
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;
+ }
+
+ var addLogicPage = new Shared.Phone.Device.Logic.SoneLogicList();
+ UserView.HomePage.Instance.AddChidren(addLogicPage);
+ UserView.HomePage.Instance.PageIndex += 1;
+ addLogicPage.Show();
+ addLogicPage._if = true;
+ addLogicPage.action += (w) =>
+ {
+ doorLock.IsDoorLockNormallyMode = w;
///鐣欑粰寰愭鐢ㄧ殑
- UpdateNomallyOpenStatus();
- };
+ UpdateNomallyOpenStatus();
+ };
+
};
- //HdlCheckLogic.Current.CheckSecondarySecurity(action);
- #endregion
+ HdlCheckLogic.Current.CheckSecondarySecurity(action);
}
@@ -1103,7 +1105,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);
@@ -1131,7 +1133,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);
@@ -1208,7 +1210,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);
@@ -1247,7 +1249,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)
//{
@@ -1320,7 +1322,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);
--
Gitblit v1.8.0