修改引用路径

chenqiyang

2022-06-22 dc0309e64f02227d8e1468b7326c07955f804612

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs

@@ -11,9 +11,23 @@
    {
        #region  本地变量
        /// <summary>
        /// 更新“逻辑常开”界面的回调
        /// </summary>
        public static Action<bool> LogicAction = null;
        /// <summary>
        /// 更新当前门锁涉及的状态【主要用于门锁操作常开模式的回调】
        /// </summary>
        public static Action<string, bool> UpdateCurrentDoorlockAction = null;
        /// <summary>
        /// 网关（门锁）所在的时间
        /// </summary>
        public static DateTime DoorlockZoneTime = DateTime.Now;
        /// <summary>
        /// 所有门锁中的常开模式值[用于推送查询，提示门锁失效）
        /// keys:门锁mac+epoint value:是否常开模式
        /// ture:常开； false:关闭
        /// </summary>
        public static Dictionary<string, bool?> DoorLockNormallyMode = new Dictionary<string, bool?> { };
        /// <summary>
        /// 常开模式执行时间
        /// </summary>
@@ -128,13 +142,13 @@
        /// 门锁是否支持常开[这里暂时只有S-One门锁支持，H06C不支持, 后期通过能力值支持]
        /// </summary>
        /// <param name="doorLock:当前门锁"></param> 
        /// <returns></returns> 
        /// <returns>true:支持常开；false： 不支持常开</returns> 
        public static bool CanNormallyOpen(ZigBee.Device.DoorLock doorLock)
        {
            var listDevice = new List<CommonDevice> { };
            listDevice.Add(doorLock);
            var devTemp = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
            if (devTemp.ConcreteType == DeviceConcreteType.IntelligentLocks_Sone)
            if (devTemp.ConcreteType != DeviceConcreteType.IntelligentLocks_H06C)
            {
                return true;
            }
@@ -146,14 +160,14 @@
        /// </summary>
        public static void NormallyOpenModeValue(ZigBee.Device.DoorLock doorLock, bool value)
        {
            string key = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
            if (doorLock.IsDoorLockNormallyMode.ContainsKey(key))
            doorLock.IsDoorLockNormallyMode = value;
            if (DoorLockCommonInfo.DoorLockNormallyMode.ContainsKey(doorLock.DeviceAddr + doorLock.DeviceEpoint))
            {
                doorLock.IsDoorLockNormallyMode[key] = value;
                DoorLockCommonInfo.DoorLockNormallyMode[doorLock.DeviceAddr + doorLock.DeviceEpoint] = value;
            }
            else
            {
                doorLock.IsDoorLockNormallyMode.Add(key, value);
                DoorLockCommonInfo.DoorLockNormallyMode.Add(doorLock.DeviceAddr + doorLock.DeviceEpoint, value);
            }
        }

@@ -162,9 +176,10 @@
        /// </summary>
        /// <param name="doorLock">当前门锁</param>
        /// <param name="doorLockMessType">导致门锁失效的操作类型</param>
        /// <param name="haveLogic">网关中是否存在逻辑常开模式</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)
        /// <param name="type">1:确认常开模式已经开启；0:常开模式失效提示</param>
        public static async void NomallyOpenModeInvalidDialog(ZigBee.Device.DoorLock doorLock, DoorLockMessType doorLockMessType, bool haveLogic, Action<bool> action = null, int type = 0)
        {
            //常开模式只能主人操作
            if (UserCenterResourse.UserInfo.AuthorityNo != 1)
@@ -195,13 +210,23 @@
                {
                    //上报“常开模式”已被取消，app默认了“常开模式”被取消 
                    DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
                    if (LogicAction != null)
                    {
                        LogicAction(false);
                    }
                    if (haveLogic)
                    {
                        //此处删除温居城的常开模式特殊逻辑
                        var resTemp1 = await Shared.Phone.Device.Logic.SkipView.DelAllLogic(doorLock);
                    }
                }
                else
                {
                    //保持常开
                    NormallyOpenModeValue(doorLock, true);
                }
                action?.Invoke();
                action?.Invoke(doorLock.IsDoorLockNormallyMode);
                action = null;
            };

            alert.CancelClickEvent += async () =>
@@ -210,17 +235,6 @@
                {
                    //上报“常开模式”已被取消
                    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);
@@ -232,9 +246,13 @@
                            ShowTipMsg(msg0);
                            NormallyOpenModeValue(doorLock, false);
                            CommonPage.Loading.Hide();
                            //new Tip() { MaxWidth = 150, Text = msg0, Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
                        });
                        action?.Invoke();
                        action?.Invoke(doorLock.IsDoorLockNormallyMode);
                        action = null;
                        if (LogicAction != null)
                        {
                            LogicAction(false);
                        }
                        return;
                    }
                    if (result.defaultControlResponseData.status != 0)
