From 1d4908c193ffbc8c351fadcd1e8d9ba12af835d2 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 15 十二月 2020 14:17:28 +0800
Subject: [PATCH] 2020-12-15 1.客服反馈问题修改。2.翻译字段纠正。3.修改备注增加判空处理
---
Crabtree/SmartHome/UI/SimpleControl/CommonPage.cs | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/CommonPage.cs b/Crabtree/SmartHome/UI/SimpleControl/CommonPage.cs
index a220793..33a2247 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/CommonPage.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/CommonPage.cs
@@ -348,12 +348,14 @@
UserDeviceToLight.UpdataEnergy (usefullBytes [0], updateFlag, usefullBytes [2] * 256 + usefullBytes [3]);
UserRoom.UpdataEnergy (usefullBytes [0], common.Type + "_" + updateFlag, usefullBytes [2] * 256 + usefullBytes [3]);
break;
- } else if (usefullBytes [0] == 11) {
- UserDeviceToSocket.UpdataEnergy (usefullBytes [0], updateFlag, usefullBytes [2] * 256 * 256 * 256 + usefullBytes [3] * 256 * 256 + usefullBytes [4] * 256 + usefullBytes [5]);
- UserDeviceToLight.UpdataEnergy (usefullBytes [0], updateFlag, usefullBytes [2] * 256 * 256 * 256 + usefullBytes [3] * 256 * 256 + usefullBytes [4] * 256 + usefullBytes [5]);
- UserRoom.UpdataEnergy (usefullBytes [0], common.Type + "_" + updateFlag, usefullBytes [2] * 256 * 256 * 256 + usefullBytes [3] * 256 * 256 + usefullBytes [4] * 256 + usefullBytes [5]);
- break;
}
+ //2020-07-01 瀹㈡埛鎻愬嚭闅愯棌kwh
+ //else if (usefullBytes [0] == 11) {
+ // UserDeviceToSocket.UpdataEnergy (usefullBytes [0], updateFlag, usefullBytes [2] * 256 * 256 * 256 + usefullBytes [3] * 256 * 256 + usefullBytes [4] * 256 + usefullBytes [5]);
+ // UserDeviceToLight.UpdataEnergy (usefullBytes [0], updateFlag, usefullBytes [2] * 256 * 256 * 256 + usefullBytes [3] * 256 * 256 + usefullBytes [4] * 256 + usefullBytes [5]);
+ // UserRoom.UpdataEnergy (usefullBytes [0], common.Type + "_" + updateFlag, usefullBytes [2] * 256 * 256 * 256 + usefullBytes [3] * 256 * 256 + usefullBytes [4] * 256 + usefullBytes [5]);
+ // break;
+ //}
}
@@ -1274,6 +1276,14 @@
//} else if (deviceType1.ToString ().Contains ("Switch")) {
// devcieLoopName = "Relay SW" + usefullBytes [2].ToString ();
//}
+
+ //2020-07-03 濡傛灉鏄孩澶栨ā鍧楃被鍨嬶紝澶囨敞涓虹┖鐨勮瘽锛岄粯璁や负TV鍚嶅瓧
+ if (deviceType1 == DeviceType.InfraredMode) {
+ devcieLoopName = "TV " + usefullBytes [2].ToString ();
+ } else if (deviceType1 == DeviceType.ACInfrared) {
+ //2020-08-28 濡傛灉鏄孩澶栫┖璋冪被鍨嬶紝澶囨敞涓虹┖鐨勮瘽锛岄粯璁や负AC鍚嶅瓧
+ devcieLoopName = "AC " + usefullBytes [2].ToString ();
+ }
byte [] ddd = CommonPage.MyEncodingGB2312.GetBytes (devcieLoopName);
byte [] newddd = new byte [20];
Array.Copy (ddd, 0, newddd, 0, 20 < ddd.Length ? 20 : ddd.Length);
--
Gitblit v1.8.0