合并代码

黄学彪

2020-01-10 985abd7ee6049147119518aa41fb2d08c0cfc40d

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

@@ -363,43 +363,20 @@
                //使用确认型弹框时,的回调函数
                alertRemoteUnlockRequest.ConfirmClickEvent += () =>
                {
                    if (UserCenterResourse.UserInfo.AuthorityNo == 1)
                    var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
                    Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
                    Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                    functionSetting.Show();
                    functionSetting.devicNameAction += (deviceRename) =>
                    {
                        var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
                        Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
                        Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                        functionSetting.Show();
                        functionSetting.devicNameAction += (deviceRename) =>
                        if (!string.IsNullOrEmpty(deviceRename))
                        {
                            if (!string.IsNullOrEmpty(deviceRename))
                            if (btnDoorLockTitle != null)
                            {
                                if (btnDoorLockTitle != null)
                                {
                                    btnDoorLockTitle.Text = deviceRename;
                                }
                                btnDoorLockTitle.Text = deviceRename;
                            }
                        };
                    }
                    else
                    {
                        var functionSettingSub = new Shared.Phone.UserCenter.DoorLock.FunctionSettingSub(doorLock);
                        Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSettingSub);
                        Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                        functionSettingSub.Show();
                        functionSettingSub.devicNameAction += (deviceRename) =>
                        {
                            if (!string.IsNullOrEmpty(deviceRename))
                            {
                                if (!string.IsNullOrEmpty(deviceRename))
                                {
                                    if (btnDoorLockTitle != null)
                                    {
                                        btnDoorLockTitle.Text = deviceRename;
                                    }
                                }
                            }
                        };
                    }
                        }
                    };
                };
                return;
            }
@@ -534,43 +511,20 @@
                                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.DoorlockPasswordDispear), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(CommonPage.Instance);
                                        CommonPage.Loading.Hide();
                                        doorLock.RemoteUnlockPassword = "";
                                        if (UserCenterResourse.UserInfo.AuthorityNo == 1)
                                        var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
                                        Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
                                        Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                                        functionSetting.Show();
                                        functionSetting.devicNameAction += (deviceRename) =>
                                        {
                                            var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
                                            Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
                                            Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                                            functionSetting.Show();
                                            functionSetting.devicNameAction += (deviceRename) =>
                                            if (!string.IsNullOrEmpty(deviceRename))
                                            {
                                                if (!string.IsNullOrEmpty(deviceRename))
                                                if (btnDoorLockTitle != null)
                                                {
                                                    if (btnDoorLockTitle != null)
                                                    {
                                                        btnDoorLockTitle.Text = deviceRename;
                                                    }
                                                    btnDoorLockTitle.Text = deviceRename;
                                                }
                                            };
                                        }
                                        else
                                        {
                                            var functionSettingSub = new Shared.Phone.UserCenter.DoorLock.FunctionSettingSub(doorLock);
                                            Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSettingSub);
                                            Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                                            functionSettingSub.Show();
                                            functionSettingSub.devicNameAction += (deviceRename) =>
                                            {
                                                if (!string.IsNullOrEmpty(deviceRename))
                                                {
                                                    if (!string.IsNullOrEmpty(deviceRename))
                                                    {
                                                        if (btnDoorLockTitle != null)
                                                        {
                                                            btnDoorLockTitle.Text = deviceRename;
                                                        }
                                                    }
                                                }
                                            };
                                        }
                                            }
                                        };
                                    });
                                }
                            }