Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

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

@@ -28,63 +28,14 @@
        bool isSecondDel;
        #endregion

        /// <summary>
        ///  获取最新信息
        /// </summary>
        void ReadDoorLockUserInfo()
        {
            System.Threading.Tasks.Task.Run(async () =>
            {
                Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
                Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
                try
                {
                    //  读取设备中的信息
                    var getDoorLockInfo = await doorLock.GetDoorlockUserInfoAsync();
                    if (getDoorLockInfo != null && getDoorLockInfo.doorLockUserDetailData != null)
                    {
                        var dataList = getDoorLockInfo.doorLockUserDetailData.UserObjList;
                        foreach (var doorData in dataList)
                        {
                            var localDoorLockObj1 = new ZigBee.Device.DoorLock.LocaDoorLockObj()
                            {
                                UserID = doorData.UserId,
                                UnlockType = doorData.UserType
                            };
                            if ((doorLock.localDoorLockUserList.ContainsKey(localDoorLockObj1.UserID)) == false)
                            {
                                doorLock.localDoorLockUserList.Add(localDoorLockObj1.UserID, localDoorLockObj1);
                            }
                        }
                    }

                    //  读取云端门锁设备中的信息
                    var localDoorLockObj = new ZigBee.Device.DoorLock.GetDoorLockData() { };
                    localDoorLockObj.CloudAccountId = curAccountObj.SubAccountDistributedMark;
                    if (doorLock.DeviceAddr != null)
                    {
                        localDoorLockObj.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
                    }

                    var getDoorLockInfoList = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("App/GetDoorLockPager", localDoorLockObj);

                    if (getDoorLockInfoList != null)
                    {
                        foreach (var curDoorLockUser in getDoorLockInfoList.PageData)
                        {
                            if (doorLock.localDoorLockUserList.ContainsKey(int.Parse(curDoorLockUser.DoorLockLocalUserId)))
                            {
                                doorLock.localDoorLockUserList.Remove(int.Parse(curDoorLockUser.DoorLockLocalUserId));
                            }
                            var doorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
                            doorLockObj.UserID = int.Parse(curDoorLockUser.DoorLockLocalUserId);
                            doorLockObj.UnlockType = curDoorLockUser.OpenLockMode;
                            doorLockObj.PrimaryId = curDoorLockUser.Id;
                            doorLockObj.EntryTime = curDoorLockUser.EntryTime;
                            doorLockObj.UserName = curDoorLockUser.UserIdRemarks;
                            doorLockObj.ConnectedAccount = curDoorLockUser.CloudAccountId;
                            doorLock.localDoorLockUserList.Add(int.Parse(curDoorLockUser.DoorLockLocalUserId), doorLockObj);
                        }
                    }
                    await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetLocaDoorLocklist(doorLock, curAccountObj);
                }
                catch { }
                finally
@@ -103,7 +54,6 @@
        /// </summary>
        public void Show()
        {
            ReadDoorLockUserInfo();
            this.TopFrameLayout(this, Language.StringByID(R.MyInternationalizationString.LockMethod));
            this.btnTitleLine.Visible = false;
            EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
@@ -131,12 +81,18 @@
            btnAddFrameLayout.AddChidren(btnAdd);
            btnAdd.MouseDownEventHandler += (sender, e) =>
            {
                var addUnLockMethod = new Shared.Phone.UserCenter.DoorLock.AddUnLockMethod(doorLock, curAccountObj);
                Shared.Phone.UserView.HomePage.Instance.AddChidren(addUnLockMethod);
                Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                addUnLockMethod.Show();
                if (doorLock.IsFreezeAccount[curAccountObj.SubAccountDistributedMark] == true)
                {
                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.AccountIsFreezed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
                }
                else
                {
                    var addUnLockMethod = new Shared.Phone.UserCenter.DoorLock.AddUnLockMethod(doorLock, curAccountObj);
                    Shared.Phone.UserView.HomePage.Instance.AddChidren(addUnLockMethod);
                    Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                    addUnLockMethod.Show();
                }
            };

            MidFrameLayoutContent();
        }
        //中部布局
@@ -226,8 +182,14 @@
            {
                SideslipFramelayout();
            };

            RefreshList();
            if (doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] == true)
            {
                ReadDoorLockUserInfo();
            }
            else
            {
                RefreshList();
            }
        }

        /// <summary>
@@ -237,6 +199,11 @@
        /// <param name="key"></param>
        public void RefreshList()
        {
            if (doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] == true)
            {
                new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
                return;
            }
            bodyView.RemoveAll();
            var curAccountDoorLockUserList = new Dictionary<int, ZigBee.Device.DoorLock.LocaDoorLockObj>();

@@ -328,7 +295,7 @@
                    Height = Application.GetRealHeight(49),
                    X = Application.GetRealWidth(173),
                    Y = Application.GetRealHeight(95),
                    Text = Language.StringByID(R.MyInternationalizationString.Delete),
                    Text = Language.StringByID(R.MyInternationalizationString.DelBindDevice),
                    TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
                    TextSize = 12,
                    TextAlignment = TextAlignment.Center,
@@ -340,7 +307,7 @@
                switch (curDoorLockUser.UnlockType)
                {
                    case 0:
                        if (curDoorLockUser.UserName != "")
                        if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
                        {
                            btnDoorlockUser.Text = curDoorLockUser.UserName;
                        }
@@ -350,7 +317,7 @@
                        }
                        break;
                    case 3:
                        if (curDoorLockUser.UserName != "")
                        if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
                        {
                            btnDoorlockUser.Text = curDoorLockUser.UserName;
                        }
@@ -360,7 +327,7 @@
                        }
                        break;
                    case 15:
                        if (curDoorLockUser.UserName != "")
                        if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
                        {
                            btnDoorlockUser.Text = curDoorLockUser.UserName;
                        }
