From 07466c19110693e3e439a7d7c8ad0bc21d9b3287 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 29 四月 2020 09:14:01 +0800
Subject: [PATCH] 优化代码，更改门锁需求接口
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs | 73 +++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 31 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
index bb30fa1..c00653b 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
@@ -11,6 +11,10 @@
{
#region 鏈湴鍙橀噺
/// <summary>
+ ///
+ /// </summary>
+ public static Action<bool> LogicAction = null;
+ /// <summary>
/// 缃戝叧锛堥棬閿侊級鎵�鍦ㄧ殑鏃堕棿
/// </summary>
public static DateTime DoorlockZoneTime = DateTime.Now;
@@ -154,6 +158,11 @@
else
{
doorLock.IsDoorLockNormallyMode.Add(key, value);
+ }
+
+ if (LogicAction != null)
+ {
+ LogicAction(value);
}
}
@@ -406,6 +415,27 @@
alert.ConfirmClickEvent += async () =>
{
+ NomallyOpenModeInvalidTimeDialog(doorLock, action);
+ };
+ }
+
+ /// <summary>
+ /// 甯稿紑妯″紡澶辨晥鏃堕棿澶勭悊銆愬脊绐椼��
+ /// </summary>
+ public static async void NomallyOpenModeInvalidTimeDialog(ZigBee.Device.DoorLock doorLock, Action action)
+ {
+ //澶辨晥璁剧疆
+ string msgTimeInValidSetting = Language.StringByID(R.MyInternationalizationString.DoorLockOpenAllTheTime);
+ var timeConfrim = Language.StringByID(R.MyInternationalizationString.Confrim);
+ var alertTimeInValidSetting = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.InValid, msgTimeInValidSetting, timeConfrim);
+ alertTimeInValidSetting.Show();
+
+ alertTimeInValidSetting.InvalidTimeAction += async (obj) =>
+ {
+ //甯稿紑妯″紡澶辨晥鏃堕棿璁剧疆鎴愬姛
+ var temp = int.Parse(obj);
+ DoorLockCommonInfo.NormallyOpenModeInvalidTime = temp;
+
Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
if (result == null || result.defaultControlResponseData == null)
@@ -436,43 +466,24 @@
action?.Invoke();
Application.RunOnMainThread(() =>
{
- NomallyOpenModeInvalidTimeDialog(doorLock);
CommonPage.Loading.Hide();
});
}
- };
- }
- /// <summary>
- /// 甯稿紑妯″紡澶辨晥鏃堕棿澶勭悊銆愬脊绐椼��
- /// </summary>
- public static async void NomallyOpenModeInvalidTimeDialog(ZigBee.Device.DoorLock doorLock)
- {
- //澶辨晥璁剧疆
- string msgTimeInValidSetting = Language.StringByID(R.MyInternationalizationString.DoorLockOpenAllTheTime);
- var timeConfrim = Language.StringByID(R.MyInternationalizationString.Confrim);
- var alertTimeInValidSetting = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.InValid, msgTimeInValidSetting, timeConfrim);
- alertTimeInValidSetting.Show();
-
- alertTimeInValidSetting.InvalidTimeAction += async (obj) =>
- {
- //甯稿紑妯″紡澶辨晥鏃堕棿璁剧疆鎴愬姛
- var temp = int.Parse(obj);
- DoorLockCommonInfo.NormallyOpenModeInvalidTime = temp;
//榛樿鍒涘缓甯稿紑妯″紡鐨勭壒娈婇�昏緫
var res = await Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
- if (!res)
- {
- Application.RunOnMainThread(() =>
- {
- //榛樿鍒涘缓甯稿紑妯″紡澶辫触
- string msg0 = Language.StringByID(R.MyInternationalizationString.AddLogicNormallyModeFailed);
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal, msg0, Language.StringByID(R.MyInternationalizationString.confrim));
- alert.Show();
- //浜屾鍔犺浇寮圭獥 甯稿紑妯″紡寮�鍚彁绀�
- NomallyOpenModeInvalidTimeDialog(doorLock);
- });
- }
+ //if (!res)
+ //{
+ // Application.RunOnMainThread(() =>
+ // {
+ // //榛樿鍒涘缓甯稿紑妯″紡澶辫触
+ // string msg0 = Language.StringByID(R.MyInternationalizationString.AddLogicNormallyModeFailed);
+ // var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal, msg0, Language.StringByID(R.MyInternationalizationString.confrim));
+ // alert.Show();
+ // //浜屾鍔犺浇寮圭獥 甯稿紑妯″紡寮�鍚彁绀�
+ // NomallyOpenModeInvalidTimeDialog(doorLock, action);
+ // });
+ //}
};
}
#endregion
--
Gitblit v1.8.0