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/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs | 88 +++++++++++++++++++++----------------------
1 files changed, 43 insertions(+), 45 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
index 6a6bde1..6e50ac4 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
@@ -289,52 +289,50 @@
break;
}
}
- //鏅捐。鏋讹紙椋庡共/鐑樺共/娑堟瘨锛夎缃殑鍓╀綑澶氬皯鏃堕棿瑙﹀彂
- else if (attData.AttributeId == 16386)
- {
- if (report.DeviceStatusReport.AttriBute.Count > 2)
- {
- //娉ㄦ剰鏅捐。鏋跺洖璺笂鎶ラ兘绔偣閮芥槸琚浛鎹负鍥炶矾1锛屾墍浠ヨ繖閲岀敤涓婃姤閮藉洖璺�
- switch (report.DeviceEpoint)
- {
- //椋庡共
- case 3:
- ((Airer)locadevice).WindRemainTime = report.DeviceStatusReport.AttriBute[1].AttriButeData;
- break;
- //鐑樺共
- case 4:
- ((Airer)locadevice).DryRemainTime = report.DeviceStatusReport.AttriBute[1].AttriButeData;
- break;
- //娑堟瘨
- case 5:
- ((Airer)locadevice).DisinfectRemainTime = report.DeviceStatusReport.AttriBute[1].AttriButeData;
- break;
- }
- }
- }
+
//鏅捐。鏋讹紙椋庡共/鐑樺共/娑堟瘨锛夎缃殑榛樿鏃堕棿
- else if (attData.AttributeId == 16385)
- {
- if (report.DeviceStatusReport.AttriBute.Count > 3)
- {
- //娉ㄦ剰鏅捐。鏋跺洖璺笂鎶ラ兘绔偣閮芥槸琚浛鎹负鍥炶矾1锛屾墍浠ヨ繖閲岀敤涓婃姤閮藉洖璺�
- switch (report.DeviceEpoint)
- {
- //椋庡共
- case 3:
- ((Airer)locadevice).WindTime = report.DeviceStatusReport.AttriBute[2].AttriButeData;
- break;
- //鐑樺共
- case 4:
- ((Airer)locadevice).DryTime = report.DeviceStatusReport.AttriBute[2].AttriButeData;
- break;
- //娑堟瘨
- case 5:
- ((Airer)locadevice).DisinfectTime = report.DeviceStatusReport.AttriBute[2].AttriButeData;
- break;
- }
- }
- }
+ // 娉ㄦ剰锛岀涓�闃舵鏃堕棿璁惧涓嶆敮鎸佽�屾殏鍋滐紝娌℃湁澶勭悊鍓╀綑澶氬皯鏃堕棿瑙﹀彂锛岀洿鎺ヤ笂鎶ュ洖澶嶄竴涓睘鎬D鐨勬儏鍐�
+ //if (attData.AttributeId == 16385)
+ //{
+ // //娉ㄦ剰鏅捐。鏋跺洖璺笂鎶ラ兘绔偣閮芥槸琚浛鎹负鍥炶矾1锛屾墍浠ヨ繖閲岀敤涓婃姤閮藉洖璺�
+ // switch (report.DeviceEpoint)
+ // {
+ // //椋庡共
+ // case 3:
+ // ((Airer)locadevice).WindTime = report.DeviceStatusReport.AttriBute[0].AttriButeData;
+ // break;
+ // //鐑樺共
+ // case 4:
+ // ((Airer)locadevice).DryTime = report.DeviceStatusReport.AttriBute[0].AttriButeData;
+ // break;
+ // //娑堟瘨
+ // case 5:
+ // ((Airer)locadevice).DisinfectTime = report.DeviceStatusReport.AttriBute[0].AttriButeData;
+ // break;
+ // }
+ //}
+ //鏅捐。鏋讹紙椋庡共/鐑樺共/娑堟瘨锛夎缃殑鍓╀綑澶氬皯鏃堕棿瑙﹀彂
+ // 娉ㄦ剰锛岀涓�闃舵鏃堕棿璁惧涓嶆敮鎸佽�屾殏鍋滐紝娌℃湁澶勭悊鍓╀綑澶氬皯鏃堕棿瑙﹀彂锛岀洿鎺ヤ笂鎶ュ洖澶嶄竴涓睘鎬D鐨勬儏鍐�
+ //if (attData.AttributeId == 16386)
+ //{
+ // //娉ㄦ剰鏅捐。鏋跺洖璺笂鎶ラ兘绔偣閮芥槸琚浛鎹负鍥炶矾1锛屾墍浠ヨ繖閲岀敤涓婃姤閮藉洖璺�
+ // switch (report.DeviceEpoint)
+ // {
+ // //椋庡共
+ // case 3:
+ // ((Airer)locadevice).WindRemainTime = report.DeviceStatusReport.AttriBute[0].AttriButeData;
+ // break;
+ // //鐑樺共
+ // case 4:
+ // ((Airer)locadevice).DryRemainTime = report.DeviceStatusReport.AttriBute[0].AttriButeData;
+ // break;
+ // //娑堟瘨
+ // case 5:
+ // ((Airer)locadevice).DisinfectRemainTime = report.DeviceStatusReport.AttriBute[0].AttriButeData;
+ // break;
+ // }
+ //}
+
//宸茬粡鎺ユ敹鍒扮姸鎬�
locadevice.HadReadDeviceStatu = true;
}
--
Gitblit v1.8.0