合并代码，更改面板目标信息

xm

2020-05-19 34b65350abbb8b740b9c3bc0b43254cbbe23fcb5

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

@@ -83,7 +83,7 @@
        /// <summary>
        /// 中部布局中门锁名称显示
        /// </summary>
        Button btnDoorLockTitle;
        NormalViewControl btnDoorLockTitle;
        /// <summary>
        /// 分享
        /// </summary>
@@ -252,18 +252,15 @@
            };
            this.midFrameLayout.AddChidren(midTopFrameLayout);

            //门锁标题
            btnDoorLockTitle = new Button()
            {
                Width = Application.GetRealWidth(250),
                Height = Application.GetRealHeight(60),
                X = Application.GetRealWidth(372),
                Y = Application.GetRealHeight(46),
                TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
                TextSize = 15,
                TextAlignment = TextAlignment.Center,
                IsBold = true,
            };
            //设备名称
            btnDoorLockTitle = new NormalViewControl(100, 60, true);

            btnDoorLockTitle.Y = Application.GetRealHeight(46);

            btnDoorLockTitle.TextSize = 15;

            btnDoorLockTitle.IsBold = true;
            btnDoorLockTitle.Text = Common.LocalDevice.Current.GetDeviceMacName(doorLock);

            btnDoorLockTitle.Width = btnDoorLockTitle.GetRealWidthByText();

            btnDoorLockTitle.TextAlignment = TextAlignment.Center;

            btnDoorLockTitle.Gravity = Gravity.CenterHorizontal;

            midTopFrameLayout.AddChidren(btnDoorLockTitle);

            //记录
@@ -615,10 +612,6 @@
                        {

                            if (canOpenNormallyMode)
                            {
                                //Application.RunOnMainThread(() =>
                                //{
                                //    NomallyOpenModeInvalidDialog(true);
                                //});
                                Application.RunOnMainThread(() =>
                                {
                                    Action<bool> action = (obj) =>
@@ -864,10 +857,14 @@
                if (doorLock.IsDoorLockNormallyMode)
                {
                    if (canOpenNormallyMode)

                    {

                    {
                        Application.RunOnMainThread(() =>
                        {
                            NomallyOpenModeInvalidDialog();
                            Action<bool> action = (obj) =>
                            {
                                UpdateNomallyOpenStatus();
                            };
                            DoorLockCommonInfo.NomallyOpenModeInvalidDialog(doorLock, DoorLockCommonInfo.DoorLockMessType.AppOperate, haveLogicNormallyOpenMode, action);
                        });
                    }
                    else
@@ -897,7 +894,11 @@
                    {
                        Application.RunOnMainThread(() =>
                        {
                            NomallyOpenModeInvalidDialog();
                            Action<bool> action = (obj) =>
                            {
                                UpdateNomallyOpenStatus();
                            };
                            DoorLockCommonInfo.NomallyOpenModeInvalidDialog(doorLock, DoorLockCommonInfo.DoorLockMessType.AppOperate, haveLogicNormallyOpenMode, action);
                        });
                    }
                }
@@ -1047,7 +1048,6 @@
        /// </summary>
        private async void NomallyOpenDialog()
        {
            #region 后续版本
            if (UserCenterResourse.UserInfo.AuthorityNo != 1)
            {
                this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.OnlyMasterOperate));
@@ -1082,19 +1082,20 @@
                addLogicPage.Show();

                addLogicPage.action += (w) =>

                {

                    doorLock.IsDoorLockNormallyMode = w;

                    ///留给徐梅用的

                    UpdateNomallyOpenStatus();

                    doorLock.IsDoorLockNormallyMode = w;
                    UpdateNomallyOpenStatus();
                    //返回按键清空当前逻辑定义的LogicAction
                    UserCenter.DoorLock.DoorLockCommonInfo.LogicAction = null;

                };
            };
            HdlCheckLogic.Current.CheckSecondarySecurity(action);
            #endregion 

        }



        /// <summary>

        /// 常开模式失效处理

        /// </summary>

        public void NomallyOpenModeInvalidDialog(bool IsFromReport = false)
        private void NomallyOpenModeInvalidDialog(bool IsFromReport = false)
        {
            if (!canShowDialog)
            {