请合并最新的代码（完成门锁功能）

xm

2019-11-27 a2d26f15b940c853faaf6d6959b16a6d919cb800

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

@@ -411,7 +411,7 @@
        /// <param name="action">二次验证的结果成功后的通知</param>
        /// <param name="progressButton">门锁开或关时进度显示</param>
        /// <param name="btnDoorLockPic">门锁图片开/关显示</param>
        public void RemoteUnlockRequest(ZigBee.Device.DoorLock doorLock, Action action, Button progressButton = null, Button btnDoorLockPic = null, Button btnStatus = null)
        public void RemoteUnlockRequest(ZigBee.Device.DoorLock doorLock, Action action, Button progressButton = null, Button btnDoorLockPic = null, Button btnStatus = null, Button btnDoorLockTitle = null)
        {
            if (doorLock.RemoteUnlockPassword == "")
            {
@@ -434,18 +434,41 @@
                {
                    if (UserCenterResourse.UserInfo.AuthorityNo == 1)
                    {
                        var userDoorLockPage = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
                        Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
                        var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
                        Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
                        Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                        userDoorLockPage.Show();
                        functionSetting.Show();
                        functionSetting.devicNameAction += (deviceRename) =>
                        {
                            if (!string.IsNullOrEmpty(deviceRename))
                            {
                                if (btnDoorLockTitle != null)
                                {
                                    btnDoorLockTitle.Text = deviceRename;
                                }
                            }
                        };
                        dialog.Close();
                    }
                    else
                    {
                        var userDoorLockPage = new Shared.Phone.UserCenter.DoorLock.FunctionSettingSub(doorLock);
                        Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
                        var functionSettingSub = new Shared.Phone.UserCenter.DoorLock.FunctionSettingSub(doorLock);
                        Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSettingSub);
                        Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                        userDoorLockPage.Show();
                        functionSettingSub.Show();
                        functionSettingSub.devicNameAction += (deviceRename) =>
                        {
                            if (!string.IsNullOrEmpty(deviceRename))
                            {
                                if (!string.IsNullOrEmpty(deviceRename))
                                {
                                    if (btnDoorLockTitle != null)
                                    {
                                        btnDoorLockTitle.Text = deviceRename;
                                    }
                                }
                            }
                        };
                        dialog.Close();
                    }
                };
@@ -631,18 +654,40 @@

                                if (UserCenterResourse.UserInfo.AuthorityNo == 1)
                                {
                                    var userDoorLockPage = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
                                    Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
                                    var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
                                    Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
                                    Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                                    userDoorLockPage.Show();

                                    functionSetting.Show();
                                    functionSetting.devicNameAction += (deviceRename) =>
                                    {
                                        if (!string.IsNullOrEmpty(deviceRename))
                                        {
                                            if (btnDoorLockTitle != null)
                                            {
                                                btnDoorLockTitle.Text = deviceRename;
                                            }
                                        }
                                    };
                                }
                                else
                                {
                                    var userDoorLockPage = new Shared.Phone.UserCenter.DoorLock.FunctionSettingSub(doorLock);
                                    Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
                                    var functionSettingSub = new Shared.Phone.UserCenter.DoorLock.FunctionSettingSub(doorLock);
                                    Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSettingSub);
                                    Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                                    userDoorLockPage.Show();
                                    functionSettingSub.Show();
                                    functionSettingSub.devicNameAction += (deviceRename) =>
                                    {
                                        if (!string.IsNullOrEmpty(deviceRename))
                                        {
                                            if (!string.IsNullOrEmpty(deviceRename))
                                            {
                                                if (btnDoorLockTitle != null)
                                                {
                                                    btnDoorLockTitle.Text = deviceRename;
                                                }
                                            }
                                        }
                                    };
                                }
                            }
                        }
@@ -684,5 +729,7 @@
                dialog3.Close();
            };
        }
        // 获取到到名称更改回调通知
        public Action<string> devicNameSecAction;
    }
}