From 0c1e29166e6b188939c092d16f87ce2a27662c5f Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期五, 26 三月 2021 10:11:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/temp-wxr' into dev-tzy
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs | 32 +++++++-------------------------
1 files changed, 7 insertions(+), 25 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 37368a5..1567c59 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs
@@ -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
{
- Y = Application.GetRealHeight(59),
+ Y = Application.GetRealHeight(40),
X = Application.GetRealWidth(72),
Width = Application.GetRealWidth(120),
Height = Application.GetRealHeight(17),
@@ -83,9 +67,8 @@
/// </summary>
public Button sumBtn = new Button
{
- Y = Application.GetRealHeight(59),
-
- Width = Application.GetRealWidth(20),
+ Y = Application.GetRealHeight(40),
+ Width = Application.GetRealWidth(50),
Height = Application.GetRealHeight(17),
Text = "/10",
TextAlignment = TextAlignment.CenterLeft,
@@ -102,8 +85,8 @@
X = Application.GetRealWidth(291),
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>
@@ -118,8 +101,8 @@
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>
@@ -160,7 +143,6 @@
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);
--
Gitblit v1.8.0