完全合并了Wjc，Xm 的 代码

黄学彪

2019-10-24 31497bb69602433d94c8a28ea01c3ee3c7cc8576

 ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelTwoButtonDirectionForm.cs

@@ -43,9 +43,9 @@
            framePic.AddChidren(btnPic);



            //按键背光灯闪烁

            var btnGreanLinght = new NormalViewControl(360, 40, true);

            var btnGreanLinght = new NormalViewControl(Application.GetMinRealAverage(360), Application.GetMinRealAverage(45), false);

            btnGreanLinght.X = Application.GetMinRealAverage(442);

            btnGreanLinght.Y = Application.GetMinRealAverage(259);

            btnGreanLinght.Y = Application.GetMinRealAverage(257);

            btnGreanLinght.TextAlignment = TextAlignment.Center;

            btnGreanLinght.TextColor = UserCenterColor.Current.TextGrayColor3;

            btnGreanLinght.TextSize = 10;

@@ -58,9 +58,9 @@
            {

                textMsg = string.Format(textMsg, "5");

            }

            var btnSecond = new NormalViewControl(400, 40, true);

            var btnSecond = new NormalViewControl(Application.GetMinRealAverage(400), Application.GetMinRealAverage(45), false);

            btnSecond.X = Application.GetMinRealAverage(441);

            btnSecond.Y = Application.GetMinRealAverage(585);

            btnSecond.Y = Application.GetMinRealAverage(583);

            btnSecond.TextColor = UserCenterColor.Current.TextGrayColor3;

            btnSecond.TextSize = 10;

            btnSecond.Text = textMsg;

@@ -70,13 +70,13 @@
            //进入配网状态。绿灯快闪3秒则配网成功

            string[] msgArry = Language.StringByID(R.MyInternationalizationString.uAddTwoButtonPanelMsg).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);



            var msg1 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(58), false);

            var msg1 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);

            msg1.Y = Application.GetRealHeight(1037);

            msg1.Text = msgArry[0];

            msg1.TextColor = UserCenterColor.Current.TextGrayColor3;
            msg1.TextAlignment = TextAlignment.Center;
            bodyFrameLayout.AddChidren(msg1);

            var msg2 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(58), false);

            var msg2 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);

            msg2.Y = msg1.Bottom;

            if (msgArry.Length > 1)

            {

@@ -86,7 +86,7 @@
            msg2.TextAlignment = TextAlignment.Center;
            bodyFrameLayout.AddChidren(msg2);

            //查看帮助

            var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(49), false);

            var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);

            btnHelp.Y = Application.GetRealHeight(1388);

            btnHelp.TextSize = 12;

            btnHelp.TextAlignment = TextAlignment.Center;