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 | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
index 77e997b..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);
+ }
}
}
@@ -416,10 +415,6 @@
/// 搴忓垪鍙�
/// </summary>
public string SerialNumber = string.Empty;
- /// <summary>
- /// 鏁翠釜璁惧鎵�灞炵殑鍖哄煙ID(鍥犱负璁惧涔熻兘澶熷垎閰嶅尯鍩熶簡)
- /// </summary>
- public string DeviceRoomId = string.Empty;
/// <summary>
/// 鎵�鏈夋寚瀹歝luster鏄惁閮藉凡缁忔垚鍔熺粦瀹氬崗璋冨櫒
///<para>0:鏈畬鍏ㄧ粦瀹�</para>
@@ -1005,7 +1000,7 @@
/// <summary>
/// 璁惧鎵�鍦ㄧ綉鍏崇殑缃戝叧id
/// </summary>
- public int GwId;
+ public string GwId;
/// <summary>
/// 璁惧鍚�
/// </summary>
--
Gitblit v1.8.0