From bd46c57c77c276014db3192a4e2cc96e23c93202 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 21 二月 2020 13:08:47 +0800
Subject: [PATCH] 先上传个版本吧
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs | 66 ++++++++++++++++++++++++++++-----
1 files changed, 56 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
index 12f0ba6..50f9bfe 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
@@ -9,19 +9,61 @@
public class DoorLockCommonInfo : CommonDevice
{
#region 鏈湴鍙橀噺
+ /// <summary>
+ /// 鏄惁鏀寔淇敼
+ /// </summary>
public static bool IsModify = false;
+ /// <summary>
+ /// 鏄惁鏄剧ず涓存椂瀵嗙爜
+ /// </summary>
public static bool InTempPasswordVisiable = false;
+ /// <summary>
+ /// 鏈夋晥鏃ユ湡鈥滃勾鈥�
+ /// </summary>
public static int ValidDateYear = 0;
+ /// <summary>
+ /// 鏈夋晥鏃ユ湡鈥滄湀鈥�
+ /// </summary>
public static int ValidDateMonth = 0;
+ /// <summary>
+ /// 鏈夋晥鏃ユ湡鈥滄棩鈥�
+ /// </summary>
public static int ValidDateDay = 0;
+ /// <summary>
+ /// 鏈夋晥鏃ユ湡鈥滄椂鈥�
+ /// </summary>
public static int ValidDateHour = 100;
+ /// <summary>
+ /// 鏈夋晥鏃ユ湡鈥滃垎鈥�
+ /// </summary>
public static int ValidDateMinute = 100;
+ /// <summary>
+ /// 鏈夋晥鏃ユ湡鈥滅鈥�
+ /// </summary>
public static int ValidDateSecond = 0;
+ /// <summary>
+ /// 澶辨晥鏁堟棩鏈熲�滃勾鈥�
+ /// </summary>
public static int InValidDateYear = 0;
+ /// <summary>
+ /// 澶辨晥鏁堟棩鏈熲�滄湀鈥�
+ /// </summary>
public static int InValidDateMonth = 0;
+ /// <summary>
+ /// 澶辨晥鏁堟棩鏈熲�滄棩鈥�
+ /// </summary>
public static int InValidDateDay = 0;
+ /// <summary>
+ /// 澶辨晥鏁堟棩鏈熲�滄椂鈥�
+ /// </summary>
public static int InValidDateHour = 100;
+ /// <summary>
+ /// 澶辨晥鏁堟棩鏈熲�滃垎鈥�
+ /// </summary>
public static int InValidDateMinute = 100;
+ /// <summary>
+ /// 澶辨晥鏁堟棩鏈熲�滅鈥�
+ /// </summary>
public static int InValidDateSecond = 0;
#endregion
@@ -208,7 +250,7 @@
{
foreach (var curDoorLockUser in getDoorLockInfoAllList)
{
- if (curDoorLockUser.DoorLockLocalUserId == null || curDoorLockUser.DoorLockLocalUserId == "")
+ if (string.IsNullOrEmpty(curDoorLockUser.DoorLockLocalUserId))
{
continue;
}
@@ -242,7 +284,6 @@
deleteDoorLockData.PrimaryId = curDoorLockUser.Id;
deleteDoorLockData.DelDoorLockDelType = 2;
var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
- int i = 0;
}
}
}
@@ -297,7 +338,7 @@
{
foreach (var curDoorLockUser in getDoorLockInfoList.PageData)
{
- if (curDoorLockUser.DoorLockLocalUserId == null || curDoorLockUser.DoorLockLocalUserId == "")
+ if (string.IsNullOrEmpty(curDoorLockUser.DoorLockLocalUserId))
{
continue;
}
@@ -331,7 +372,6 @@
deleteDoorLockData.PrimaryId = curDoorLockUser.Id;
deleteDoorLockData.DelDoorLockDelType = 2;
var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
- int i = 0;
}
}
}
@@ -379,7 +419,10 @@
{
for (int j = 1; j < getDoorLockInfoList.TotalPages; j++)
{
- var getDoorLockInfoListTemp = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAccountInfolist(doorLock, j + 1);
+ var pageSetting = new ZigBee.Device.DoorLock.PageSetting() { };
+ pageSetting.Page = j + 1;
+ localDoorLockObj.pageSetting = pageSetting;
+ var getDoorLockInfoListTemp = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("DoorLock/GetDoorLockPager", localDoorLockObj);
if (getDoorLockInfoListTemp != null)
{
if (getDoorLockInfoListTemp.PageData.Count != 0)
@@ -397,7 +440,7 @@
{
foreach (var curDoorLockUser in getDoorLockInfoAllList)
{
- if (curDoorLockUser.DoorLockLocalUserId == null || curDoorLockUser.DoorLockLocalUserId == "")
+ if (string.IsNullOrEmpty(curDoorLockUser.DoorLockLocalUserId))
{
continue;
}
@@ -437,7 +480,7 @@
//鑾峰彇浜戠瀛樺偍鐨勯棬閿佹垚鍛樹俊鎭�
foreach (var curDoorLockUser in getDoorLockInfoList.PageData)
{
- if (curDoorLockUser.CloudAccountId == "" || curDoorLockUser.CloudAccountId != subAccountDistributedMark)
+ if (string.IsNullOrEmpty(curDoorLockUser.CloudAccountId) || curDoorLockUser.CloudAccountId != subAccountDistributedMark)
{
continue;
}
@@ -460,7 +503,7 @@
return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<List<ZigBee.Device.DoorLock.GetDoorLockDataRes>>>)(async () =>
{
var getDoorLockInfoAllList = new List<ZigBee.Device.DoorLock.GetDoorLockDataRes> { };
- int curPage = 1;
+
// 璇诲彇浜戠闂ㄩ攣璁惧涓殑淇℃伅
var localDoorLockObj = new ZigBee.Device.DoorLock.GetDoorLockData() { };
@@ -488,7 +531,10 @@
{
for (int j = 1; j < getDoorLockInfoList.TotalPages; j++)
{
- var getDoorLockInfoListTemp = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAccountInfolist(doorLock, j + 1);
+ var pageSetting = new ZigBee.Device.DoorLock.PageSetting() { };
+ pageSetting.Page = j + 1;
+ localDoorLockObj.pageSetting = pageSetting;
+ var getDoorLockInfoListTemp = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("DoorLock/GetDoorLockPager", localDoorLockObj);
if (getDoorLockInfoListTemp != null)
{
getDoorLockInfoAllList.Add(getDoorLockInfoListTemp);
@@ -592,7 +638,7 @@
{
var curDoorLockUser = doorLock.localDoorLockAccountList[curUserId];
- if (curDoorLockUser.ConnectedAccount == "" || curDoorLockUser.ConnectedAccount != curAccountObj.SubAccountDistributedMark)
+ if (string.IsNullOrEmpty(curDoorLockUser.ConnectedAccount) || curDoorLockUser.ConnectedAccount != curAccountObj.SubAccountDistributedMark)
{
continue;
}
--
Gitblit v1.8.0