Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-13 99da2604f81af29afc6b3c6f4f128b4e5a8a5649

 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,7 +380,7 @@
        /// </summary>

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

        public void SetStatuText(string text)

        {

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

        }