From 99da2604f81af29afc6b3c6f4f128b4e5a8a5649 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 13 五月 2020 12:00:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs | 92 ++++++++++++++++++++++++++-------------------
1 files changed, 53 insertions(+), 39 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
index 9d2ce5c..449c8e2 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
@@ -101,10 +101,10 @@
#region 甯稿紑妯″紡 API
/// <summary>
- /// 鑾峰彇褰撳墠闂ㄩ攣鐨勫父寮�妯″紡
+ /// 鑾峰彇褰撳墠闂ㄩ攣鐨勫父寮�妯″紡
/// </summary>
- /// <param name="doorLock:褰撳墠闂ㄩ攣"></param>
- /// <returns>null:娌℃湁鍥炲 锛� true:闂ㄩ攣甯稿紑锛沠alse锛氶棬閿佸父鍏�</returns>
+ /// <param name="doorLock:褰撳墠闂ㄩ攣"></param>
+ /// <returns>null:娌℃湁鍥炲 锛� true:闂ㄩ攣甯稿紑锛沠alse锛氶棬閿佸父鍏�</returns>
public static async System.Threading.Tasks.Task<bool?> GetNormallyOpenMode(ZigBee.Device.DoorLock doorLock)
{
bool? IsDoorLockNormallyMode = null;
@@ -131,8 +131,8 @@
/// <summary>
/// 闂ㄩ攣鏄惁鏀寔甯稿紑[杩欓噷鏆傛椂鍙湁S-One闂ㄩ攣鏀寔锛孒06C涓嶆敮鎸�, 鍚庢湡閫氳繃鑳藉姏鍊兼敮鎸乚
/// </summary>
- /// <param name="doorLock:褰撳墠闂ㄩ攣"></param>
- /// <returns>true:鏀寔甯稿紑锛沠alse锛� 涓嶆敮鎸佸父寮�</returns>
+ /// <param name="doorLock:褰撳墠闂ㄩ攣"></param>
+ /// <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)
@@ -194,15 +194,21 @@
{
if (doorLockMessType == DoorLockMessType.DeviceReport || doorLockMessType == DoorLockMessType.ServicePush)
{
- //涓婃姤鈥滃父寮�妯″紡鈥濆凡琚彇娑堬紝app榛樿浜嗏�滃父寮�妯″紡鈥濊鍙栨秷
+ //涓婃姤鈥滃父寮�妯″紡鈥濆凡琚彇娑堬紝app榛樿浜嗏�滃父寮�妯″紡鈥濊鍙栨秷
DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
+ if (haveLogic)
+ {
+ //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
+ var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll();
+ }
}
else
{
//淇濇寔甯稿紑
NormallyOpenModeValue(doorLock, true);
}
- action?.Invoke();
+ action?.Invoke(doorLock.IsDoorLockNormallyMode);
+ action = null;
};
alert.CancelClickEvent += async () =>
@@ -212,8 +218,11 @@
//涓婃姤鈥滃父寮�妯″紡鈥濆凡琚彇娑�
Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
- //娓╁眳鍩庢柟娉曪紵锛燂紵
- //姝ゅ鏄惁瑕佸垹闄ゆ俯灞呭煄鐨勭壒娈婇�昏緫
+ if (haveLogic)
+ {
+ //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
+ var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll();
+ }
//app閲嶆柊寮�鍚�滃父寮�妯″紡鈥�
var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
@@ -226,7 +235,8 @@
NormallyOpenModeValue(doorLock, false);
CommonPage.Loading.Hide();
});
- action?.Invoke();
+ action?.Invoke(doorLock.IsDoorLockNormallyMode);
+ action = null;
return;
}
if (result.defaultControlResponseData.status != 0)
@@ -238,12 +248,13 @@
NormallyOpenModeValue(doorLock, false);
CommonPage.Loading.Hide();
});
- action?.Invoke();
+ action?.Invoke(doorLock.IsDoorLockNormallyMode);
+ action = null;
return;
}
else
{
- //鍒涘缓甯稿紑妯″紡鐨勭壒娈婇�昏緫
+ //鍒涘缓甯稿紑妯″紡鐨勭壒娈婇�昏緫
var resu = await Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
Application.RunOnMainThread(() =>
{
@@ -256,10 +267,11 @@
}
else
{
- //app鎿嶄綔涓嶅彇娑堚�滃父寮�妯″紡鈥�
+ //app鎿嶄綔涓嶅彇娑堚�滃父寮�妯″紡鈥�
DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
}
- action?.Invoke();
+ action?.Invoke(doorLock.IsDoorLockNormallyMode);
+ action = null;
};
alert.ConfirmClickEvent += async () =>
@@ -269,8 +281,8 @@
NormallyOpenModeValue(doorLock, false);
if (haveLogic)
{
- //娓╁眳鍩庢柟娉曪紵锛燂紵
- //姝ゅ鏄惁瑕佸垹闄ゆ俯灞呭煄鐨勭壒娈婇�昏緫
+ //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
+ var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll();
}
}
else
@@ -285,7 +297,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,21 +309,21 @@
ShowTipMsg(msg1);
CommonPage.Loading.Hide();
});
- action?.Invoke();
+ action?.Invoke(doorLock.IsDoorLockNormallyMode);
+ action = null;
return;
}
else
{
//娣诲姞App寮�鍚父寮�妯″紡鐨勫巻鍙茶褰�
HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(doorLock, 9002, string.Empty);
- //app纭鍙栨秷鈥滃父寮�妯″紡鈥濇垚鍔�
+ //app纭鍙栨秷鈥滃父寮�妯″紡鈥濇垚鍔�
NormallyOpenModeValue(doorLock, false);
//鍒犻櫎璁剧疆甯稿紑妯″紡鍒涘缓鐨勯�昏緫
if (haveLogic)
{
- var resTemp1 = await Shared.Phone.Device.Logic.SkipView.Exist(3);
- //娓╁眳鍩庢柟娉曪紵锛燂紵
- //姝ゅ鏄惁瑕佸垹闄ゆ俯灞呭煄鐨勭壒娈婇�昏緫
+ //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
+ var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll();
}
Application.RunOnMainThread(() =>
{
@@ -320,7 +333,8 @@
});
}
}
- action?.Invoke();
+ action?.Invoke(doorLock.IsDoorLockNormallyMode);
+ action = null;
};
}
@@ -332,7 +346,7 @@
/// <returns></returns>
public static async System.Threading.Tasks.Task<bool> DelNormallyOpenMode(ZigBee.Device.DoorLock doorLock, Action action = null)
{
- //app鎿嶄綔鍙栨秷鈥滃父寮�妯″紡鈥�
+ //app鎿嶄綔鍙栨秷鈥滃父寮�妯″紡鈥�
var result = await doorLock.SetNormallyOpenModeFuncAsync(false);
if (result == null || result.defaultControlResponseData == null || result.defaultControlResponseData.status != 0)
{
@@ -342,7 +356,7 @@
if (result.defaultControlResponseData.status == 0)
{
- //app纭鍙栨秷鈥滃父寮�妯″紡鈥濇垚鍔�
+ //app纭鍙栨秷鈥滃父寮�妯″紡鈥濇垚鍔�
NormallyOpenModeValue(doorLock, false);
action?.Invoke();
return true;
@@ -358,8 +372,8 @@
/// <returns></returns>
public static async System.Threading.Tasks.Task<bool> SetNormallyOpenModeFuncAsync(ZigBee.Device.DoorLock doorLock)
{
- //app璁剧疆鈥滃父寮�妯″紡鈥濆け璐�
- var result = await doorLock.SetNormallyOpenModeFuncAsync(false);
+ //app璁剧疆鈥滃父寮�妯″紡鈥濆け璐�
+ var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
if (result == null || result.defaultControlResponseData == null || result.defaultControlResponseData.status != 0)
{
return false;
@@ -367,7 +381,7 @@
if (result.defaultControlResponseData.status == 0)
{
- //app璁剧疆鈥滃父寮�妯″紡鈥濇垚鍔�
+ //app璁剧疆鈥滃父寮�妯″紡鈥濇垚鍔�
NormallyOpenModeValue(doorLock, false);
return true;
}
@@ -392,7 +406,7 @@
return;
}
- //璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁堝浜庢墦寮�鐘舵�侊紝纭寮�鍚紵
+ //璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁堝浜庢墦寮�鐘舵�侊紝纭寮�鍚紵
string msg = Language.StringByID(R.MyInternationalizationString.SetDoorLockNomallyOpen).Replace("{0}", "\r\n");
var confirm = Language.StringByID(R.MyInternationalizationString.Confrim);
var alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.Confirm, msg, confirm);
@@ -409,7 +423,7 @@
/// </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);
@@ -465,8 +479,8 @@
/// <summary>
/// 闂ㄩ攣鏄惁鏀寔闊抽噺[杩欓噷鏆傛椂鍙湁S-One闂ㄩ攣鏀寔锛孒06C涓嶆敮鎸侊紝鍚庢湡閫氳繃鑳藉姏鍊兼敮鎸乚
/// </summary>
- /// <param name="doorLock:褰撳墠闂ㄩ攣"></param>
- /// <returns></returns>
+ /// <param name="doorLock:褰撳墠闂ㄩ攣"></param>
+ /// <returns></returns>
public static bool CanVolume(ZigBee.Device.DoorLock doorLock)
{
var listDevice = new List<CommonDevice> { };
@@ -481,7 +495,7 @@
#endregion
- #region 浠庝簯绔幏鍙栫殑鏂规硶
+ #region 浠庝簯绔幏鍙栫殑鏂规硶
/// <summary>
/// 鑾峰彇褰撳墠璐︽埛闂ㄩ攣鎿嶄綔鏉冮檺锛堟槸鍚﹁鍐荤粨锛�
/// </summary>
@@ -633,7 +647,7 @@
}
- //2銆佽鍙栦簯绔棬閿佷俊鎭�
+ //2銆佽鍙栦簯绔棬閿佷俊鎭�
var getDoorLockInfoAllList = new List<ZigBee.Device.DoorLock.CloudDoorLockObj> { };
var getDoorLockInfoList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAccountInfolist(doorLock);
if (getDoorLockInfoList != null)
@@ -1119,7 +1133,7 @@
/// <returns></returns>
public static DateTime GetDoorLockZoneTime()
{
- //閫氳繃缁忓害鑾峰彇鏃跺尯
+ //閫氳繃缁忓害鑾峰彇鏃跺尯
var gwZone = int.Parse(CaculateTimeZone(Common.Config.Instance.Home.Longitude));
//灏嗘湰鍦版椂闂磋浆鎹㈡垚涓栫晫鏃�
var utc = DateTime.Now.AddHours(-gwZone);
@@ -1133,7 +1147,7 @@
}
/// <summary>
- /// 鑾峰彇鏃跺尯
+ /// 鑾峰彇鏃跺尯
/// </summary>
/// <param name="currentLon">currentLon:"+"涓轰笢鍖猴紝鈥�-鈥濅负瑗垮尯</param>
/// <returns></returns>
@@ -1194,7 +1208,7 @@
#endregion
- #region 涓�鑸柟娉�
+ #region 涓�鑸柟娉�
/// <summary>
/// 鏄剧ず閿欒淇℃伅绐楀彛
/// </summary>
@@ -1221,6 +1235,6 @@
});
}
- #endregion
+ #endregion
}
}
--
Gitblit v1.8.0