From 1802b849f0dadc81644fb0a706d6fb45efdf2a20 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 24 十一月 2021 16:13:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into WJC
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
index 3bbabed..6b29c6f 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
@@ -145,7 +145,7 @@
Height = Application.GetRealHeight(50),
TextSize = CSS_FontSize.TextFontSize,
TextColor = CSS_Color.PromptingColor1,
- Text = curtainTemp.GetPercent(function).ToString() + "%",
+ Text = curtainTemp.GetPercent(function).ToString() + "%",
};
controlView.AddChidren(btnProgress);
@@ -157,7 +157,7 @@
Height = Application.GetRealWidth(210),
Progress = curtainTemp.GetPercent(function),
//IsInvertedProgress = true,
- ProgressTextColor = 0x00000000,
+ ProgressTextColor = CSS_Color.WarningColor,// 0x00000000,
};
controlView.AddChidren(curtainSeekBar);
--
Gitblit v1.8.0