From 5727cf0b9b54da0a191dd1e23cb5abf21320fbff Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 25 十一月 2019 10:34:17 +0800
Subject: [PATCH] IOS使用新的项目名称
---
ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 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 a1b5119..591353e
--- 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;
@@ -19,13 +18,15 @@
/// <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);
- //}
+ if (msg.Contains("DeviceStatusReport") == false)
+ {
+ System.Console.WriteLine(msg + " " + System.DateTime.Now.ToLongTimeString() + " " + System.DateTime.Now.Millisecond);
+ }
}
+#endif
}
/// <summary>
@@ -212,12 +213,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)
{
@@ -293,9 +294,9 @@
/// </summary>
public DeviceType Type = DeviceType.UnKown;
/// <summary>
- /// 璁惧鐨勫姛鑳界被鍨�(姝ょ被鍨嬬洰鍓嶅彧閽堝缁х數鍣ㄥ洖璺湁鏁�,榛樿涓虹伅鍏�)
+ /// 璁惧鐨勫姛鑳界被鍨�(姝ょ被鍨嬬洰鍓嶅彧閽堝缁х數鍣ㄥ洖璺湁鏁�,榛樿鏈寚瀹�)
/// </summary>
- public DeviceFunctionType DfunctionType = DeviceFunctionType.A鐏厜;
+ public DeviceFunctionType DfunctionType = DeviceFunctionType.A鏈畾涔�;
/// <summary>
/// MAC鍦板潃
/// </summary>
@@ -416,10 +417,6 @@
/// 搴忓垪鍙�
/// </summary>
public string SerialNumber = string.Empty;
- /// <summary>
- /// 鏁翠釜璁惧鎵�灞炵殑鍖哄煙ID(鍥犱负璁惧涔熻兘澶熷垎閰嶅尯鍩熶簡)
- /// </summary>
- public string DeviceRoomId = string.Empty;
/// <summary>
/// 鎵�鏈夋寚瀹歝luster鏄惁閮藉凡缁忔垚鍔熺粦瀹氬崗璋冨櫒
///<para>0:鏈畬鍏ㄧ粦瀹�</para>
@@ -1005,7 +1002,7 @@
/// <summary>
/// 璁惧鎵�鍦ㄧ綉鍏崇殑缃戝叧id
/// </summary>
- public int GwId;
+ public string GwId;
/// <summary>
/// 璁惧鍚�
/// </summary>
--
Gitblit v1.8.0