代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

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

@@ -28,69 +28,64 @@
        /// </summary>

        private void InitMiddleFrame()

        {

            ////图片

            //var framePic = new FrameLayout();

            //framePic.Width = Application.GetMinRealAverage(873);

            //framePic.Height = Application.GetMinRealAverage(665);

            //framePic.Gravity = Gravity.CenterHorizontal;

            //framePic.Y = Application.GetRealHeight(144);

            //bodyFrameLayout.AddChidren(framePic);

            //var btnPic = new PicViewControl(framePic.Width, framePic.Height, false);

            //btnPic.UnSelectedImagePath = "Instruct/DimmableLightOneLoad.png";

            //framePic.AddChidren(btnPic);

            //图片

            var framePic = new FrameLayout();

            framePic.Width = Application.GetMinRealAverage(860);

            framePic.Height = Application.GetMinRealAverage(714);

            framePic.Gravity = Gravity.CenterHorizontal;

            framePic.Y = Application.GetRealHeight(130);

            bodyFrameLayout.AddChidren(framePic);

            var btnPic = new PicViewControl(framePic.Width, framePic.Height, false);

            btnPic.UnSelectedImagePath = "Instruct/SensorPir.png";

            framePic.AddChidren(btnPic);



            ////绿色指示灯闪烁

            //var btnGreanLinght = new NormalViewControl(Application.GetMinRealAverage(360), Application.GetMinRealAverage(45), false);

            //btnGreanLinght.X = Application.GetMinRealAverage(442);

            //btnGreanLinght.Y = Application.GetMinRealAverage(368);

            //btnGreanLinght.TextAlignment = TextAlignment.Center;

            //btnGreanLinght.TextColor = UserCenterColor.Current.TextGrayColor3;

            //btnGreanLinght.TextSize = 10;

            //btnGreanLinght.TextID = R.MyInternationalizationString.uGreanPilotLampLinght;

            //framePic.AddChidren(btnGreanLinght);

            //指示灯变绿、闪烁

            var btnGreanLinght = new NormalViewControl(Application.GetMinRealAverage(455), Application.GetMinRealAverage(45), false);

            btnGreanLinght.X = Application.GetMinRealAverage(398);

            btnGreanLinght.Y = Application.GetMinRealAverage(300);

            btnGreanLinght.TextAlignment = TextAlignment.Center;

            btnGreanLinght.TextColor = UserCenterColor.Current.TextGrayColor3;

            btnGreanLinght.TextSize = 10;

            btnGreanLinght.TextID = R.MyInternationalizationString.uPilotLinghtInCreanAndLinght;

            framePic.AddChidren(btnGreanLinght);



            ////指示灯

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

            //btnLinght.X = Application.GetMinRealAverage(340);

            //btnLinght.Y = Application.GetMinRealAverage(514);

            //btnLinght.TextColor = UserCenterColor.Current.TextGrayColor3;

            //btnLinght.TextSize = 10;

            //btnLinght.TextID = R.MyInternationalizationString.uPilotLamp;

            //framePic.AddChidren(btnLinght);

            //指示灯

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

            btnLinght.X = Application.GetMinRealAverage(398);

            btnLinght.Y = Application.GetMinRealAverage(642);

            btnLinght.TextColor = UserCenterColor.Current.TextGrayColor3;

            btnLinght.TextSize = 10;

            btnLinght.TextID = R.MyInternationalizationString.uPilotLamp;

            framePic.AddChidren(btnLinght);



            ////长按5秒(按键)

            //string textMsg = Language.StringByID(R.MyInternationalizationString.uLongClickPanelSomeSecond);

            //if (textMsg.Contains("{0}") == true)

            //{

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

            //}

            //var btnSecond = new NormalViewControl(Application.GetMinRealAverage(400), Application.GetMinRealAverage(45), false);

            //btnSecond.X = Application.GetMinRealAverage(518);

            //btnSecond.Y = Application.GetMinRealAverage(545);

            //btnSecond.TextColor = UserCenterColor.Current.TextGrayColor3;

            //btnSecond.TextSize = 10;

            //btnSecond.Text = textMsg;

            //framePic.AddChidren(btnSecond);

            //针孔式重置按键

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

            btnReset.X = Application.GetMinRealAverage(512);

            btnReset.Y = Application.GetMinRealAverage(512);

            btnReset.TextColor = UserCenterColor.Current.TextGrayColor3;

            btnReset.TextSize = 10;

            btnReset.TextID = R.MyInternationalizationString.uPinholeTypeResetButton;

            framePic.AddChidren(btnReset);



            ////长按图示按键5秒以上，指示灯变绿、闪烁

            ////进入配网状态。绿灯熄灭则配网成功

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

            //长按图示按键5秒以上，指示灯变绿、

            //闪烁进入配网状态。绿灯熄灭则配网成功

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



            //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(60), false);

            //msg2.Y = msg1.Bottom;

            //if (msgArry.Length > 1)

            //{

            //    msg2.Text = msgArry[1];

            //}

            //msg2.TextColor = UserCenterColor.Current.TextGrayColor3;

            //msg2.TextAlignment = TextAlignment.Center;

            //bodyFrameLayout.AddChidren(msg2);

            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(60), false);

            msg2.Y = msg1.Bottom;

            if (msgArry.Length > 1)

            {

                msg2.Text = msgArry[1];

            }

            msg2.TextColor = UserCenterColor.Current.TextGrayColor3;

            msg2.TextAlignment = TextAlignment.Center;

            bodyFrameLayout.AddChidren(msg2);

        }



        #endregion