合并了全部的代码，IOS 图片需要从新引入工程

黄学彪

2019-11-07 82a773d1783549caca563831aac8affc059deedf

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

@@ -96,6 +96,14 @@
        };

        /// <summary>
        /// 标题返回按键
        /// </summary>
        public Button btnTip = new Button
        {
            Gravity = Gravity.Center,
        };

        /// <summary>
        /// 标题下线
        /// </summary>
        public Button btnTitleLine = new Button
@@ -143,6 +151,7 @@
            titleFrameLayout.AddChidren(title);
            titleFrameLayout.AddChidren(btnBackFrameLayout);
            btnBackFrameLayout.AddChidren(btnBack);
            this.midFrameLayout.AddChidren(this.btnTip);
        }
        /// <summary>
        /// 门锁中部布局
@@ -353,11 +362,23 @@
                };
                doorDialog.dialogBtnConfirm.MouseUpEventHandler += (sender1, e1) =>
                {
                    var userDoorLockPage = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
                    Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
                    Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                    userDoorLockPage.Show();
                    dialog.Close();
                    if (UserCenterResourse.UserInfo.AuthorityNo == 3)
                    {
                        var userDoorLockPage = new Shared.Phone.UserCenter.DoorLock.FunctionSettingSub(doorLock);
                        Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
                        Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                        userDoorLockPage.Show();
                        dialog.Close();
                    }
                    else
                    {
                        var userDoorLockPage = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
                        Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
                        Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                        userDoorLockPage.Show();
                        dialog.Close();
                    }

                };
                return;
            }