From 7cfcdb7a90f59bf9001c948e166fd9af09752fe1 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 24 五月 2022 17:15:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/release0123' into wjc
---
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacControlPage.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacControlPage.cs
index 7683c79..f4319c0 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacControlPage.cs
@@ -251,7 +251,7 @@
Button btnDataText = new Button()
{
- X = Application.GetRealWidth(215),
+ X = Application.GetRealWidth(212),
Y = btnWindSpeed.Bottom,
Width = Application.GetRealWidth(90),
Height = Application.GetRealHeight(20),
@@ -296,10 +296,10 @@
modeChangeView = new FrameLayout()
{
X = Application.GetRealWidth(30),
- Y = Application.GetRealHeight(128),
+ Y = Application.GetRealHeight(128 + 135),
Width = Application.GetRealWidth(160),
- Height = Application.GetRealHeight(287),
- BackgroundImagePath = "FunctionIcon/AC/DivBg1.png",
+ Height = Application.GetRealHeight(152),
+ BackgroundImagePath = "Public/dialogBg2.png",
};
dialogView.AddChidren(modeChangeView);
--
Gitblit v1.8.0