From 64390bc739286477167e186f1f2b40a27a73a9a5 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 02 三月 2021 17:31:01 +0800
Subject: [PATCH] 20210302-1
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs | 67 ++++++++++++++++++++++++---------
1 files changed, 49 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs
index 3e848e6..fa00457 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs
@@ -153,9 +153,10 @@
FrameWhiteCentet1.AddChidren(hotDryView);
EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
- device.SetAttrState(FunctionAttributeKey.HotDry, "true");
+ string onoff = hotDryView.Lighting ? "false" : "true";
+ device.SetAttrState(FunctionAttributeKey.HotDry, onoff);
Dictionary<string, string> d = new Dictionary<string, string>();
- d.Add(FunctionAttributeKey.HotDry, "true");
+ d.Add(FunctionAttributeKey.HotDry, onoff);
Control.Ins.SendWriteCommand(device, d);
};
hotDryView.SetThouchEvent(eventHandler);
@@ -180,9 +181,10 @@
FrameWhiteCentet1.AddChidren(windDryView);
EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
- device.SetAttrState(FunctionAttributeKey.WindDry, "true");
+ string onoff = windDryView.Lighting ? "false" : "true";
+ device.SetAttrState(FunctionAttributeKey.WindDry, onoff);
Dictionary<string, string> d = new Dictionary<string, string>();
- d.Add(FunctionAttributeKey.WindDry, "true");
+ d.Add(FunctionAttributeKey.WindDry, onoff);
Control.Ins.SendWriteCommand(device, d);
};
windDryView.SetThouchEvent(eventHandler);
@@ -213,9 +215,10 @@
FrameWhiteCentet1.AddChidren(disinfectView);
EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
- device.SetAttrState(FunctionAttributeKey.Disinfect, "true");
+ string onoff = disinfectView.Lighting ? "false" : "true";
+ device.SetAttrState(FunctionAttributeKey.Disinfect, onoff);
Dictionary<string, string> d = new Dictionary<string, string>();
- d.Add(FunctionAttributeKey.Disinfect, "true");
+ d.Add(FunctionAttributeKey.Disinfect, onoff);
Control.Ins.SendWriteCommand(device, d);
};
disinfectView.SetThouchEvent(eventHandler);
@@ -260,6 +263,32 @@
index++;
}
+
+ #endregion
+
+
+ #region 鏃堕棿璁剧疆
+ var timeSetView = new ClothesHangerControl(
+ "FunctionIcon/Electrical/ClothesHanger/ClothesHangerTimeIcon.png",
+ "FunctionIcon/Electrical/ClothesHanger/ClothesHangerTimeIconOn.png",
+ Language.StringByID(StringId.Time),
+ "");
+ timeSetView.Width = Application.GetRealWidth(96);
+ timeSetView.Height = Application.GetRealHeight(74);
+ timeSetView.Y = Application.GetRealHeight(409);
+ timeSetView.X = Application.GetRealWidth(266 - 33);
+
+
+ EventHandler<MouseEventArgs> eventHandler_timeSetView = (sender, e) =>
+ {
+ var setTimePage = new ClothesHangerSetTimePage(device);
+ MainPage.BasePageView.AddChidren(setTimePage);
+ setTimePage.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ timeSetView.SetThouchEvent(eventHandler_timeSetView);
+
+ FrameWhiteCentet1.AddChidren(timeSetView);
#endregion
}
@@ -325,16 +354,19 @@
if (hotDryTimeLeftTemp != null)
{
hotDryView.ChangeTime(hotDryTimeLeftTemp.value);
+ MainPage.Log($"鐑樺共鍓╀綑鏃堕棿{hotDryTimeLeftTemp.value}");
}
var windDryTimeLeftTemp = device.status.Find((sta) => sta.key == FunctionAttributeKey.WindDryTimeLeft);
if (windDryTimeLeftTemp != null)
{
windDryView.ChangeTime(windDryTimeLeftTemp.value);
+ MainPage.Log($"椋庡共鍓╀綑鏃堕棿{windDryTimeLeftTemp.value}");
}
var disinfectTimeLeftTemp = device.status.Find((sta) => sta.key == FunctionAttributeKey.DisinfectTimeLeft);
if (disinfectTimeLeftTemp != null)
{
disinfectView.ChangeTime(disinfectTimeLeftTemp.value);
+ MainPage.Log($"娑堟瘨鍓╀綑鏃堕棿{disinfectTimeLeftTemp.value}");
}
#endregion
@@ -367,9 +399,15 @@
private Button btnTitle;
private Button btnTime;
/// <summary>
+ /// 鍊掕鏃舵椂闂�
+ /// </summary>
+ private int leftTime = 0;
+ /// <summary>
/// 鎺т欢鏄惁鐐逛寒
/// </summary>
public bool Lighting = false;
+
+
public ClothesHangerControl(string iconPath1, string iconPath2,string title,string time)
{
@@ -412,28 +450,21 @@
/// <param name="newTime"></param>
public void ChangeTime (string newTime)
{
- if(newTime == "0")
- {
- newTime = "";
- }
-
- int time = 0;
- int.TryParse(newTime, out time);
- time = time * 60;
-
+ int.TryParse(newTime, out leftTime);
+ leftTime *= 60;
if (countdownThread == null)
{
countdownThread = new System.Threading.Thread(() => {
while(true)
{
- if(time>1)
+ if(leftTime > 1)
{
Application.RunOnMainThread(() =>
{
- btnTime.Text = new TimeSpan(0, 0, time).ToString();
+ btnTime.Text = new TimeSpan(0, 0, leftTime).ToString();
});
System.Threading.Thread.Sleep(1000);
- time--;
+ leftTime--;
}else
{
Application.RunOnMainThread(() =>
--
Gitblit v1.8.0