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 | 40 ++++++++++++----------------------------
1 files changed, 12 insertions(+), 28 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 3e333ec..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,
@@ -47,28 +47,12 @@
IsBold = true,
};
-
- /// <summary>
- /// 鐗堟湰鍙�
- /// </summary>
- public Button versionBtn = new Button
- {
- Y = Application.GetRealHeight(40),
- X = Application.GetRealWidth(72),
- Width = Application.GetRealWidth(120),
- Height = Application.GetRealHeight(17),
- Text = "鐗堟湰鍙穠1.3.5",
- TextAlignment = TextAlignment.CenterLeft,
- TextSize = TextSize.text12,
- TextColor = CSS.CSS_Color.textCancelColor,
- };
-
/// <summary>
/// 褰撳墠涓暟
/// </summary>
- public Button geBtn = new Button
+ public TextButton geBtn = new TextButton
{
- Y = Application.GetRealHeight(59),
+ Y = Application.GetRealHeight(40),
X = Application.GetRealWidth(72),
Width = Application.GetRealWidth(120),
Height = Application.GetRealHeight(17),
@@ -83,7 +67,7 @@
/// </summary>
public Button sumBtn = new Button
{
- Y = Application.GetRealHeight(59),
+ Y = Application.GetRealHeight(40),
Width = Application.GetRealWidth(50),
Height = Application.GetRealHeight(17),
Text = "/10",
@@ -98,11 +82,11 @@
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/online.png",
- SelectedImagePath = "PirIcon/offline.png",
+ UnSelectedImagePath ="PirIcon/offline.png",
+ SelectedImagePath = "PirIcon/online.png",
};
/// <summary>
@@ -111,14 +95,14 @@
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,
TextSize = TextSize.text12,
- TextColor = 0xFF67D569,// CSS.CSS_Color.textColor,
- SelectedTextColor = CSS.CSS_Color.textRedColor,
+ TextColor = CSS.CSS_Color.textRedColor,// CSS.CSS_Color.textColor,
+ SelectedTextColor = 0xFF67D569,
IsBold = true,
};
/// <summary>
@@ -159,11 +143,11 @@
devfLayout.Height = Application.GetRealHeight(92 + (50 * i));
devfLayout.AddChidren(priequipmentBtn);
devfLayout.AddChidren(deviceNameBtn);
- devfLayout.AddChidren(versionBtn);
devfLayout.AddChidren(geBtn);
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