From f793bebc36df45101c465efaed136c3309a19f46 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期四, 06 四月 2023 10:57:12 +0800 Subject: [PATCH] Merge branch 'dev-cqy(1.5.9)' into wjc --- HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs index 42919c2..409c93e 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs @@ -216,9 +216,15 @@ }; cellFrame.AddChidren(btnCell); +#if __IOS__ + btnCell.Width += 5; + cellFrame.Width += 5; +#else +#endif - //闂ㄩ攣鐘舵�� - btnDoorLockIcon = new Button + + //闂ㄩ攣鐘舵�� + btnDoorLockIcon = new Button { X = Application.GetRealWidth(65), Y = Application.GetRealHeight(108), @@ -371,12 +377,14 @@ private void CalculatedPosition() { this.btnCurrDeviceName.Width = this.btnCurrDeviceName.GetTextWidth(); + this.btnCurrDeviceName.Width += 10; if (this.btnCurrDeviceName.GetTextWidth() > this.btnCollectIcon.X) { //閲嶆柊璁$畻瀹藉害 this.btnCurrDeviceName.Width = this.btnCollectIcon.X + Application.GetRealWidth(-10); } this.btnCurrDeviceRoom.Width = this.btnCurrDeviceRoom.GetTextWidth(); + this.btnCurrDeviceRoom.Width += 10; if (this.btnCurrDeviceRoom.GetTextWidth() > this.btnCollectIcon.X) { //閲嶆柊璁$畻瀹藉害 -- Gitblit v1.8.0