From 675df74cdd4103ffdcbfa0a6ccfc105fd61af15a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 29 十月 2021 15:44:18 +0800
Subject: [PATCH] 2021-10-29 1.更新乐橙 AndroidSDK
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs
index 57119a2..190b378 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs
@@ -405,6 +405,7 @@
{
lightingView.SetViewStatus(lightTemp.state == "on");
}
+ //MainPage.Log($"鏃堕棿鎴筹細{device.time_stamp} 鏃堕棿锛歿device.GeteTime()} 鐑樺共:{hotDryTemp.state} 椋庡共:{windDryTemp.state} 娑堟瘨:{disinfectTemp.state} 鐏厜鐘舵�侊細{lightTemp.state}");
#endregion
#region 淇敼鏃堕棿
@@ -450,15 +451,16 @@
/// </summary>
public bool Lighting = false;
- public ClothesHangerControl(string iconPath1, string iconPath2, string title, string time)
+
+ public ClothesHangerControl(string unSelectedIconPath, string selectedIconPath, string title, string time)
{
btnIcon = new Button()
{
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(28),
Height = Application.GetRealWidth(28),
- UnSelectedImagePath = iconPath1,
- SelectedImagePath = iconPath2,
+ UnSelectedImagePath = unSelectedIconPath,
+ SelectedImagePath = selectedIconPath,
};
this.AddChidren(btnIcon);
@@ -492,10 +494,26 @@
public void ChangeTime(string newTime)
{
int.TryParse(newTime, out leftTime);
+ if (leftTime > 0)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ btnTime.Text = new TimeSpan(0, leftTime, 0).ToString().Remove(5, 3);
+ });
+ leftTime--;
+ }
+ else if (leftTime == 0)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ btnTime.Text = "";
+ });
+ }
if (countdownThread == null)
{
countdownThread = new System.Threading.Thread(() =>
{
+
while (true)
{
if (leftTime > 0)
--
Gitblit v1.8.0