请合并最新代码，（优化代码格式，完成开会后的细节测试）

xm

2020-01-15 f17bb6c60db1f24ce05df96aa27d4680e2df0ce6

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

@@ -7,23 +7,31 @@
{
    public class DoorLockCommonLayout : EditorCommonForm
    {
        /// <summary>

        /// 构造函数

        /// </summary>
        public DoorLockCommonLayout()
        {

        {

        }
        #region ◆ 变量申明__________________________
        #region 变量申明
        public FrameLayout topFrameLayout = new FrameLayout { Height = Application.GetRealHeight(184), BackgroundColor = ZigbeeColor.Current.XMTopFrameLayout };
        public FrameLayout midFrameLayout = new FrameLayout { Height = Application.GetRealHeight(1921 - 184), BackgroundColor = ZigbeeColor.Current.XMMidFrameLayout };
        #region ◆ 底部有圆角布局__________________________
        public FrameLayout midFrameLayout = new FrameLayout { Height = Application.GetRealHeight(1921 - 184), BackgroundColor = ZigbeeColor.Current.XMMidFrameLayout };

        #region 底部有圆角布局
        /// 背景阴影界面
        /// </summary>
        public FrameLayout shadowRadiusFrameLayout = new FrameLayout { BackgroundColor = 0x0f000000 };

        /// <summary>
        /// 设置圆角的界面
        /// </summary>
        public FrameLayout bottomRadiusFrameLayout = new FrameLayout()
        {
            Height = Application.GetRealHeight(806),
            Y = Application.GetRealHeight(930),
            BackgroundColor = ZigbeeColor.Current.XMWhite,
        };

        /// <summary>
        /// 底部圆角中的取消按钮
        /// </summary>
        public Button btnCancel = new Button
        {
            X = Application.GetRealWidth(81),
@@ -34,7 +42,9 @@
            TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
            TextSize = 14,
        };

        /// <summary>
        /// 底部圆角中的标题栏
        /// </summary>
        public Button btnBottomTitle = new Button
        {
            X = Application.GetRealWidth(446 - 50),
@@ -45,7 +55,9 @@
            TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
            TextSize = 16,
        };

        /// <summary>
        /// 底部圆角中的确认按钮
        /// </summary>
        public Button btnFinish = new Button
        {
            X = Application.GetRealWidth(919),
@@ -55,26 +67,21 @@
            Text = Language.StringByID(R.MyInternationalizationString.Complete),
            TextColor = Shared.Common.ZigbeeColor.Current.XMOrange,
            TextSize = 14,
        };

        };

        /// <summary>
        /// 底部圆角中的标题栏下的线条
        /// </summary>
        public Button line = new Button()
        {
            Y = Application.GetRealHeight(138),
            Height = 1,
            BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
        };

        };



        #endregion

        /// <summary> 
        /// ◆ 中部刷新布局__________________________
        /// </summary>
        //public VerticalRefreshLayout midVerticalScrolViewLayout = new VerticalRefreshLayout()
        //{
        //};



        /// <summary>
        /// ◆ 标题栏布局__________________________
        /// 标题栏布局
        /// </summary>
        public FrameLayout titleFrameLayout = new FrameLayout
        {
@@ -138,7 +145,8 @@
            this.AddChidren(topFrameLayout);
            topFrameLayout.AddChidren(btnBackFrameLayout);
            topFrameLayout.AddChidren(titleFrameLayout);
            topFrameLayout.AddChidren(btnTitleLine);
            topFrameLayout.AddChidren(btnTitleLine);



            var title = new Button()
            {
                TextAlignment = TextAlignment.CenterLeft,
@@ -566,6 +574,57 @@
            };
        }
        // 获取到到名称更改回调通知
        public Action<string> devicNameSecAction;
        public Action<string> devicNameSecAction;





        /// <summary>

        /// 当前选中的开锁方式

        /// </summary>

        /// <param name="btnAllMethod"></param>

        /// <param name="btnMethodText"></param>

        /// <param name="oldbutton"></param>

        /// <param name="oldbuttonText"></param>

        public void CurrentSelectUnlockMethod(Button btnAllMethod, Button btnMethodText, Button oldbutton, Button oldbuttonText)

        {

            btnAllMethod.IsSelected = true;

            btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;

            btnMethodText.IsBold = true;

            oldbutton = btnAllMethod;

            oldbuttonText = btnMethodText;

        }



        /// <summary>

        /// 显示所有开锁方式的数据

        /// </summary>

        /// <param name="curIndex"></param>

        /// <param name="btnAllMethod"></param>

        /// <param name="btnMethodText"></param>

        public void DisplayAllUnlockMethod(int curIndex, Button btnAllMethod, Button btnMethodText)

        {

            switch (curIndex)

            {

                case 0:

                    btnAllMethod.UnSelectedImagePath = "DoorLock/AllMethod.png";

                    btnAllMethod.SelectedImagePath = "DoorLock/AllMethodOn.png";

                    btnMethodText.Text = Language.StringByID(R.MyInternationalizationString.AllMethod);

                    break;

                case 1:

                    btnAllMethod.UnSelectedImagePath = "DoorLock/Password.png";

                    btnAllMethod.SelectedImagePath = "DoorLock/PasswordOn.png";

                    btnMethodText.Text = Language.StringByID(R.MyInternationalizationString.PasswordUnlock);

                    break;

                case 2:

                    btnAllMethod.UnSelectedImagePath = "DoorLock/Fingerprint.png";

                    btnAllMethod.SelectedImagePath = "DoorLock/FingerprintOn.png";

                    btnMethodText.Text = Language.StringByID(R.MyInternationalizationString.FingerprintUnlock);

                    break;

                case 3:

                    btnAllMethod.UnSelectedImagePath = "DoorLock/proximityCard.png";

                    btnAllMethod.SelectedImagePath = "DoorLock/proximityCardOn.png";

                    btnMethodText.Text = Language.StringByID(R.MyInternationalizationString.ProximithCardUnlock);

                    break;

            }

        }



    }
}