合并了全部的代码

黄学彪

2019-11-04 c7698e163e43cea9e7f8ee45f8e3f91c9265cca4

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

@@ -59,25 +59,12 @@
            {

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

            }

            int index = textMsg.IndexOf("(");

            string textMsg1 = textMsg.Substring(0, index);

            string textMsg2 = textMsg.Substring(index, textMsg.Length - index);



            var btnSecond1 = new NormalViewControl(Application.GetMinRealAverage(120), Application.GetMinRealAverage(45), false);

            btnSecond1.X = Application.GetMinRealAverage(138);

            btnSecond1.Y = Application.GetMinRealAverage(177);

            btnSecond1.TextColor = UserCenterColor.Current.TextGrayColor3;

            btnSecond1.TextAlignment = TextAlignment.Center;

            btnSecond1.TextSize = 10;

            btnSecond1.Text = textMsg1;

            framePic.AddChidren(btnSecond1);

            var btnSecond2 = new NormalViewControl(Application.GetMinRealAverage(120), Application.GetMinRealAverage(45), false);

            btnSecond2.X = btnSecond1.X;

            btnSecond2.Y = btnSecond1.Bottom;

            var btnSecond2 = new NormalViewControl(Application.GetMinRealAverage(357), Application.GetMinRealAverage(45), false);

            btnSecond2.Y = Application.GetMinRealAverage(222);

            btnSecond2.TextColor = UserCenterColor.Current.TextGrayColor3;

            btnSecond2.TextSize = 10;

            btnSecond2.TextAlignment = TextAlignment.Center;

            btnSecond2.Text = textMsg2;

            btnSecond2.Text = textMsg;

            framePic.AddChidren(btnSecond2);



            //长按图示按键5秒以上，绿色快闪