完全合并了Wjc，Xm 的 代码

黄学彪

2019-10-24 31497bb69602433d94c8a28ea01c3ee3c7cc8576

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

@@ -96,6 +96,12 @@

            for (int i = 0; i < 7; i++)
            {
                var bottomRowLayout = new FrameLayout()
                {
                    Height = Application.GetRealHeight(58),
                };
                bottomFrameLayout2.AddChidren(bottomRowLayout);

                var btnName = new Button()
                {
                    Width = Application.GetRealWidth(233),
@@ -105,7 +111,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextSize = 12,
                };
                bottomFrameLayout2.AddChidren(btnName);
                bottomRowLayout.AddChidren(btnName);

                var btnNextFrameLayout = new FrameLayout()
                {
@@ -113,12 +119,12 @@
                    Height = Application.GetRealHeight(58),
                    X = Application.GetRealWidth(861 + 58),
                };
                bottomFrameLayout2.AddChidren(btnNextFrameLayout);
                bottomRowLayout.AddChidren(btnNextFrameLayout);

                var btnNext = new Button()
                {
                    Width = Application.GetRealWidth(60),
                    Height = Application.GetRealHeight(60),
                    Width = Application.GetRealWidth(58),
                    Height = Application.GetRealHeight(58),
                };
                btnNextFrameLayout.AddChidren(btnNext);

@@ -134,20 +140,19 @@

                if (i == 0)
                {
                    btnName.Y = Application.GetRealHeight(204);
                    btnName.Text = Language.StringByID(R.MyInternationalizationString.DeviceName) + ":";
                    bottomRowLayout.Y = Application.GetRealHeight(204);
                    btnName.Text = Language.StringByID(R.MyInternationalizationString.DeviceRemarkXm) + ":";
                    btnNextFrameLayout.Width = btnNext.Width = Application.GetRealWidth(789 - 58);
                    btnNextFrameLayout.Y = btnName.Y;
                    btnNextFrameLayout.X = btnName.Right;
                    btnNext.TextAlignment = TextAlignment.CenterLeft;
                    btnNext.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                    btnNext.Text = "智能门锁";
                    btnNext.Text = doorLock.DeviceName;
                    btnLine.Visible = true;
                    btnLine.Y = Application.GetRealHeight(308);
                }
                else if (i == 1)
                {
                    btnName.Y = Application.GetRealHeight(343);
                    bottomRowLayout.Y = Application.GetRealHeight(343);
                    btnName.Text = Language.StringByID(R.MyInternationalizationString.BelongZone) + ":";
                    var btnArea = new Button()
                    {
@@ -159,18 +164,16 @@
                        Text = "一楼，客厅",
                        TextAlignment = TextAlignment.CenterLeft,
                    };
                    bottomFrameLayout2.AddChidren(btnArea);
                    btnNextFrameLayout.Y = btnName.Y;
                    bottomRowLayout.AddChidren(btnArea);
                    btnNext.UnSelectedImagePath = "DoorLock/RightIcon.png";
                    btnLine.Visible = true;
                    btnLine.Y = Application.GetRealHeight(446);
                }
                else if (i == 2)
                {
                    btnName.Y = Application.GetRealHeight(481);
                    bottomRowLayout.Y = Application.GetRealHeight(481);
                    btnName.Text = Language.StringByID(R.MyInternationalizationString.BelongModel) + ":";
                    btnNextFrameLayout.Width = btnNext.Width = Application.GetRealWidth(789 - 58);
                    btnNextFrameLayout.Y = btnName.Y;
                    btnNextFrameLayout.X = btnName.Right;

                    btnNext.TextAlignment = TextAlignment.CenterLeft;
@@ -183,10 +186,9 @@
                }
                else if (i == 3)
                {
                    btnName.Y = Application.GetRealHeight(585 + 35);
                    bottomRowLayout.Y = Application.GetRealHeight(585 + 35);
                    btnName.Text = Language.StringByID(R.MyInternationalizationString.TemporaryPassword);

                    btnNextFrameLayout.Y = btnName.Y;
                    btnNext.UnSelectedImagePath = "DoorLock/RightIcon.png";

                    btnLine.Visible = true;
@@ -194,9 +196,8 @@
                }
                else if (i == 4)
                {
                    btnName.Y = Application.GetRealHeight(723 + 35);
                    bottomRowLayout.Y = Application.GetRealHeight(723 + 35);
                    btnName.Text = Language.StringByID(R.MyInternationalizationString.RemotelyUnlock);
                    btnNextFrameLayout.Y = btnName.Y;
                    btnNext.Width = Application.GetRealWidth(104);
                    btnNext.Height = Application.GetRealHeight(63);
                    btnNext.UnSelectedImagePath = "DoorLock/Switch.png";
@@ -214,7 +215,7 @@
                }
                else if (i == 5)
                {
                    btnName.Y = Application.GetRealHeight(861 + 35);
                    bottomRowLayout.Y = Application.GetRealHeight(861 + 35);
                    btnName.Text = Language.StringByID(R.MyInternationalizationString.DoorLockTime);
                    btnNextFrameLayout.Y = btnName.Y;
                    btnNext.UnSelectedImagePath = "DoorLock/RightIcon.png";
@@ -223,9 +224,8 @@
                }
                else if (i == 6)
                {
                    btnName.Y = Application.GetRealHeight(999 + 35);
                    bottomRowLayout.Y = Application.GetRealHeight(999 + 35);
                    btnName.Text = Language.StringByID(R.MyInternationalizationString.Shared);
                    btnNextFrameLayout.Y = btnName.Y;
                    btnNext.UnSelectedImagePath = "DoorLock/RightIcon.png";
                    btnLine.Visible = true;
                    btnLine.Y = Application.GetRealHeight(999 + 127);
@@ -269,6 +269,7 @@
                    {
                    }
                };
                bottomRowLayout.MouseDownEventHandler += eHandler;
                btnNext.MouseDownEventHandler += eHandler;
                btnName.MouseDownEventHandler += eHandler;
                btnNextFrameLayout.MouseDownEventHandler += eHandler;