先上传个版本吧

黄学彪

2020-02-21 bd46c57c77c276014db3192a4e2cc96e23c93202

 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;
                    }