@@ -245,22 +263,28 @@
                            ShowTipMsg(msg1);
                            NormallyOpenModeValue(doorLock, false);
                            CommonPage.Loading.Hide();
                            //new Tip() { MaxWidth = 150, Text = msg1, Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
                        });
                        action?.Invoke();

                        action?.Invoke(doorLock.IsDoorLockNormallyMode);
                        action = null;
                        if (LogicAction != null)
                        {
                            LogicAction(false);
                        }
                        return;
                    }
                    else
                    {
                        //创建常开模式的特殊逻辑 
                        var resu = await Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
                        Application.RunOnMainThread(() =>
                        {
                            string msg0 = Language.StringByID(R.MyInternationalizationString.OpenNormallyOpenModeSuccess);
                            ShowTipMsg(msg0);
                            NormallyOpenModeValue(doorLock, true);
                            CommonPage.Loading.Hide();
                            //new Tip() { MaxWidth = 150, Text = msg0, Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
                            if (LogicAction != null)
                            {
                                LogicAction(true);
                            }
                        });
                    }
                }
@@ -269,7 +293,8 @@
                    //app操作不取消“常开模式” 
                    DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
                }
                action?.Invoke();
                action?.Invoke(doorLock.IsDoorLockNormallyMode);
                action = null;
            };

            alert.ConfirmClickEvent += async () =>
@@ -277,14 +302,14 @@
                if (doorLockMessType == DoorLockMessType.DeviceReport || doorLockMessType == DoorLockMessType.ServicePush)
                {
                    NormallyOpenModeValue(doorLock, false);
                    if (LogicAction != null)
                    {
                        LogicAction(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);
                        //}
                        //此处删除温居城的常开模式特殊逻辑
                        var resTemp1 = await Shared.Phone.Device.Logic.SkipView.DelAllLogic(doorLock);
                    }
                }
                else
@@ -298,9 +323,13 @@
                        {
                            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();
                        action?.Invoke(doorLock.IsDoorLockNormallyMode);
                        action = null;
                        if (LogicAction != null)
                        {
                            LogicAction(false);
                        }
                        return;
                    }
                    if (result.defaultControlResponseData.status != 0)
@@ -310,9 +339,13 @@
                            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();
                        action?.Invoke(doorLock.IsDoorLockNormallyMode);
                        action = null;
                        if (LogicAction != null)
                        {
                            LogicAction(false);
                        }
                        return;
                    }
                    else
@@ -324,23 +357,8 @@
                        //删除设置常开模式创建的逻辑
                        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.DelAllLogic(doorLock);
                        }
                        Application.RunOnMainThread(() =>
                        {
@@ -348,36 +366,65 @@
                            ShowTipMsg(msg2);
                            CommonPage.Loading.Hide();
                        });
                        if (LogicAction != null)
                        {
                            LogicAction(false);
                        }
                    }
                }
                action?.Invoke();
                action?.Invoke(doorLock.IsDoorLockNormallyMode);
                action = null;
            };
        }

        /// <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(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>
@@ -406,6 +453,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 +504,12 @@
                    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);
                    });
                }
                //温居城方法？？？
                //此处是否要创建常开模式的特殊逻辑
            };
        }
        #endregion
@@ -488,7 +525,7 @@
            var listDevice = new List<CommonDevice> { };
            listDevice.Add(doorLock);
            var devTemp = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
            if (devTemp.ConcreteType == DeviceConcreteType.IntelligentLocks_Sone)
            if (devTemp.ConcreteType != DeviceConcreteType.IntelligentLocks_H06C)
            {
                return true;
            }
