From d6fb0646531172f23648441c224cdcccd721b894 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 14 十二月 2020 09:59:01 +0800
Subject: [PATCH] 请合并代码，完成晾衣架最终功能。
---
ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAirerDetailCardForm.cs | 102 +++++++++++++++++++++++++--------------------------
1 files changed, 50 insertions(+), 52 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAirerDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAirerDetailCardForm.cs
index 7c4a4a9..4bd6c18 100644
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAirerDetailCardForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAirerDetailCardForm.cs
@@ -143,6 +143,7 @@
btnDry.SelectedImagePath = "Airer/Dry.png";
btnDry.X = Application.GetRealWidth(98);
btnDry.Y = Application.GetRealHeight(913);
+ btnDry.IsSelected = ((Airer)this.device).DryOnOffStatus == 1 ? true : false;
frameWhiteBack.AddChidren(btnDry);
//椋庡共
@@ -151,6 +152,7 @@
btnWind.UnSelectedImagePath = "Airer/WindOffline.png";
btnWind.SelectedImagePath = "Airer/Wind.png";
btnWind.X = Application.GetRealWidth(328);
+ btnWind.IsSelected = ((Airer)this.device).WindOnOffStatus == 1 ? true : false;
btnWind.Y = btnDry.Y;
//娑堟瘨
@@ -158,6 +160,7 @@
frameWhiteBack.AddChidren(btnDisinfect);
btnDisinfect.UnSelectedImagePath = "Airer/DisinfectOffline.png";
btnDisinfect.SelectedImagePath = "Airer/DisinfectSelected.png";
+ btnDisinfect.IsSelected = ((Airer)this.device).DisinfectOnOffStatus == 1 ? true : false;
btnDisinfect.X = Application.GetRealWidth(556);
btnDisinfect.Y = btnDry.Y;
@@ -166,6 +169,7 @@
frameWhiteBack.AddChidren(btnLight);
btnLight.UnSelectedImagePath = "Airer/LightOffline.png";
btnLight.SelectedImagePath = "Airer/LightSelected.png";
+ btnLight.IsSelected = ((Airer)this.device).OnOffStatus == 1 ? true : false;
btnLight.X = Application.GetRealWidth(786);
btnLight.Y = btnDry.Y;
@@ -227,8 +231,8 @@
}
}
- //鏃堕棿鍊掕鏃舵枃鏈�
- TimeShow(frameWhiteBack);
+ //鍙崇澶� {鐑樺共銆侀骞插拰娑堟瘨鐨勮缃粯璁ゆ椂闂存殏鏃跺彇鍘绘帀锛屼笖鍊掕鏃朵篃鍘绘帀锛屽洜涓虹涓夋柟璁惧涓嶆敮鎸併��
+ //TimeShow(frameWhiteBack);
ClickEventHander();
@@ -464,46 +468,40 @@
});
//鎵撳紑
- switch (type)
- {
- case 2:
- this.device.DeviceEpoint = 2;
- break;
- case 3:
- this.device.DeviceEpoint = 3;
- //鍙戦�侀粯璁ゆ椂闂�
- if (airer.WindTime == 0)
- {
- airer.WindTime = 180;
- }
- airer.SetAirerFunTimeDevice(airer.WindTime, 3);
- break;
- case 4:
- this.device.DeviceEpoint = 4;
- //鍙戦�侀粯璁ゆ椂闂�
- if (airer.DryTime == 0)
- {
- airer.DryTime = 180;
- }
- airer.SetAirerFunTimeDevice(airer.DryTime, 4);
- break;
- case 5:
- this.device.DeviceEpoint = 5;
- //鍙戦�侀粯璁ゆ椂闂�
- if (airer.DisinfectTime == 0)
- {
- airer.DisinfectTime = 30;
- }
- airer.SetAirerFunTimeDevice(airer.DisinfectTime, 5);
- break;
- }
+ //switch (type)
+ //{
+ // case 3:
+ //鍙戦�侀粯璁ゆ椂闂�
+ //if (airer.WindTime == 0)
+ //{
+ // airer.WindTime = 180;
+ //}
+ //airer.SetAirerFunTimeDevice(airer.WindTime, 3);
+ // break;
+ //case 4:
+ //鍙戦�侀粯璁ゆ椂闂�
+ //if (airer.DryTime == 0)
+ //{
+ // airer.DryTime = 180;
+ //}
+ //airer.SetAirerFunTimeDevice(airer.DryTime, 4);
+ // break;
+ //case 5:
+ //鍙戦�侀粯璁ゆ椂闂�
+ //if (airer.DisinfectTime == 0)
+ //{
+ // airer.DisinfectTime = 30;
+ //}
+ //airer.SetAirerFunTimeDevice(airer.DisinfectTime, 5);
+ // break;
+ //}
if (isOpen == true)
{
- this.device.SwitchControl(1);
+ airer.SwitchControl(1, type);
}
else
{
- this.device.SwitchControl(0);
+ airer.SwitchControl(0, type);
}
}
@@ -547,27 +545,27 @@
break;
case 3:
btnWind.IsSelected = isOpen;
- btnWindTimeText.Text = GetTimeString(airer.WindRemainTime);
- if (!isOpen)
- {
- airer.WindRemainTime = 0;
- }
+ //btnWindTimeText.Text = GetTimeString(airer.WindRemainTime);
+ //if (!isOpen)
+ //{
+ // airer.WindRemainTime = 0;
+ //}
break;
case 4:
btnDry.IsSelected = isOpen;
- btnDryTimeText.Text = GetTimeString(airer.DryRemainTime);
- if (!isOpen)
- {
- airer.DryRemainTime = 0;
- }
+ //btnDryTimeText.Text = GetTimeString(airer.DryRemainTime);
+ //if (!isOpen)
+ //{
+ // airer.DryRemainTime = 0;
+ //}
break;
case 5:
btnDisinfect.IsSelected = isOpen;
- btnDisinfectTimeText.Text = GetTimeString(airer.DisinfectRemainTime);
- if (!isOpen)
- {
- airer.DisinfectRemainTime = 0;
- }
+ //btnDisinfectTimeText.Text = GetTimeString(airer.DisinfectRemainTime);
+ //if (!isOpen)
+ //{
+ // airer.DisinfectRemainTime = 0;
+ //}
break;
}
//璁剧疆鐘舵�佹枃瀛�
--
Gitblit v1.8.0