合并了新代码

黄学彪

2020-08-11 26d1cdf2f5246c1ad7890e6740444c4a6a80e6fb

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

@@ -46,7 +46,7 @@
            btnGreanLinght.TextAlignment = TextAlignment.Center;

            btnGreanLinght.TextColor = UserCenterColor.Current.TextGrayColor3;

            btnGreanLinght.TextSize = 10;

            btnGreanLinght.TextID = R.MyInternationalizationString.uPanelBackLightLighting;

            btnGreanLinght.TextID = R.MyInternationalizationString.uKeyIndicatorLightsUp;

            framePic.AddChidren(btnGreanLinght);



            //按住此按键

@@ -55,12 +55,13 @@
            btnPress.Y = this.GetPictrueRealSize(584);

            btnPress.TextColor = UserCenterColor.Current.TextGrayColor3;

            btnPress.TextSize = 10;

            btnPress.TextID = R.MyInternationalizationString.uKeyIndicatorLightsUp;

            btnPress.TextID = R.MyInternationalizationString.uPressAndHoldThisKey;

            framePic.AddChidren(btnPress);



            //按住面板功能(function)按键，所有按键

            //指示灯亮起，则配网成功

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

            //按住面板功能按键5秒，绿色指示灯闪烁

            //进入配网状态；闪烁停止

            //指示灯变白色表示配网成功

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



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

            msg1.Y = Application.GetRealHeight(1037);

@@ -68,6 +69,7 @@
            msg1.TextColor = UserCenterColor.Current.TextGrayColor3;

            msg1.TextAlignment = TextAlignment.Center;

            bodyFrameLayout.AddChidren(msg1);



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

            msg2.Y = msg1.Bottom;

            if (msgArry.Length > 1)

@@ -77,6 +79,16 @@
            msg2.TextColor = UserCenterColor.Current.TextGrayColor3;

            msg2.TextAlignment = TextAlignment.Center;

            bodyFrameLayout.AddChidren(msg2);



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

            msg3.Y = msg2.Bottom;

            if (msgArry.Length > 2)

            {

                msg3.Text = msgArry[2];

            }

            msg3.TextColor = UserCenterColor.Current.TextGrayColor3;

            msg3.TextAlignment = TextAlignment.Center;

            bodyFrameLayout.AddChidren(msg3);

        }



        #endregion