From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs
index 8c536c0..b86d5ad 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs
@@ -38,7 +38,7 @@
{
Y = Application.GetRealHeight(16),
X = Application.GetRealWidth(72),
- Width = Application.GetRealWidth(120),
+ Width = Application.GetRealWidth(120+80),
Height = Application.GetRealHeight(20),
//Text = pirDevice.name,
TextAlignment = TextAlignment.CenterLeft,
@@ -82,7 +82,7 @@
public Button stateIconBtn = new Button
{
Y = Application.GetRealHeight(23),
- X = Application.GetRealWidth(291),
+ X = Application.GetRealWidth(291-5),
Width = Application.GetRealWidth(8),
Height = Application.GetRealWidth(8),
UnSelectedImagePath ="PirIcon/offline.png",
@@ -95,8 +95,8 @@
public Button stateTextBtn = new Button
{
Y = Application.GetRealHeight(18),
- X = Application.GetRealWidth(303),
- Width = Application.GetRealWidth(30),
+ X = Application.GetRealWidth(303-5),
+ Width = Application.GetRealWidth(30+5),
Height = Application.GetRealHeight(17),
TextID = StringId.zaixianhwb,
TextAlignment = TextAlignment.CenterLeft,
@@ -147,6 +147,7 @@
geBtn.Width = geBtn.GetTextWidth();
devfLayout.AddChidren(sumBtn);
sumBtn.X = geBtn.Right;
+ sumBtn.TextAlignment = TextAlignment.CenterLeft;
devfLayout.AddChidren(stateIconBtn);
devfLayout.AddChidren(stateTextBtn);
devfLayout.AddChidren(lineBtn);
--
Gitblit v1.8.0