合并了新代码

黄学彪

2019-12-12 7e863a33397f317ffc3ffd9288496d0e4f16aa66

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

@@ -33,7 +33,7 @@
            btnimage.UnSelectedImagePath = "Gateway/WiredGatewayInstruct.png";
            bodyFrameLayout.AddChidren(btnimage);

            //请确保网关与网线连接{0}系统灯每秒闪烁一次
            //请确保网关用网线正常连接路由器{0}正常连接则系统指示灯1秒闪烁
            string[] strMsg = Language.StringByID(R.MyInternationalizationString.ConfirmLineConnectMsg).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
            var btnMsg1 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);

            btnMsg1.TextColor = UserCenterColor.Current.TextGrayColor3;

@@ -43,7 +43,7 @@
            bodyFrameLayout.AddChidren(btnMsg1);
            if (strMsg.Length > 1)

            {

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

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

                btnMsg2.TextColor = UserCenterColor.Current.TextGrayColor3;

                btnMsg2.TextAlignment = TextAlignment.Center;

                btnMsg2.Text = strMsg[1];

@@ -60,8 +60,8 @@
            btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);

            btnHelp.ButtonClickEvent += (sender, e) =>

            {

                var form = new DeviceDirection.DeviceDirectionHelpForm();

                form.AddForm("Gateway");

                var form = new AddGatewayHelpForm();

                form.AddForm("Wired");

            };

            bodyFrameLayout.AddChidren(btnHelp);

            //底线