@@ -371,7 +338,7 @@
                        break;
                }

                if (curAccountObj.UserName == "")
                if (curAccountObj.UserName == "" || curAccountObj.UserName == null)
                {
                    btnMember.Text = curAccountObj.Account;
                }
@@ -383,7 +350,11 @@
                Action<Shared.View> action = async (obj) =>
                 {
                     var refreshDoorLockData = new ZigBee.Device.DoorLock.RefreshDoorLockData();
                     refreshDoorLockData.CloudAccountId = curAccountObj.SubAccountDistributedMark;
                     if (UserCenterResourse.UserInfo.AuthorityNo != 1)
                     {
                         refreshDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
                         refreshDoorLockData.IsOtherAccountCtrl = true;
                     }
                     if (doorLock.DeviceAddr != null)
                     {
                         refreshDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
@@ -392,25 +363,32 @@
                     refreshDoorLockData.DoorLockLocalUserId = curDoorLockUser.UserID.ToString();
                     refreshDoorLockData.PrimaryId = curDoorLockUser.PrimaryId;
                     refreshDoorLockData.UserIdRemarks = btnDoorlockUser.Text;
                     var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("App/UpdateDoorLock", refreshDoorLockData);
                     if (result.StateCode == "Success")
                     var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/UpdateDoorLock", refreshDoorLockData);
                     if (result != null)
                     {
                         if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
                         if (result.StateCode == "Success")
                         {
                             doorLock.localDoorLockUserList.Remove(curDoorLockUser.UserID);
                             var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
                             localDoorLockObj.UserID = curDoorLockUser.UserID;
                             localDoorLockObj.UnlockType = curDoorLockUser.UnlockType;
                             localDoorLockObj.EntryTime = curDoorLockUser.EntryTime;
                             localDoorLockObj.UserName = refreshDoorLockData.UserIdRemarks;
                             localDoorLockObj.ConnectedAccount = curAccountObj.SubAccountDistributedMark;
                             doorLock.localDoorLockUserList.Add(curDoorLockUser.UserID, localDoorLockObj);
                             RefreshList();
                             if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
                             {
                                 doorLock.localDoorLockUserList.Remove(curDoorLockUser.UserID);
                                 var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
                                 localDoorLockObj.UserID = curDoorLockUser.UserID;
                                 localDoorLockObj.UnlockType = curDoorLockUser.UnlockType;
                                 localDoorLockObj.EntryTime = curDoorLockUser.EntryTime;
                                 localDoorLockObj.UserName = refreshDoorLockData.UserIdRemarks;
                                 localDoorLockObj.ConnectedAccount = curAccountObj.SubAccountDistributedMark;
                                 doorLock.localDoorLockUserList.Add(curDoorLockUser.UserID, localDoorLockObj);
                                 RefreshList();
                             }
                         }
                         else
                         {
                             new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ModigfyFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
                         }
                     }
                     else
                     {
                         new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ModigfyFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
                         new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
                     }
                 };
                btnDoorlockUser.EditorEnterAction += action;
@@ -428,9 +406,14 @@
                            var resultData = await doorLock.DefaultControlAsync(passData);
                            if (resultData != null && resultData.defaultControlResponseData != null)
                            {
                                if (resultData.defaultControlResponseData.status == 0)
                                if (resultData.defaultControlResponseData.status == 0 || resultData.defaultControlResponseData.status == 2)
                                {
                                    var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
                                    if (UserCenterResourse.UserInfo.AuthorityNo != 1)
                                    {
                                        deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
                                        deleteDoorLockData.IsOtherAccountCtrl = true;
                                    }
                                    if (doorLock.DeviceAddr != null)
                                    {
                                        deleteDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
@@ -438,23 +421,31 @@
                                    deleteDoorLockData.DoorLockLocalUserId = curDoorLockUser.UserID.ToString();
                                    deleteDoorLockData.PrimaryId = curDoorLockUser.PrimaryId;
                                    deleteDoorLockData.DelDoorLockDelType = 2;
                                    var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("App/DelDoorLock", deleteDoorLockData);
                                    if (result.StateCode == "Success")
                                    var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
                                    if (result != null)
                                    {
                                        isSecondDel = false;
                                        if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
                                        if (result.StateCode == "Success")
                                        {
                                            doorLock.localDoorLockUserList.Remove(curDoorLockUser.UserID);
                                            var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
                                            localDoorLockObj.UserID = curDoorLockUser.UserID;
                                            doorLock.localDoorLockUserList.Remove(curUserId);
                                            RefreshList();
                                            isSecondDel = false;
                                            if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
                                            {
                                                doorLock.localDoorLockAccountList.Remove(curDoorLockUser.ConnectedAccount);
                                                var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
                                                localDoorLockObj.UserID = curDoorLockUser.UserID;
                                                doorLock.localDoorLockUserList.Remove(curUserId);
                                                doorLock.ReSave();
                                                RefreshList();
                                            }
                                        }
                                        else
                                        {
                                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
                                        }
                                    }
                                    else
                                    {
                                        isSecondDel = true;
                                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
                                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
                                    }
                                }
                                else
@@ -462,6 +453,11 @@
                                    if (isSecondDel)
                                    {
                                        var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
                                        if (UserCenterResourse.UserInfo.AuthorityNo != 1)
                                        {
                                            deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
                                            deleteDoorLockData.IsOtherAccountCtrl = true;
                                        }
                                        if (doorLock.DeviceAddr != null)
                                        {
                                            deleteDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
@@ -469,23 +465,30 @@
                                        deleteDoorLockData.DoorLockLocalUserId = curDoorLockUser.UserID.ToString();
                                        deleteDoorLockData.PrimaryId = curDoorLockUser.PrimaryId;
                                        deleteDoorLockData.DelDoorLockDelType = 2;
                                        var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("App/DelDoorLock", deleteDoorLockData);
                                        if (result.StateCode == "Success")
                                        var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
                                        if (result != null)
                                        {
                                            isSecondDel = false;
                                            if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
                                            if (result.StateCode == "Success")
                                            {
                                                doorLock.localDoorLockUserList.Remove(curDoorLockUser.UserID);
                                                var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
                                                localDoorLockObj.UserID = curDoorLockUser.UserID;
                                                doorLock.localDoorLockUserList.Remove(curUserId);
                                                RefreshList();
                                                isSecondDel = false;
                                                if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
                                                {
                                                    doorLock.localDoorLockUserList.Remove(curDoorLockUser.UserID);
                                                    var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
                                                    localDoorLockObj.UserID = curDoorLockUser.UserID;
                                                    doorLock.localDoorLockUserList.Remove(curUserId);
                                                    RefreshList();
                                                }
                                            }
                                            else
                                            {
                                                new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
                                            }
                                        }
                                        else
                                        {
                                            isSecondDel = true;
                                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
                                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
                                        }
                                    }
                                    else
@@ -503,7 +506,7 @@
                            }
                            else
                            {
                                new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
                                new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
                            }
                        }
                    };
@@ -771,7 +774,7 @@
                    Height = Application.GetRealHeight(49),
                    X = Application.GetRealWidth(173),
                    Y = Application.GetRealHeight(95),
                    Text = Language.StringByID(R.MyInternationalizationString.Delete),
                    Text = Language.StringByID(R.MyInternationalizationString.DelBindDevice),
                    TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
                    TextSize = 12,
                    TextAlignment = TextAlignment.Center,
@@ -783,7 +786,7 @@
                switch (curDoorLockUser.UnlockType)
                {
                    case 0:
                        if (curDoorLockUser.UserName != "")
                        if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
                        {
                            btnDoorlockUser.Text = curDoorLockUser.UserName;
                        }
@@ -793,7 +796,7 @@
                        }
                        break;
                    case 3:
                        if (curDoorLockUser.UserName != "")
                        if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
                        {
                            btnDoorlockUser.Text = curDoorLockUser.UserName;
                        }
@@ -803,7 +806,7 @@
                        }
                        break;
                    case 15:
                        if (curDoorLockUser.UserName != "")
                        if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
                        {
                            btnDoorlockUser.Text = curDoorLockUser.UserName;
                        }
