From 136b9e2fc48249a5ff89874f1080ba94130e7a9e Mon Sep 17 00:00:00 2001 From: xm <1271024303@qq.com> Date: 星期二, 19 五月 2020 11:12:29 +0800 Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm --- ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs old mode 100755 new mode 100644 index 974445d..d73a1b9 --- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs +++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs @@ -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); @@ -395,7 +395,7 @@ /// </summary> /// <param name="text"></param> public void SetStatuText(string text) - { + { this.btnStatu.Text = this.CurrentText + text; } -- Gitblit v1.8.0