全部合并了代码，安卓和 IOS 都测试通过了

黄学彪

2019-11-13 8b9ce384b26c414db32f98e94e088f5334869c2d

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

@@ -213,6 +213,10 @@
            completeBtn.MouseDownEventHandler += async (sender, e) =>
             {
                 completeBtn.Enable = false;
                 if (doorLock.doorLockProgrammingEventNotificationCommand == null)
                 {
                     return;
                 }
                 var addLockInfo = new ZigBee.Device.DoorLock.AddDoorLockData();
                 if (UserCenterResourse.UserInfo.AuthorityNo != 1)
                 {
@@ -246,44 +250,51 @@
                         {
                             if (doorLock.localDoorLockUserList.ContainsKey(doorLock.doorLockProgrammingEventNotificationCommand.UserID))
                             {
                                 //存账户信息
                                 // var resultList1 = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetCloudLocalAccountlist(doorLock, curAccountObj.SubAccountDistributedMark);
                                 //存门锁信息
                                 var resultList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetCloudLocalDoorLocklist(doorLock, curAccountObj.SubAccountDistributedMark);
                                 if (resultList.ContainsKey(doorLock.doorLockProgrammingEventNotificationCommand.UserID) == true)
                                 if (resultList != null)
                                 {
                                     var a = resultList[doorLock.doorLockProgrammingEventNotificationCommand.UserID];
                                     if (a?.ConnectedAccount == curAccountObj.SubAccountDistributedMark)
                                     if (resultList.ContainsKey(doorLock.doorLockProgrammingEventNotificationCommand.UserID) == true)
                                     {
                                         completeBtn.Enable = true;
                                         this.RemoveFromParent();
                                         for (int i = UserView.HomePage.Instance.ChildrenCount - 1; i >= 0; i--)
                                         var a = resultList[doorLock.doorLockProgrammingEventNotificationCommand.UserID];
                                         if (a?.ConnectedAccount == curAccountObj.SubAccountDistributedMark)
                                         {
                                             var form = UserView.HomePage.Instance.GetChildren(i);
                                             completeBtn.Enable = true;
                                             this.RemoveFromParent();
                                             for (int i = UserView.HomePage.Instance.ChildrenCount - 1; i >= 0; i--)
                                             {
                                                 var form = UserView.HomePage.Instance.GetChildren(i);

                                             if (form is UnLockMethod)
                                             {
                                                 ((UnLockMethod)form).RefreshList();
                                                 break;
                                             }
                                             else
                                             {
                                                 form.RemoveFromParent();
                                                 if (form is UnLockMethod)
                                                 {
                                                     ((UnLockMethod)form).RefreshList();
                                                     break;
                                                 }
                                                 else
                                                 {
                                                     form.RemoveFromParent();
                                                 }
                                             }
                                         }
                                     }
                                     else
                                     {
                                         completeBtn.Enable = true;
                                         new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnPasswordRemarkContent);
                                         else
                                         {
                                             completeBtn.Enable = true;
                                             new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnPasswordRemarkContent);
                                         }
                                     }
                                 }
                                 else
                                 {
                                     completeBtn.Enable = true;
                                     new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnPasswordRemarkContent);
                                 }

                             }
                         }
                         else
                         {
                             completeBtn.Enable = true;
                             new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ModigfyFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnPasswordRemarkContent);
                             new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.AddFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnPasswordRemarkContent);
                         }
                     }
                     else