From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/brightnessView.cs | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/brightnessView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/brightnessView.cs
old mode 100755
new mode 100644
index ef6ceed..da2a973
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/brightnessView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/brightnessView.cs
@@ -122,12 +122,17 @@
/// <summary>
/// View鐨勬柟娉�
/// </summary>
- /// <param name="fLayout">鐖舵帶浠�</param>
+ /// <param name="frame">鐖舵帶浠�</param>
/// <param name="titleName">鏍囬鍚嶇О</param>
/// <param name="stateValue">涔嬪墠鐘舵�佸��</param>
/// <param name="action">杩斿洖鍥炶皟</param>
- public void FLayoutView(FrameLayout fLayout, string titleName,string stateValue, Action<string> action)
+ public void FLayoutView(FrameLayout frame, string titleName,string stateValue, Action<string> action)
{
+ FrameLayout fLayout = new FrameLayout
+ {
+ BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
+ };
+ frame.AddChidren(fLayout);
fLayout.AddChidren(frameLayout);
frameLayout.AddChidren(btnTitle);
frameLayout.AddChidren(btnCancel);
@@ -137,6 +142,7 @@
frameLayout.AddChidren(seekBarVol);
frameLayout.AddChidren(btn_add);
frameLayout.AddChidren(btn_add_click);
+ btnTitle.Text = titleName;
//绗竴涓彉鍖栬褰曢�変腑鍊�
int brightnesValue = 0;
if (stateValue != "")
@@ -144,8 +150,8 @@
try
{
//杩涙潵鐨勭姸鎬�
- brightnesValue = int.Parse(stateValue);
- seekBarVol.Progress = int.Parse(stateValue);
+ brightnesValue = int.Parse(stateValue.Replace("%", ""));
+ seekBarVol.Progress = brightnesValue;
}
catch { }
}
--
Gitblit v1.8.0