From 300a5d5370d10d97eb5dfdfa43bb0156c15d23e3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 03 一月 2024 17:36:15 +0800
Subject: [PATCH] packet类复原
---
HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs b/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs
index 3608632..a58c218 100644
--- a/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs
+++ b/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs
@@ -134,7 +134,7 @@
btnDeviceName.TextColor = CSS_Color.FirstLevelTitleColor;
btnDeviceName.TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel;
btnDeviceName.Text = device.name;
- btnDeviceName.Width = btnDeviceName.GetRealWidthByText();
+ //btnDeviceName.Width = btnDeviceName.GetRealWidthByText();
FrameWhiteCentet1.AddChidren(btnDeviceName);
//鎴块棿鍚嶅瓧
this.btnRoomName = new NormalViewControl(270, 21, true);
@@ -143,7 +143,7 @@
btnRoomName.TextColor = CSS_Color.PromptingColor1;
btnRoomName.TextSize = CSS_FontSize.PromptFontSize_FirstLevel;
btnRoomName.Text = device.GetRoomListName();
- btnRoomName.Width = btnRoomName.GetRealWidthByText();
+ //btnRoomName.Width = btnRoomName.GetRealWidthByText();
FrameWhiteCentet1.AddChidren(btnRoomName);
if (ShowColltionButton)
{
@@ -302,12 +302,20 @@
/// <param name="btnHigherCollection">涓婁竴绾х晫闈㈢殑鏀惰棌鎺т欢(鍘熸潵on鐨勬鏋跺お鍧�)</param>
/// <param name="btnHigherDeviceName">涓婁竴绾х晫闈㈢殑璁惧鍚嶅瓧鎺т欢(鍘熸潵on鐨勬鏋跺お鍧�)</param>
private void AddTopSettingIcon(Button btnHigherDeviceName, Button btnHigherRoom)
- {
- //璁剧疆鍥炬爣(闂ㄩ攣鐣岄潰闇�瑕佸�熺敤杩欎釜鍥炬爣鐨刋杞村拰Y杞�,鎵�浠ュ姞杩涙潵)
- var btnSetting = new PicViewControl(28, 28);
- btnSetting.X = Application.GetRealWidth(337);
- btnSetting.Y = Application.GetRealHeight(9);
- btnSetting.UnSelectedImagePath = "Public/FuncInfoSetIcon.png";
+ {
+ //璁剧疆鍥炬爣(闂ㄩ攣鐣岄潰闇�瑕佸�熺敤杩欎釜鍥炬爣鐨刋杞村拰Y杞�,鎵�浠ュ姞杩涙潵)
+ var btnSetting = new Button()
+ {
+ X = Application.GetRealWidth(337),
+ Y = Application.GetRealHeight(19),
+ Width = Application.GetMinRealAverage(32),
+ Height = Application.GetMinRealAverage(32),
+ UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
+ };
+ //var btnSetting = new PicViewControl(28, 28);
+ //btnSetting.X = Application.GetRealWidth(337);
+ //btnSetting.Y = Application.GetRealHeight(9);
+ //btnSetting.UnSelectedImagePath = "Public/FuncInfoSetIcon.png";
btnSetting.Name = "btnSetting";
topFrameLayout.AddChidren(btnSetting);
@@ -317,7 +325,7 @@
btnSetting.Visible = false;
}
- btnSetting.ButtonClickEvent += (sender, e) =>
+ btnSetting.MouseUpEventHandler += (sender, e) =>
{
var infoView = new UI.FunctionBaseInfoSetPage(this.device, () =>
{
@@ -327,10 +335,10 @@
//浠庢柊璁＄畻瀹藉害
this.btnDeviceName.Text = btnHigherDeviceName.Text;
- this.btnDeviceName.Width = this.btnDeviceName.GetRealWidthByText();
+ //this.btnDeviceName.Width = this.btnDeviceName.GetRealWidthByText();
this.btnRoomName.Text = btnHigherRoom.Text;
- this.btnRoomName.Width = this.btnRoomName.GetRealWidthByText();
+ //this.btnRoomName.Width = this.btnRoomName.GetRealWidthByText();
//鍥炶皟浜嬩欢
this.SettionFinishEvent?.Invoke();
--
Gitblit v1.8.0