From ddbf195df596cf94bf77b7e38a659cb5d14b3f95 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 22 十一月 2019 17:48:08 +0800
Subject: [PATCH] 优化门锁类型查找方式（请合并最新代码）
---
ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
old mode 100755
new mode 100644
index 0c25cf7..b24d685
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
@@ -18,13 +18,32 @@
/// <param name="flage">If set to <c>true</c> flage.</param>
public static void DebugPrintLog(string msg, bool flage = true)
{
+#if DEBUG
if (flage == true)
{
- //if (msg.Contains("DeviceStatusReport") == false)
- //{
- System.Console.WriteLine(msg + " " + System.DateTime.Now.ToLongTimeString() + " " + System.DateTime.Now.Millisecond);
- //}
+ if (msg.Contains("DeviceStatusReport") == true)
+ {
+
+ }
+ else if (msg.Contains("ButtonStatusChange_Respon") == true)
+ {
+
+ }
+ else if (msg.Contains("IASInfoReport") == true)
+ {
+
+ }
+ else if (msg.Contains("ZbGw/SetOrGetData_Respon") == true)
+ {
+
+ }
+ else
+ {
+ System.Console.WriteLine(msg + " " + System.DateTime.Now.ToLongTimeString() + " " + System.DateTime.Now.Millisecond);
+
+ }
}
+#endif
}
/// <summary>
@@ -415,10 +434,6 @@
/// 搴忓垪鍙�
/// </summary>
public string SerialNumber = string.Empty;
- /// <summary>
- /// 鏁翠釜璁惧鎵�灞炵殑鍖哄煙ID(鍥犱负璁惧涔熻兘澶熷垎閰嶅尯鍩熶簡)
- /// </summary>
- public string DeviceRoomId = string.Empty;
/// <summary>
/// 鎵�鏈夋寚瀹歝luster鏄惁閮藉凡缁忔垚鍔熺粦瀹氬崗璋冨櫒
///<para>0:鏈畬鍏ㄧ粦瀹�</para>
@@ -1004,7 +1019,7 @@
/// <summary>
/// 璁惧鎵�鍦ㄧ綉鍏崇殑缃戝叧id
/// </summary>
- public int GwId;
+ public string GwId;
/// <summary>
/// 璁惧鍚�
/// </summary>
--
Gitblit v1.8.0