合并了代码

黄学彪

2019-12-31 737c036a39176fd2085ce82b7c60391da8cb508c

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

@@ -219,28 +219,25 @@
                        unLockMethod.Show();
                    }
                    else if (currentIndex == 1)
                    {
                        btnRight.IsSelected = !btnRight.IsSelected;

                        if (btnRight.IsSelected)
                    { 
                        if (!btnRight.IsSelected)
                        {
                            FreezeUser(true);
                            FreezeUser(true); 
                        }
                        else
                        {
                            FreezeUser(false);
                            FreezeUser(false); 
                        }
                    }
                    else if (currentIndex == 2)
                    {
                        btnRight.IsSelected = !btnRight.IsSelected;
                        if (btnRight.IsSelected)
                    { 
                        if (!btnRight.IsSelected)
                        {
                            HasRemoteUnlockAccessMethod(true);
                            HasRemoteUnlockAccessMethod(true); 
                        }
                        else
                        {
                            HasRemoteUnlockAccessMethod(false);
                            HasRemoteUnlockAccessMethod(false); 
                        }
                    }
                };
@@ -277,21 +274,12 @@
            {
                textFreeze = Language.StringByID(R.MyInternationalizationString.SureToUnFreeze);
            }
            var doorDialog = new Shared.Phone.UserCenter.DoorLock.DoorlockDialog(dialog, Language.StringByID(R.MyInternationalizationString.Tip));
            doorDialog.Show();
            doorDialog.dialogMidFraFrameLayout.Height = Application.GetRealHeight(58);
            doorDialog.dialogMidFraFrameLayout.X = Application.GetRealWidth(0);
            doorDialog.dialogMidFraFrameLayout.Y = Application.GetRealHeight(202);
            doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
            doorDialog.dialogMidText.Text = textFreeze;
            doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
            doorDialog.dialogBtnConfirm.Text = Language.StringByID(R.MyInternationalizationString.DoorlockConfirm);
            doorDialog.dialogBtnCancel.MouseUpEventHandler += (sender1, e1) =>

            {

                MidRefresh();

                dialog.Close();
            };
            doorDialog.dialogBtnConfirm.MouseUpEventHandler += (sender1, e1) =>

            string msg = Language.StringByID(R.MyInternationalizationString.GoPersonalCenter);
            var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, textFreeze, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
            alert.Show();
            //使用确认型弹框时,的回调函数
            alert.ConfirmClickEvent += () =>
            {

                System.Threading.Tasks.Task.Run(async () =>

                {

@@ -312,8 +300,7 @@
                            {

                                // 账户中没有门锁用户

                                if (curDoorLockUser.DoorLockLocalUserId == null || curDoorLockUser.DoorLockLocalUserId == "")

                                {

                                    //

                                { 
                                }

                                else

                                {

@@ -338,6 +325,17 @@
                            }

                            //冻结/解冻用户

                            int count1 = tempGroupId.Count;
                            if (tempGroupId.Count==1)
                            {
                                foreach (var a in tempGroupId)
                                {
                                    if(a.Count ==0)
                                    {
                                        count1 = 0;
                                        break;
                                    }
                                } 
                            }
                            int count2 = 0;

                            int tempCount = 0;
@@ -346,7 +344,7 @@
                                var tempUserIdList1 = tempGroupId[i];
                                if (tempUserIdList1.Count == 0)
                                {
                                    return;
                                    break;
                                }
                                var passData = doorLock.FreezeAccountData(tempUserIdList1, accessType);

                                var resultData = await doorLock.DefaultControlAsync(passData);

@@ -359,11 +357,8 @@
                                    else if (resultData.defaultControlResponseData.status == 33)
                                    {
                                        count2++;
                                    }
                                    //if (tempCount == tempGroupId.Count - 1)
                                    //{
                                    System.Threading.Thread.Sleep(1000);
                                    //}
                                    } 
                                    System.Threading.Thread.Sleep(1000); 
                                }
                                else
                                {
@@ -375,7 +370,7 @@
                                }
                                tempCount++;
                            }

                            
                            // 批量冻结门锁中的账户后，准备冻结云端账户
                            if (count2 == count1)
                            {
@@ -570,29 +565,17 @@
                        });

                    }

                });

                dialog.Close();

            };
            }; 
        }

        //是否给子账户拥有远程开锁的条件
        void HasRemoteUnlockAccessMethod(bool hasAccess)
        {
            var dialog = new Dialog { };
            var doorDialog = new Shared.Phone.UserCenter.DoorLock.DoorlockDialog(dialog, Language.StringByID(R.MyInternationalizationString.Tip));
            doorDialog.Show();
            doorDialog.dialogMidFraFrameLayout.Height = Application.GetRealHeight(58);
            doorDialog.dialogMidFraFrameLayout.X = Application.GetRealWidth(0);
            doorDialog.dialogMidFraFrameLayout.Y = Application.GetRealHeight(202);
            doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
            doorDialog.dialogMidText.Text = Language.StringByID(R.MyInternationalizationString.SureGiveAccessToSubaccount);
            doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
            doorDialog.dialogBtnConfirm.Text = Language.StringByID(R.MyInternationalizationString.DoorlockConfirm);
            doorDialog.dialogBtnCancel.MouseUpEventHandler += (sender1, e1) =>
            {
                MidRefresh();
                dialog.Close();
            };
            doorDialog.dialogBtnConfirm.MouseUpEventHandler += (sender1, e1) =>
            string msg = Language.StringByID(R.MyInternationalizationString.SureGiveAccessToSubaccount);
            var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
            alert.Show();
            //使用确认型弹框时,的回调函数
            alert.ConfirmClickEvent += () =>
            {
                System.Threading.Tasks.Task.Run(async () =>
                {
@@ -778,8 +761,7 @@
                        });
                    }
                });
                dialog.Close();
            };
            }; 
        }

        #region ◆ 接口实现__________________________