Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

 ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/DimmableLightOneLoadDirectionForm.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(360);

            btnGreanLinght.Y = Application.GetMinRealAverage(368);

            btnGreanLinght.TextAlignment = TextAlignment.Center;

            btnGreanLinght.TextColor = UserCenterColor.Current.TextGrayColor3;

            btnGreanLinght.TextSize = 10;

@@ -53,9 +53,9 @@
            framePic.AddChidren(btnGreanLinght);



            //指示灯

            var btnLinght = new NormalViewControl(250, 40, true);

            var btnLinght = new NormalViewControl(Application.GetMinRealAverage(250), Application.GetMinRealAverage(45), false);

            btnLinght.X = Application.GetMinRealAverage(340);

            btnLinght.Y = Application.GetMinRealAverage(516);

            btnLinght.Y = Application.GetMinRealAverage(514);

            btnLinght.TextColor = UserCenterColor.Current.TextGrayColor3;

            btnLinght.TextSize = 10;

            btnLinght.TextID = R.MyInternationalizationString.uPilotLamp;

@@ -67,9 +67,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(518);

            btnSecond.Y = Application.GetMinRealAverage(547);

            btnSecond.Y = Application.GetMinRealAverage(545);

            btnSecond.TextColor = UserCenterColor.Current.TextGrayColor3;

            btnSecond.TextSize = 10;

            btnSecond.Text = textMsg;

@@ -79,13 +79,13 @@
            //进入配网状态。绿灯熄灭则配网成功

            string[] msgArry = Language.StringByID(R.MyInternationalizationString.uAddThreeLoadRelayMsg).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)

            {

@@ -95,7 +95,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;