From 8b9ce384b26c414db32f98e94e088f5334869c2d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 13 十一月 2019 15:36:28 +0800
Subject: [PATCH] 全部合并了代码，安卓和 IOS 都测试通过了
---
ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
index d3feb0d..df4003f 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
-using System.Linq;
using System.Text;
using Newtonsoft.Json.Linq;
@@ -21,10 +20,10 @@
{
if (flage == true)
{
- //if (msg.Contains("DeviceStatusReport") == false)
- //{
- System.Console.WriteLine(msg);
- //}
+ if (msg.Contains("DeviceStatusReport") == false)
+ {
+ System.Console.WriteLine(msg + " " + System.DateTime.Now.ToLongTimeString() + " " + System.DateTime.Now.Millisecond);
+ }
}
}
@@ -163,6 +162,10 @@
else if (strDeviceType == ZigBee.Device.DeviceType.DoorLock.ToString())
{
return Newtonsoft.Json.JsonConvert.DeserializeObject<DoorLock>(strDeviceByte);
+ }
+ else if (strDeviceType == ZigBee.Device.DeviceType.TemperatureSensor.ToString())
+ {
+ return Newtonsoft.Json.JsonConvert.DeserializeObject<TemperatureSensor>(strDeviceByte);
}
return null;
}
@@ -208,12 +211,12 @@
else if (this.Type == DeviceType.ColorDimmableLight)
{
//褰╃伅
- IconPath = "Device/ColorDimmableLight.png";
+ IconPath = "Device/ColorLight.png";
}
else if (this.Type == DeviceType.DimmableLight)
{
//璋冨厜鍣�
- IconPath = "Device/ColorDimmableLight.png";
+ IconPath = "Device/Light.png";
}
else if (this.Type == DeviceType.OnOffOutput)
{
@@ -224,6 +227,19 @@
{
//绌鸿皟
IconPath = "Device/AirConditionerEpoint.png";
+ }
+ else if (this.Type == DeviceType.TemperatureSensor)
+ {
+ if (((TemperatureSensor)this).SensorDiv == 1)
+ {
+ //娓╁害浼犳劅鍣�
+ IconPath = "Device/SensorTemperature.png";
+ }
+ else if (((TemperatureSensor)this).SensorDiv == 2)
+ {
+ //婀垮害浼犳劅鍣�
+ IconPath = "Device/SensorHumidity.png";
+ }
}
else if (this.Type != DeviceType.UnKown)
{
@@ -276,9 +292,9 @@
/// </summary>
public DeviceType Type = DeviceType.UnKown;
/// <summary>
- /// 璁惧鐨勫姛鑳界被鍨�(姝ょ被鍨嬬洰鍓嶅彧閽堝缁х數鍣ㄥ洖璺湁鏁�,榛樿涓虹伅鍏�)
+ /// 璁惧鐨勫姛鑳界被鍨�(姝ょ被鍨嬬洰鍓嶅彧閽堝缁х數鍣ㄥ洖璺湁鏁�,榛樿鏈寚瀹�)
/// </summary>
- public DeviceFunctionType DfunctionType = DeviceFunctionType.A鐏厜;
+ public DeviceFunctionType DfunctionType = DeviceFunctionType.A鏈畾涔�;
/// <summary>
/// MAC鍦板潃
/// </summary>
@@ -984,7 +1000,7 @@
/// <summary>
/// 璁惧鎵�鍦ㄧ綉鍏崇殑缃戝叧id
/// </summary>
- public int GwId;
+ public string GwId;
/// <summary>
/// 璁惧鍚�
/// </summary>
--
Gitblit v1.8.0