@@ -570,26 +607,28 @@
                    var SubAccounListTemp = await ZigBee.Device.DoorLock.GetSubAccountByDistributedMark();
                    var SubAccounListDictionary = new Dictionary<string, Shared.Phone.UserCenter.MemberInfoRes> { };

                    foreach (var member in SubAccounListTemp)
                    {
                        //判断一个账户绑定了邮箱的情况
                        if (SubAccounListDictionary.ContainsKey(member.DistributedMark) == true
                        || member.Account == UserCenterResourse.UserInfo.Phone
                        || member.Account == UserCenterResourse.UserInfo.Email)
                        {
                            //如果是它自己的话，不显示,账户和绑定的邮箱只显示其中之一
                            continue;
                    if (SubAccounListTemp != null)

                    {

                        foreach (var member in SubAccounListTemp)

                        {

                            //判断一个账户绑定了邮箱的情况

                            if (SubAccounListDictionary.ContainsKey(member.DistributedMark) == true

                            || member.Account == UserCenterResourse.UserInfo.Phone

                            || member.Account == UserCenterResourse.UserInfo.Email)

                            {

                                //如果是它自己的话，不显示,账户和绑定的邮箱只显示其中之一

                                continue;

                            }

                            //去掉子账户中普通成员，留下拥有管理员权限的成员

                            //（因为分配账户给普通成员，普通成员在app中不能进入设备管理那里，所以没发查看主人分配对账户）

                            if (member.AccountType != 1)

                            {

                                continue;

                            }



                            SubAccounListDictionary.Add(member.DistributedMark, member);

                        }
                        //去掉子账户中普通成员，留下拥有管理员权限的成员
                        //（因为分配账户给普通成员，普通成员在app中不能进入设备管理那里，所以没发查看主人分配对账户）
                        if (member.AccountType != 1)
                        {
                            continue;
                        }

                        SubAccounListDictionary.Add(member.DistributedMark, member);
                    }

                    foreach (var addMemberID in SubAccounListDictionary.Keys)
                    {
                        SubAccounList.Add(SubAccounListDictionary[addMemberID]);
@@ -1014,81 +1053,81 @@
        /// <summary>
        ///  获取云端存储的门锁成员信息
        /// </summary>
        public static async System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>> GetLocaDoorLockAccountlist(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes curAccountObj, int curPage)
        {
            return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>>>)(async () =>
            {
                //  读取云端门锁设备中的信息
                var localDoorLockObj = new ZigBee.Device.DoorLock.GetDoorLockData() { };
                if (UserCenterResourse.UserInfo.AuthorityNo != 1)
                {
                    localDoorLockObj.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
                    localDoorLockObj.IsOtherAccountCtrl = true;
                }
                localDoorLockObj.CloudAccountId = curAccountObj.SubAccountDistributedMark;
                {
                    localDoorLockObj.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
                }
                if (doorLock.DeviceAddr != null)
                {
                    localDoorLockObj.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
                }
                var pageSetting = new ZigBee.Device.DoorLock.PageSetting() { };
                pageSetting.Page = curPage;
                localDoorLockObj.pageSetting = pageSetting;
                var getDoorLockInfoList = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("DoorLock/GetDoorLockPager", localDoorLockObj);
                if (getDoorLockInfoList != null)
                {
                    foreach (var curDoorLockUser in getDoorLockInfoList.PageData)
                    {
                        var doorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
                        if (curDoorLockUser.DoorLockLocalUserId != null)
                        {
                            doorLockObj.UserID = int.Parse(curDoorLockUser.DoorLockLocalUserId);
                            doorLockObj.UnlockType = curDoorLockUser.OpenLockMode;
                            doorLockObj.UserName = curDoorLockUser.UserIdRemarks;
                        }
                        doorLockObj.PrimaryId = curDoorLockUser.Id;
                        doorLockObj.EntryTime = curDoorLockUser.EntryTime;
                        doorLockObj.ConnectedAccount = curDoorLockUser.CloudAccountId;
                        if (doorLock.localDoorLockAccountList.ContainsKey(curDoorLockUser.CloudAccountId) == false)
                        {
                            doorLock.localDoorLockAccountList.Add(doorLockObj.ConnectedAccount, doorLockObj);
                        }
                        else
                        {
                            doorLock.localDoorLockAccountList[curDoorLockUser.DoorLockLocalUserId] = doorLockObj;
                        }
                    }
                }
                return doorLock.localDoorLockUserList;
            }));
        }
        //public static async System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>> GetLocaDoorLockAccountlist(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes curAccountObj, int curPage)
        //{
        //    return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>>>)(async () =>
        //    {
        //        //  读取云端门锁设备中的信息
        //        var localDoorLockObj = new ZigBee.Device.DoorLock.GetDoorLockData() { };
        //        if (UserCenterResourse.UserInfo.AuthorityNo != 1)
        //        {
        //            localDoorLockObj.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
        //            localDoorLockObj.IsOtherAccountCtrl = true;
        //        }
        //        localDoorLockObj.CloudAccountId = curAccountObj.SubAccountDistributedMark;
        //        {
        //            localDoorLockObj.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
        //        }
        //        if (doorLock.DeviceAddr != null)
        //        {
        //            localDoorLockObj.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
        //        }
        //        var pageSetting = new ZigBee.Device.DoorLock.PageSetting() { };
        //        pageSetting.Page = curPage;
        //        localDoorLockObj.pageSetting = pageSetting;
        //        var getDoorLockInfoList = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("DoorLock/GetDoorLockPager", localDoorLockObj);
        //        if (getDoorLockInfoList != null)
        //        {
        //            foreach (var curDoorLockUser in getDoorLockInfoList.PageData)
        //            {
        //                var doorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
        //                if (curDoorLockUser.DoorLockLocalUserId != null)
        //                {
        //                    doorLockObj.UserID = int.Parse(curDoorLockUser.DoorLockLocalUserId);
        //                    doorLockObj.UnlockType = curDoorLockUser.OpenLockMode;
        //                    doorLockObj.UserName = curDoorLockUser.UserIdRemarks;
        //                }
        //                doorLockObj.PrimaryId = curDoorLockUser.Id;
        //                doorLockObj.EntryTime = curDoorLockUser.EntryTime;
        //                doorLockObj.ConnectedAccount = curDoorLockUser.CloudAccountId;
        //                if (doorLock.localDoorLockAccountList.ContainsKey(curDoorLockUser.CloudAccountId) == false)
        //                {
        //                    doorLock.localDoorLockAccountList.Add(doorLockObj.ConnectedAccount, doorLockObj);
        //                }
        //                else
        //                {
        //                    doorLock.localDoorLockAccountList[curDoorLockUser.DoorLockLocalUserId] = doorLockObj;
        //                }
        //            }
        //        }
        //        return doorLock.localDoorLockUserList;
        //    }));
        //}

        /// <summary>
        ///  获取本地匹配成员的门锁用户信息列表
        /// </summary>
        public static async System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>> GetMatchDoorlockAccountList(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes curAccountObj)
        {
            return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>>>)(async () =>
            {
                var curAccountDoorLockUserList = new Dictionary<int, ZigBee.Device.DoorLock.LocaDoorLockObj>();
                foreach (var curUserId in doorLock.localDoorLockAccountList.Keys)
                {
                    var curDoorLockUser = doorLock.localDoorLockAccountList[curUserId];
        //public static async System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>> GetMatchDoorlockAccountList(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes curAccountObj)
        //{
        //    return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>>>)(async () =>
        //    {
        //        var curAccountDoorLockUserList = new Dictionary<int, ZigBee.Device.DoorLock.LocaDoorLockObj>();
        //        foreach (var curUserId in doorLock.localDoorLockAccountList.Keys)
        //        {
        //            var curDoorLockUser = doorLock.localDoorLockAccountList[curUserId];

                    if (string.IsNullOrEmpty(curDoorLockUser.ConnectedAccount) || curDoorLockUser.ConnectedAccount != curAccountObj.SubAccountDistributedMark)
                    {
                        continue;
                    }
                    else
                    {
                        curAccountDoorLockUserList.Add(curDoorLockUser.UserID, curDoorLockUser);
                    }
                }
                return curAccountDoorLockUserList;
            }));
        }
        //            if (string.IsNullOrEmpty(curDoorLockUser.ConnectedAccount) || curDoorLockUser.ConnectedAccount != curAccountObj.SubAccountDistributedMark)
        //            {
        //                continue;
        //            }
        //            else
        //            {
        //                curAccountDoorLockUserList.Add(curDoorLockUser.UserID, curDoorLockUser);
        //            }
        //        }
        //        return curAccountDoorLockUserList;
        //    }));
        //}

        /// <summary>
        /// 生成6位临时密码
@@ -1099,6 +1138,16 @@
            string password = "";
            password = new Random().Next(100000, 999999).ToString();
            return password;
        }

        //// <summary>
        /// 取得某月的最后一天
        /// </summary>
        /// <param name="datetime">要取得月份最后一天的时间</param>
        /// <returns></returns>
        public static DateTime LastDayOfMonth(DateTime datetime)
        {
            return datetime.AddDays(1 - datetime.Day).AddMonths(1).AddDays(-1);
        }

        /// <summary>
@@ -1237,7 +1286,6 @@
            });
        }

        #endregion

        #endregion 
    }
}