From 8ac39f2f962329f30ee61ee8a7abe6d6b5940dd5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 13:45:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-LC' into wxr4
---
HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs
index fbe50e2..c8a71b6 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs
@@ -16,7 +16,29 @@
topView.frameLayout.Height = Application.GetRealHeight(64 + 20);
this.AddChidren(topView.FLayoutView());
topView.topNameBtn.TextID = StringId.selectionCondition;
- topView.Location();
+ //鑾峰彇瀹藉害
+ int widthValue = topView.topNameBtn.GetTextWidth();
+ int textWidth = (Application.GetRealWidth(255) - widthValue) / 2;
+ Button locationBtn = new Button
+ {
+ Width = Application.GetRealWidth(18),
+ Height = Application.GetRealWidth(18),
+ X = Application.GetRealWidth(60 + 4) + textWidth + widthValue,
+ Y = Application.GetRealHeight(34 + 1),
+ UnSelectedImagePath = "LogicIcon/location.png",
+
+ };
+ topView.frameLayout.AddChidren(locationBtn);
+
+ Button textBtn = new Button
+ {
+ Height = Application.GetRealHeight(14),
+ Y = Application.GetRealHeight(57),
+ TextSize = LogicView.TextSize.text10,
+ TextColor = CSS.CSS_Color.textCancelColor,
+ Text = "骞夸笢骞垮窞甯傜暘绂哄尯鐭虫ゼ闀�",
+ };
+ topView.frameLayout.AddChidren(textBtn);
topView.clickBackBtn.MouseUpEventHandler += (e, sen) =>
{
RemoveFromParent();
--
Gitblit v1.8.0