@@ -814,7 +817,7 @@
                        break;
                }

                if (curAccountObj.UserName == "")
                if (curAccountObj.UserName == "" || curAccountObj.UserName == null)
                {
                    btnMember.Text = curAccountObj.Account;
                }
@@ -826,7 +829,11 @@
                Action<Shared.View> action = async (obj) =>
                {
                    var refreshDoorLockData = new ZigBee.Device.DoorLock.RefreshDoorLockData();
                    refreshDoorLockData.CloudAccountId = curAccountObj.SubAccountDistributedMark;
                    if (UserCenterResourse.UserInfo.AuthorityNo != 1)
                    {
                        refreshDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
                        refreshDoorLockData.IsOtherAccountCtrl = true;
                    }
                    if (doorLock.DeviceAddr != null)
                    {
                        refreshDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
@@ -835,25 +842,32 @@
                    refreshDoorLockData.DoorLockLocalUserId = curDoorLockUser.UserID.ToString();
                    refreshDoorLockData.PrimaryId = curDoorLockUser.PrimaryId;
                    refreshDoorLockData.UserIdRemarks = btnDoorlockUser.Text;
                    var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("App/UpdateDoorLock", refreshDoorLockData);
                    if (result.StateCode == "Success")
                    var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/UpdateDoorLock", refreshDoorLockData);
                    if (result != null)
                    {
                        if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
                        if (result.StateCode == "Success")
                        {
                            doorLock.localDoorLockUserList.Remove(curDoorLockUser.UserID);
                            var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
                            localDoorLockObj.UserID = curDoorLockUser.UserID;
                            localDoorLockObj.UnlockType = curDoorLockUser.UnlockType;
                            localDoorLockObj.EntryTime = curDoorLockUser.EntryTime;
                            localDoorLockObj.UserName = refreshDoorLockData.UserIdRemarks;
                            localDoorLockObj.ConnectedAccount = curAccountObj.SubAccountDistributedMark;
                            doorLock.localDoorLockUserList.Add(curDoorLockUser.UserID, localDoorLockObj);
                            RefreshList();
                            if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
                            {
                                doorLock.localDoorLockUserList.Remove(curDoorLockUser.UserID);
                                var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
                                localDoorLockObj.UserID = curDoorLockUser.UserID;
                                localDoorLockObj.UnlockType = curDoorLockUser.UnlockType;
                                localDoorLockObj.EntryTime = curDoorLockUser.EntryTime;
                                localDoorLockObj.UserName = refreshDoorLockData.UserIdRemarks;
                                localDoorLockObj.ConnectedAccount = curAccountObj.SubAccountDistributedMark;
                                doorLock.localDoorLockUserList.Add(curDoorLockUser.UserID, localDoorLockObj);
                                RefreshList();
                            }
                        }
                        else
                        {
                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ModigfyFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
                        }
                    }
                    else
                    {
                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ModigfyFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
                    }
                };
                btnDoorlockUser.EditorEnterAction += action;
@@ -874,6 +888,11 @@
                                if (resultData.defaultControlResponseData.status == 0)
                                {
                                    var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
                                    if (UserCenterResourse.UserInfo.AuthorityNo != 1)
                                    {
                                        deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
                                        deleteDoorLockData.IsOtherAccountCtrl = true;
                                    }
                                    if (doorLock.DeviceAddr != null)
                                    {
                                        deleteDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
@@ -881,30 +900,35 @@
                                    deleteDoorLockData.DoorLockLocalUserId = curDoorLockUser.UserID.ToString();
                                    deleteDoorLockData.PrimaryId = curDoorLockUser.PrimaryId;
                                    deleteDoorLockData.DelDoorLockDelType = 2;
                                    var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("App/DelDoorLock", deleteDoorLockData);
                                    if (result.StateCode == "Success")
                                    var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
                                    if (result != null)
                                    {
                                        if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
                                        if (result.StateCode == "Success")
                                        {
                                            doorLock.localDoorLockUserList.Remove(curDoorLockUser.UserID);
                                            var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
                                            localDoorLockObj.UserID = curDoorLockUser.UserID;

                                            //new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveSuccess), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
                                            doorLock.localDoorLockUserList.Remove(curUserId);
                                            RefreshList();
                                            if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
                                            {
                                                doorLock.localDoorLockUserList.Remove(curDoorLockUser.UserID);
                                                var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
                                                localDoorLockObj.UserID = curDoorLockUser.UserID;
                                                doorLock.localDoorLockUserList.Remove(curUserId);
                                                RefreshList();
                                            }
                                        }
                                        else
                                        {
                                            if (curDoorLockUser.UserID < 10)
                                            {
                                                new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.OnlyBeDeletedOnTheDevice), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
                                            }
                                            else
                                            {
                                                new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
                                            }
                                        }
                                    }
                                    else
                                    {
                                        if (curDoorLockUser.UserID < 10)
                                        {

                                        }
                                        else
                                        {
                                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ModigfyFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
                                        }
                                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
                                    }
                                }
                                else
@@ -915,7 +939,7 @@
                            }
                            else
                            {
                                new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
                                new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
                            }
                        }
                    };