合并代码，更改面板目标信息

xm

2020-05-19 34b65350abbb8b740b9c3bc0b43254cbbe23fcb5

 ZigbeeApp/Shared/Phone/MainPage/ControlForm/DevicePmSensorDetailCardForm.cs

@@ -166,22 +166,6 @@
            btnPmUnit.TextAlignment = TextAlignment.CenterLeft;
            framePmPic.AddChidren(btnPmUnit);
            this.listControl.Add(btnPmUnit);

            frameHumidityPic.MouseUpEventHandler += (sender, e) =>
            {
                pMSensor.currentPmData = 35;
                UpdateStatus();
            };
            frameTemperaturePic.MouseUpEventHandler += (sender, e) =>
            {
                pMSensor.currentPmData = 99;
                UpdateStatus();
            };
            framePmPic.MouseUpEventHandler += (sender, e) =>
            {
                pMSensor.currentPmData = 100;
                UpdateStatus();
            };
        }
        #endregion

@@ -281,16 +265,13 @@

                if (pMSensor.currentPmData < 10)
                {
                    this.listControl[2].Width = Application.GetRealWidth(193 - 70);
                    this.listControl[2].Width = Application.GetRealWidth(188 - 70);
                    this.listControl[3].X = Application.GetRealWidth(180 - 70);
                }
                else
                {
                    this.listControl[2].Width = Application.GetRealWidth(193 - 40);
                    this.listControl[3].X = Application.GetRealWidth(153 - 25);

                    this.listControl[2].BackgroundColor = 0xff00ff00;
                    this.listControl[3].BackgroundColor = 0xff00ffff;
                    this.listControl[3].X = Application.GetRealWidth(137);
                }
            }

@@ -298,7 +279,7 @@
            {
                curQuality = Language.StringByID(R.MyInternationalizationString.ExcellentAirQuality);
                this.listControl[2].Width = Application.GetRealWidth(193 - 40);
                this.listControl[3].X = Application.GetRealWidth(153 - 25);
                this.listControl[3].X = Application.GetRealWidth(137);
            }
            else if (pMSensor.currentPmData <= 115 && pMSensor.currentPmData > 75)
            {
@@ -307,16 +288,12 @@
                if (pMSensor.currentPmData < 100)
                {
                    this.listControl[2].Width = Application.GetRealWidth(193 - 40);
                    this.listControl[3].X = Application.GetRealWidth(153 - 25);
                    this.listControl[2].BackgroundColor = 0xff00ff00;
                    this.listControl[3].BackgroundColor = 0xff00ffff;
                    this.listControl[3].X = Application.GetRealWidth(137);
                }
                else
                {
                    this.listControl[2].Width = Application.GetRealWidth(162);
                    this.listControl[3].X = Application.GetRealWidth(153);
                    this.listControl[2].BackgroundColor = 0xff00ff00;
                    this.listControl[3].BackgroundColor = 0xff00ffff;
                }
            }
            else if (pMSensor.currentPmData <= 150 && pMSensor.currentPmData > 115)
@@ -340,8 +317,8 @@
            else
            {
                curQuality = "";
                this.listControl[2].Width = Application.GetRealWidth(0);
                this.listControl[3].Gravity = Gravity.CenterHorizontal;
                this.listControl[2].Width = Application.GetRealWidth(162);
                this.listControl[3].X = Application.GetRealWidth(153);
            }
            //设置状态文字
            return curQuality;