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/DoorLockCommonInfo.cs | 170 ++++++++++++++++++++------------------------------------
1 files changed, 60 insertions(+), 110 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
index 6ac755d..682519c 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
@@ -13,7 +13,7 @@
/// <summary>
/// 鏇存柊鈥滈�昏緫甯稿紑鈥濈晫闈㈢殑鍥炶皟
/// </summary>
- public static Action<bool> LogicAction = null;
+ public static Action<bool> LogicAction= null;
/// <summary>
/// 缃戝叧锛堥棬閿侊級鎵�鍦ㄧ殑鏃堕棿
/// </summary>
@@ -150,15 +150,7 @@
/// </summary>
public static void NormallyOpenModeValue(ZigBee.Device.DoorLock doorLock, bool value)
{
- string key = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
- if (doorLock.IsDoorLockNormallyMode.ContainsKey(key))
- {
- doorLock.IsDoorLockNormallyMode[key] = value;
- }
- else
- {
- doorLock.IsDoorLockNormallyMode.Add(key, value);
- }
+ doorLock.IsDoorLockNormallyMode = value;
if (LogicAction != null)
{
@@ -219,17 +211,9 @@
{
//涓婃姤鈥滃父寮�妯″紡鈥濆凡琚彇娑�
Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
- //鍏堝垹闄ゅ凡澶辨晥鐨勨�滃父寮�妯″紡鈥濈殑閫昏緫
- //if (resTemp == 1)
- //{
- // var restulTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
- // //if (restulTemp == 3)
- // //{
- // // string msg0 = Language.StringByID(R.MyInternationalizationString.CancelLogicNormallyModeFailed2);
- // // this.ShowTipMsg(msg0);
- // // return;
- // //}
- //}
+
+ //娓╁眳鍩庢柟娉曪紵锛燂紵
+ //姝ゅ鏄惁瑕佸垹闄ゆ俯灞呭煄鐨勭壒娈婇�昏緫
//app閲嶆柊寮�鍚�滃父寮�妯″紡鈥�
var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
@@ -241,7 +225,6 @@
ShowTipMsg(msg0);
NormallyOpenModeValue(doorLock, false);
CommonPage.Loading.Hide();
- //new Tip() { MaxWidth = 150, Text = msg0, Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
});
action?.Invoke();
return;
@@ -254,7 +237,6 @@
ShowTipMsg(msg1);
NormallyOpenModeValue(doorLock, false);
CommonPage.Loading.Hide();
- //new Tip() { MaxWidth = 150, Text = msg1, Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
});
action?.Invoke();
return;
@@ -269,7 +251,6 @@
ShowTipMsg(msg0);
NormallyOpenModeValue(doorLock, true);
CommonPage.Loading.Hide();
- //new Tip() { MaxWidth = 150, Text = msg0, Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
});
}
}
@@ -288,12 +269,8 @@
NormallyOpenModeValue(doorLock, false);
if (haveLogic)
{
- var resTemp2 = await Shared.Phone.Device.Logic.SkipView.Exist(3);
- //if (resTemp2 == 3)
- //{
- // string msg0 = Language.StringByID(R.MyInternationalizationString.CancelLogicNormallyModeFailed);
- // this.ShowTipMsg(msg0);
- //}
+ //娓╁眳鍩庢柟娉曪紵锛燂紵
+ //姝ゅ鏄惁瑕佸垹闄ゆ俯灞呭煄鐨勭壒娈婇�昏緫
}
}
else
@@ -307,7 +284,6 @@
{
ShowTipMsg(Language.StringByID(R.MyInternationalizationString.GwResponseOvertime));
CommonPage.Loading.Hide();
- //new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
});
action?.Invoke();
return;
@@ -319,7 +295,6 @@
string msg1 = Language.StringByID(R.MyInternationalizationString.CloseNormallyOpenModeFailed);
ShowTipMsg(msg1);
CommonPage.Loading.Hide();
- //new Tip() { MaxWidth = 150, Text = msg1, Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
});
action?.Invoke();
return;
@@ -333,23 +308,9 @@
//鍒犻櫎璁剧疆甯稿紑妯″紡鍒涘缓鐨勯�昏緫
if (haveLogic)
{
- var resTemp1 = await Shared.Phone.Device.Logic.SkipView.Exist(3);
- //鍥犱负鐩墠鏈哄埗闂锛岄�昏緫缁忓父澶辫触锛屾墍浠ヤ笉鎻愮ず锛屽悗鏈熸満鍒惰鏀癸紝閲嶆柊鍋氫竴涓繖涓晫闈�
- //if (resTemp1 == 3)
- //{
- //Application.RunOnMainThread(() =>
- //{
- // string msg0 = Language.StringByID(R.MyInternationalizationString.CancelLogicNormallyModeFailed);
- // ShowTipMsg(msg0);
- //});
- //}
- //else if (resTemp1 == 2)
- //{
- //Application.RunOnMainThread(() =>
- //{
- // string msg0 = Language.StringByID(R.MyInternationalizationString.CloseNormallyOpenModeSuccess);
- // ShowTipMsg(msg0);
- //});
+ var resTemp1 = await Shared.Phone.Device.Logic.SkipView.Exist(3, doorLock);
+ //娓╁眳鍩庢柟娉曪紵锛燂紵
+ //姝ゅ鏄惁瑕佸垹闄ゆ俯灞呭煄鐨勭壒娈婇�昏緫
}
Application.RunOnMainThread(() =>
{
@@ -363,56 +324,57 @@
};
}
- /// <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> 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> 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>
/// 鍚姩甯稿紑妯″紡銆愬脊绐椼��
/// </summary>
@@ -494,20 +456,8 @@
});
}
- //榛樿鍒涘缓甯稿紑妯″紡鐨勭壒娈婇�昏緫
- 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, action);
- // });
- //}
+ //娓╁眳鍩庢柟娉曪紵锛燂紵
+ //姝ゅ鏄惁瑕佸垱寤哄父寮�妯″紡鐨勭壒娈婇�昏緫
};
}
#endregion
@@ -1270,9 +1220,9 @@
var contr = new ShowMsgControl(ShowMsgType.Tip, msg);
contr.Show();
});
+
}
- #endregion
-
+ #endregion
}
}
--
Gitblit v1.8.0