合并xm2021-01-13 wjc2021-02-06

黄学彪

2021-01-14 d78515ac4ac8cf4a1785d9df18058d6724f12b79

 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewayDirection1Form.cs

@@ -34,31 +34,32 @@
            //图片

            var framePic = new FrameLayout();

            framePic.Width = this.GetPictrueRealSize(395);

            framePic.Height = this.GetPictrueRealSize(327);

            framePic.Height = this.GetPictrueRealSize(223);

            framePic.Gravity = Gravity.CenterHorizontal;

            framePic.Y = Application.GetRealHeight(363);

            framePic.Y = Application.GetRealHeight(325);

            framePic.BackgroundImagePath = "Gateway/MiniGatewayDirection.png";

            bodyFrameLayout.AddChidren(framePic);



            //开关键

            var btnSwitch = new NormalViewControl(this.GetPictrueRealSize(400), this.GetPictrueRealSize(45), false);

            btnSwitch.X = framePic.X + this.GetPictrueRealSize(60);

            btnSwitch.TextColor = UserCenterColor.Current.TextGrayColor3;

            btnSwitch.TextSize = 10;

            btnSwitch.TextID = R.MyInternationalizationString.uSwitchButton;

            bodyFrameLayout.AddChidren(btnSwitch);

            btnSwitch.Y = framePic.Y - btnSwitch.Height;

            //网关上电配网

            var btnTitle = new NormalViewControl(300, 60, true);

            btnTitle.TextID = R.MyInternationalizationString.uGatewayPowerDistributionNetwork;

            btnTitle.X = Application.GetRealWidth(75);

            btnTitle.Y = framePic.Bottom + Application.GetRealHeight(233);

            btnTitle.IsBold = true;

            btnTitle.TextSize = 14;

            bodyFrameLayout.AddChidren(btnTitle);



            //插电后,长按网关开关键5秒{0}系统灯常亮60秒后则进入配网状态

            //1.上电,系统启动(绿灯闪烁50秒){0}2.配网模式(蓝色常亮20秒){0}3.网关建立WI-FI热点成功(蓝灯5秒周期闪烁){0}4.点击下一步

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

            int yy = framePic.Bottom + Application.GetRealHeight(291);

            int yy = btnTitle.Bottom + Application.GetRealHeight(23);

            foreach (var msg in ArryMsg)

            {

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

                btnMsg.Text = msg;

                btnMsg.Y = yy;

                btnMsg.TextAlignment = TextAlignment.Center;

                btnMsg.TextColor = UserCenterColor.Current.TextGrayColor3;

                btnMsg.X = btnTitle.X;

                btnMsg.TextColor = UserCenterColor.Current.TextGrayColor1;

                btnMsg.TextSize = 12;

                bodyFrameLayout.AddChidren(btnMsg);

                yy = btnMsg.Bottom;

            }