From 94bed925cf453e148bc5a7556a8a86e0bcb9ad6c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 24 三月 2021 14:11:16 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs | 21 ++-------------------
1 files changed, 2 insertions(+), 19 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 27d39e7..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,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",
@@ -159,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