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

xm

2020-05-19 34b65350abbb8b740b9c3bc0b43254cbbe23fcb5

 ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs

old mode 100755
new mode 100644
@@ -142,7 +142,7 @@
            frameRoomBlack.Height = Application.GetRealHeight(138);

            frameRoomBlack.Width = frameWhiteBack.Width;

            frameRoomBlack.BackgroundColor = 0xff232323;

            frameRoomBlack.Radius= (uint)Application.GetRealHeight(17);

            frameRoomBlack.Radius = (uint)Application.GetRealHeight(17);

            frameRoomBlack.Gravity = Gravity.BottomCenter;

            frameWhiteBack.AddChidren(frameRoomBlack);



@@ -380,11 +380,20 @@
        /// </summary>

        /// <param name="text"></param>

        public void SetStatuText(string text)

        {

        {
            this.btnStatu.Text = this.CurrentText + text;

        }



        /// <summary>

        /// 设置PM2.5传感器状态文本(不需要指定【当前两个字】)

        /// </summary>

        /// <param name="text"></param>

        public void SetPmTwoPointFiveStatuText(string text)

        {
            this.btnStatu.Text = text;

        }



        /// <summary>

        /// 重新设置设备名字控件和状态控件的Y轴

        /// </summary>

        /// <param name="i_NameY">设备名字控件的Y轴(真实值)</param>