From 6bca8fcd37a48808a0b9c9342fc1be0adddfece6 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 08 五月 2020 17:46:44 +0800
Subject: [PATCH] 请合并最新代码，优化绑定信息
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs | 119 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 63 insertions(+), 56 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
index d312134..6a50add 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
@@ -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 () =>
@@ -285,7 +289,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 +301,8 @@
ShowTipMsg(msg1);
CommonPage.Loading.Hide();
});
- action?.Invoke();
+ action?.Invoke(doorLock.IsDoorLockNormallyMode);
+ action = null;
return;
}
else
@@ -320,58 +326,59 @@
});
}
}
- action?.Invoke();
+ action?.Invoke(doorLock.IsDoorLockNormallyMode);
+ action = null;
};
}
- /// <summary>
- /// 鍒犻櫎甯稿紑妯″紡
- /// </summary>
- /// <param name="doorLock">褰撳墠闂ㄩ攣</param>
- /// <param name="action">鍥炶皟澶勭悊鏇存柊鍐呭</param>
- /// <returns></returns>
- public static async System.Threading.Tasks.Task<bool> DelNormallyOpenMode(ZigBee.Device.DoorLock doorLock, Action action = null)
- {
- //app鎿嶄綔鍙栨秷鈥滃父寮�妯″紡鈥�
- var result = await doorLock.SetNormallyOpenModeFuncAsync(false);
- if (result == null || result.defaultControlResponseData == null || result.defaultControlResponseData.status != 0)
- {
- action?.Invoke();
- return false;
- }
-
- if (result.defaultControlResponseData.status == 0)
- {
- //app纭鍙栨秷鈥滃父寮�妯″紡鈥濇垚鍔�
- NormallyOpenModeValue(doorLock, false);
- action?.Invoke();
- return true;
- }
- return false;
- }
-
- /// <summary>
- /// 璁剧疆甯稿紑妯″紡
- /// </summary>
- /// <param name="doorLock">褰撳墠闂ㄩ攣</param>
- /// <param name="action">鍥炶皟澶勭悊鏇存柊鍐呭</param>
- /// <returns></returns>
- public static async System.Threading.Tasks.Task<bool> SetNormallyOpenModeFuncAsync(ZigBee.Device.DoorLock doorLock)
- {
- //app璁剧疆鈥滃父寮�妯″紡鈥濆け璐�
- var result = await doorLock.SetNormallyOpenModeFuncAsync(false);
- if (result == null || result.defaultControlResponseData == null || result.defaultControlResponseData.status != 0)
- {
- return false;
- }
-
- if (result.defaultControlResponseData.status == 0)
- {
- //app璁剧疆鈥滃父寮�妯″紡鈥濇垚鍔�
- NormallyOpenModeValue(doorLock, false);
- return true;
- }
- return false;
+ /// <summary>
+ /// 鍒犻櫎甯稿紑妯″紡
+ /// </summary>
+ /// <param name="doorLock">褰撳墠闂ㄩ攣</param>
+ /// <param name="action">鍥炶皟澶勭悊鏇存柊鍐呭</param>
+ /// <returns></returns>
+ public static async System.Threading.Tasks.Task<bool> DelNormallyOpenMode(ZigBee.Device.DoorLock doorLock, Action action = null)
+ {
+ //app鎿嶄綔鍙栨秷鈥滃父寮�妯″紡鈥�
+ var result = await doorLock.SetNormallyOpenModeFuncAsync(false);
+ if (result == null || result.defaultControlResponseData == null || result.defaultControlResponseData.status != 0)
+ {
+ action?.Invoke();
+ return false;
+ }
+
+ if (result.defaultControlResponseData.status == 0)
+ {
+ //app纭鍙栨秷鈥滃父寮�妯″紡鈥濇垚鍔�
+ NormallyOpenModeValue(doorLock, false);
+ action?.Invoke();
+ return true;
+ }
+ return false;
+ }
+
+ /// <summary>
+ /// 璁剧疆甯稿紑妯″紡
+ /// </summary>
+ /// <param name="doorLock">褰撳墠闂ㄩ攣</param>
+ /// <param name="action">鍥炶皟澶勭悊鏇存柊鍐呭</param>
+ /// <returns></returns>
+ public static async System.Threading.Tasks.Task<bool> SetNormallyOpenModeFuncAsync(ZigBee.Device.DoorLock doorLock)
+ {
+ //app璁剧疆鈥滃父寮�妯″紡鈥濆け璐�
+ var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
+ if (result == null || result.defaultControlResponseData == null || result.defaultControlResponseData.status != 0)
+ {
+ return false;
+ }
+
+ if (result.defaultControlResponseData.status == 0)
+ {
+ //app璁剧疆鈥滃父寮�妯″紡鈥濇垚鍔�
+ NormallyOpenModeValue(doorLock, false);
+ return true;
+ }
+ return false;
}
/// <summary>
--
Gitblit v1.8.0